diff options
31 files changed, 111 insertions, 1381 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java index 21648c99bb..d030c55960 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java @@ -5410,16 +5410,8 @@ public class Accessible { final GUID IIDIAccPropServer = IIDFromString("{76C0DBBB-15E0-4E7B-B61B-20EEEA2001E0}"); //$NON-NLS-1$ final GUID IIDIAccPropServices = IIDFromString("{6E26E776-04F0-495D-80E4-3330352E3169}"); //$NON-NLS-1$ if (COM.IsEqualGUID(guid, COM.IID_IDropTargetHelper)) return "IID_IDropTargetHelper"; - if (COM.IsEqualGUID(guid, COM.IID_IDragSourceHelper)) return "IID_IDragSourceHelper"; - if (COM.IsEqualGUID(guid, COM.IID_IDragSourceHelper2)) return "IID_IDragSourceHelper2"; if (COM.IsEqualGUID(guid, COM.IIDJavaBeansBridge)) return "IIDJavaBeansBridge"; if (COM.IsEqualGUID(guid, COM.IIDShockwaveActiveXControl)) return "IIDShockwaveActiveXControl"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorSiteTime)) return "IIDIEditorSiteTime"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorSiteProperty)) return "IIDIEditorSiteProperty"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorBaseProperty)) return "IIDIEditorBaseProperty"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorSite)) return "IIDIEditorSite"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorService)) return "IIDIEditorService"; - if (COM.IsEqualGUID(guid, COM.IIDIEditorManager)) return "IIDIEditorManager"; if (COM.IsEqualGUID(guid, COM.IIDIAccessible)) return "IIDIAccessible"; if (COM.IsEqualGUID(guid, IIDIAccessibleHandler)) return "IIDIAccessibleHandler"; if (COM.IsEqualGUID(guid, IIDIAccessor)) return "IIDIAccessor"; @@ -5428,7 +5420,6 @@ public class Accessible { if (COM.IsEqualGUID(guid, IIDIBindCtx)) return "IIDIBindCtx"; if (COM.IsEqualGUID(guid, COM.IIDIClassFactory)) return "IIDIClassFactory"; if (COM.IsEqualGUID(guid, COM.IIDIClassFactory2)) return "IIDIClassFactory2"; - if (COM.IsEqualGUID(guid, COM.IIDIConnectionPoint)) return "IIDIConnectionPoint"; if (COM.IsEqualGUID(guid, COM.IIDIConnectionPointContainer)) return "IIDIConnectionPointContainer"; if (COM.IsEqualGUID(guid, IIDICreateErrorInfo)) return "IIDICreateErrorInfo"; if (COM.IsEqualGUID(guid, IIDICreateTypeInfo)) return "IIDICreateTypeInfo"; @@ -5454,7 +5445,6 @@ public class Accessible { if (COM.IsEqualGUID(guid, IIDIErrorInfo)) return "IIDIErrorInfo"; if (COM.IsEqualGUID(guid, IIDIErrorLog)) return "IIDIErrorLog"; if (COM.IsEqualGUID(guid, IIDIExternalConnection)) return "IIDIExternalConnection"; - if (COM.IsEqualGUID(guid, COM.IIDIFont)) return "IIDIFont"; if (COM.IsEqualGUID(guid, IIDIFontDisp)) return "IIDIFontDisp"; // if (COM.IsEqualGUID(guid, COM.IIDIHTMLDocumentEvents2)) return "IIDIHTMLDocumentEvents2"; if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) return "IIDIInternetSecurityManager"; @@ -5472,20 +5462,16 @@ public class Accessible { if (COM.IsEqualGUID(guid, IIDIOleCacheControl)) return "IIDIOleCacheControl"; if (COM.IsEqualGUID(guid, COM.IIDIOleClientSite)) return "IIDIOleClientSite"; if (COM.IsEqualGUID(guid, COM.IIDIOleCommandTarget)) return "IIDIOleCommandTarget"; - if (COM.IsEqualGUID(guid, COM.IIDIOleContainer)) return "IIDIOleContainer"; if (COM.IsEqualGUID(guid, COM.IIDIOleControl)) return "IIDIOleControl"; if (COM.IsEqualGUID(guid, COM.IIDIOleControlSite)) return "IIDIOleControlSite"; if (COM.IsEqualGUID(guid, COM.IIDIOleDocument)) return "IIDIOleDocument"; if (COM.IsEqualGUID(guid, COM.IIDIOleDocumentSite)) return "IIDIOleDocumentSite"; - if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceActiveObject)) return "IIDIOleInPlaceActiveObject"; if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceFrame)) return "IIDIOleInPlaceFrame"; if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceObject)) return "IIDIOleInPlaceObject"; if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceSite)) return "IIDIOleInPlaceSite"; - if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceUIWindow)) return "IIDIOleInPlaceUIWindow"; if (COM.IsEqualGUID(guid, IIDIOleItemContainer)) return "IIDIOleItemContainer"; if (COM.IsEqualGUID(guid, COM.IIDIOleLink)) return "IIDIOleLink"; if (COM.IsEqualGUID(guid, COM.IIDIOleObject)) return "IIDIOleObject"; - if (COM.IsEqualGUID(guid, COM.IIDIOleWindow)) return "IIDIOleWindow"; if (COM.IsEqualGUID(guid, IIDIParseDisplayName)) return "IIDIParseDisplayName"; if (COM.IsEqualGUID(guid, IIDIPerPropertyBrowsing)) return "IIDIPerPropertyBrowsing"; if (COM.IsEqualGUID(guid, COM.IIDIPersist)) return "IIDIPersist"; @@ -5493,7 +5479,6 @@ public class Accessible { if (COM.IsEqualGUID(guid, IIDIPersistMemory)) return "IIDIPersistMemory"; if (COM.IsEqualGUID(guid, IIDIPersistPropertyBag)) return "IIDIPersistPropertyBag"; if (COM.IsEqualGUID(guid, COM.IIDIPersistStorage)) return "IIDIPersistStorage"; - if (COM.IsEqualGUID(guid, COM.IIDIPersistStream)) return "IIDIPersistStream"; if (COM.IsEqualGUID(guid, COM.IIDIPersistStreamInit)) return "IIDIPersistStreamInit"; if (COM.IsEqualGUID(guid, IIDIPicture)) return "IIDIPicture"; if (COM.IsEqualGUID(guid, IIDIPictureDisp)) return "IIDIPictureDisp"; @@ -5516,8 +5501,6 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) return "IIDIServiceProvider"; if (COM.IsEqualGUID(guid, COM.IIDISpecifyPropertyPages)) return "IIDISpecifyPropertyPages"; if (COM.IsEqualGUID(guid, IIDIStdMarshalInfo)) return "IIDIStdMarshalInfo"; - if (COM.IsEqualGUID(guid, COM.IIDIStorage)) return "IIDIStorage"; - if (COM.IsEqualGUID(guid, COM.IIDIStream)) return "IIDIStream"; if (COM.IsEqualGUID(guid, IIDISupportErrorInfo)) return "IIDISupportErrorInfo"; if (COM.IsEqualGUID(guid, IIDITypeComp)) return "IIDITypeComp"; if (COM.IsEqualGUID(guid, IIDITypeLib)) return "IIDITypeLib"; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index efec4e5a21..0cc24ac86f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -477,8 +477,7 @@ protected void addObjectReferences() { IOleLink objIOleLink = new IOleLink(ppvObject[0]); long[] ppmk = new long[1]; if (objIOleLink.GetSourceMoniker(ppmk) == COM.S_OK) { - IMoniker objIMoniker = new IMoniker(ppmk[0]); - objIMoniker.Release(); + new IUnknown(ppmk[0]).Release(); type = COM.OLELINKED; objIOleLink.BindIfRunning(); } else { @@ -736,7 +735,7 @@ private SIZE getExtent() { // get the current size of the embedded OLENatives object if (objIOleObject != null) { if ( objIViewObject2 != null && !COM.OleIsRunning(objIOleObject.getAddress())) { - objIViewObject2.GetExtent(aspect, -1, null, sizel); + objIViewObject2.GetExtent(aspect, -1, 0, sizel); } else { objIOleObject.GetExtent(aspect, sizel); } @@ -1122,7 +1121,7 @@ public int queryStatus(int cmd) { OLECMD olecmd = new OLECMD(); olecmd.cmdID = cmd; - int result = objIOleCommandTarget.QueryStatus(null, 1, olecmd, null); + int result = objIOleCommandTarget.QueryStatus(null, 1, olecmd, 0); if (result != COM.S_OK) return 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c index 785518b009..152c33cb88 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c @@ -136,18 +136,6 @@ JNIEXPORT jint JNICALL COM_NATIVE(CONTROLINFO_1sizeof) } #endif -#ifndef NO_COSERVERINFO_1sizeof -JNIEXPORT jint JNICALL COM_NATIVE(COSERVERINFO_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, COSERVERINFO_1sizeof_FUNC); - rc = (jint)COSERVERINFO_sizeof(); - COM_NATIVE_EXIT(env, that, COSERVERINFO_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_CoCreateInstance JNIEXPORT jint JNICALL COM_NATIVE(CoCreateInstance) (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2, jobject arg3, jlongArray arg4) @@ -253,18 +241,6 @@ JNIEXPORT jint JNICALL COM_NATIVE(DISPPARAMS_1sizeof) } #endif -#ifndef NO_DVTARGETDEVICE_1sizeof -JNIEXPORT jint JNICALL COM_NATIVE(DVTARGETDEVICE_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, DVTARGETDEVICE_1sizeof_FUNC); - rc = (jint)DVTARGETDEVICE_sizeof(); - COM_NATIVE_EXIT(env, that, DVTARGETDEVICE_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_DoDragDrop JNIEXPORT jint JNICALL COM_NATIVE(DoDragDrop) (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3) @@ -447,19 +423,6 @@ fail: } #endif -#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I) - (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) -{ - GUID _arg1, *lparg1=NULL; - COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); - if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail; - MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); -fail: - COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); -} -#endif - #ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) @@ -473,19 +436,6 @@ fail: } #endif -#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I) - (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) -{ - STATSTG _arg1, *lparg1=NULL; - COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); - if (arg1) if ((lparg1 = getSTATSTGFields(env, arg1, &_arg1)) == NULL) goto fail; - MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); -fail: - COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); -} -#endif - #ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) @@ -555,20 +505,6 @@ fail: } #endif -#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI) - (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) -{ - STATSTG _arg0, *lparg0=NULL; - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC); - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); -fail: - if (arg0 && lparg0) setSTATSTGFields(env, arg0, lparg0); - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC); -} -#endif - #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI) (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) @@ -799,25 +735,6 @@ JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning) } #endif -#ifndef NO_OleLoad -JNIEXPORT jint JNICALL COM_NATIVE(OleLoad) - (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jlongArray arg3) -{ - GUID _arg1, *lparg1=NULL; - jlong *lparg3=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, OleLoad_FUNC); - if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)OleLoad((IStorage *)arg0, lparg1, (IOleClientSite *)arg2, (LPVOID *)lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); - if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1); - COM_NATIVE_EXIT(env, that, OleLoad_FUNC); - return rc; -} -#endif - #ifndef NO_OleRun JNIEXPORT jint JNICALL COM_NATIVE(OleRun) (JNIEnv *env, jclass that, jlong arg0) @@ -988,34 +905,6 @@ fail: } #endif -#ifndef NO_SHDoDragDrop -JNIEXPORT jint JNICALL COM_NATIVE(SHDoDragDrop) - (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jintArray arg4) -{ - jint *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, SHDoDragDrop_FUNC); - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)SHDoDragDrop((HWND)arg0, (IDataObject *)arg1, (IDropSource *)arg2, arg3, (DWORD *)lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - COM_NATIVE_EXIT(env, that, SHDoDragDrop_FUNC); - return rc; -} -#endif - -#ifndef NO_STATSTG_1sizeof -JNIEXPORT jint JNICALL COM_NATIVE(STATSTG_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, STATSTG_1sizeof_FUNC); - rc = (jint)STATSTG_sizeof(); - COM_NATIVE_EXIT(env, that, STATSTG_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_STGMEDIUM_1sizeof JNIEXPORT jint JNICALL COM_NATIVE(STGMEDIUM_1sizeof) (JNIEnv *env, jclass that) @@ -1082,25 +971,6 @@ fail: } #endif -#ifndef NO_StringFromCLSID -JNIEXPORT jint JNICALL COM_NATIVE(StringFromCLSID) - (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1) -{ - GUID _arg0, *lparg0=NULL; - jlong *lparg1=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, StringFromCLSID_FUNC); - if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jint)StringFromCLSID(lparg0, (LPOLESTR *)lparg1); -fail: - if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); - if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); - COM_NATIVE_EXIT(env, that, StringFromCLSID_FUNC); - return rc; -} -#endif - #ifndef NO_SysAllocString JNIEXPORT jlong JNICALL COM_NATIVE(SysAllocString) (JNIEnv *env, jclass that, jcharArray arg0) @@ -1276,37 +1146,18 @@ fail: } #endif -#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) +#ifndef NO_VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlong arg4, jobject arg5) { - DVTARGETDEVICE _arg4, *lparg4=NULL; SIZE _arg5, *lparg5=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); - if (arg4) if ((lparg4 = getDVTARGETDEVICEFields(env, arg4, &_arg4)) == NULL) goto fail; + COM_NATIVE_ENTER(env, that, VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC); if (arg5) if ((lparg5 = getSIZEFields(env, arg5, &_arg5)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong, SIZE *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); fail: if (arg5 && lparg5) setSIZEFields(env, arg5, lparg5); - if (arg4 && lparg4) setDVTARGETDEVICEFields(env, arg4, lparg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJII_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4) -{ - jint *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC); - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC); return rc; } #endif @@ -1588,6 +1439,18 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ) } #endif +#ifndef NO_VtblCall__IJJI +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); + COM_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__IJJII_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJII_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5) @@ -1755,18 +1618,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJJZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jboolean arg3) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJJZ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJJZ_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJJ_3I JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3I) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3) @@ -1866,25 +1717,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jboolean arg4) -{ - FORMATETC _arg2, *lparg2=NULL; - STGMEDIUM _arg3, *lparg3=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); - if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, FORMATETC *, STGMEDIUM *, jboolean))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4); -fail: - if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3); - if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) @@ -1917,24 +1749,21 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5) +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jobject arg4, jlong arg5) { GUID _arg2, *lparg2=NULL; OLECMD _arg4, *lparg4=NULL; - OLECMDTEXT _arg5, *lparg5=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J_FUNC); if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg4) if ((lparg4 = getOLECMDFields(env, arg4, &_arg4)) == NULL) goto fail; - if (arg5) if ((lparg5 = getOLECMDTEXTFields(env, arg5, &_arg5)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, OLECMD *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, arg5); fail: - if (arg5 && lparg5) setOLECMDTEXTFields(env, arg5, lparg5); if (arg4 && lparg4) setOLECMDFields(env, arg4, lparg4); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J_FUNC); return rc; } #endif @@ -2079,34 +1908,34 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4) +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jint arg4) { RECT _arg2, *lparg2=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI_FUNC); if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, *lparg2, arg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4); fail: if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jboolean arg4) +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4) { RECT _arg2, *lparg2=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC); if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, *lparg2, arg3, arg4); fail: if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC); return rc; } #endif @@ -2130,22 +1959,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3) -{ - SHDRAGIMAGE _arg2, *lparg2=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); - if (arg2) if ((lparg2 = getSHDRAGIMAGEFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, SHDRAGIMAGE *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); -fail: - if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) @@ -2162,18 +1975,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJZ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJZ_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJ_3C JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c index 1cf95adeac..64eec0e880 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c @@ -27,14 +27,12 @@ char * COM_nativeFunctionNames[] = { "CLSIDFromProgID", "CLSIDFromString", "CONTROLINFO_1sizeof", - "COSERVERINFO_1sizeof", "CoCreateInstance", "CoFreeUnusedLibraries", "CoGetClassObject", "CoLockObjectExternal", "CreateStdAccessibleObject", "DISPPARAMS_1sizeof", - "DVTARGETDEVICE_1sizeof", "DoDragDrop", "ELEMDESC_1sizeof", "EXCEPINFO_1sizeof", @@ -47,15 +45,12 @@ char * COM_nativeFunctionNames[] = { "LICINFO_1sizeof", "LresultFromObject", "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I", - "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I", "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I", - "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I", "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI", - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI", "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI", @@ -71,7 +66,6 @@ char * COM_nativeFunctionNames[] = { "OleGetClipboard", "OleIsCurrentClipboard", "OleIsRunning", - "OleLoad", "OleRun", "OleSave", "OleSetClipboard", @@ -84,13 +78,10 @@ char * COM_nativeFunctionNames[] = { "ReleaseStgMedium", "RevokeDragDrop", "SHCreateItemFromParsingName", - "SHDoDragDrop", - "STATSTG_1sizeof", "STGMEDIUM_1sizeof", "StgCreateDocfile", "StgIsStorageFile", "StgOpenStorage", - "StringFromCLSID", "SysAllocString", "SysFreeString", "SysStringByteLen", @@ -105,8 +96,7 @@ char * COM_nativeFunctionNames[] = { "VtblCall__IJ", "VtblCall__IJI", "VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J", - "VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2", - "VtblCall__IJII_3I", + "VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2", "VtblCall__IJIJ", "VtblCall__IJIJI_3J", "VtblCall__IJIJJ", @@ -123,6 +113,7 @@ char * COM_nativeFunctionNames[] = { "VtblCall__IJI_3J_3I", "VtblCall__IJI_3J_3J_3I_3J", "VtblCall__IJJ", + "VtblCall__IJJI", "VtblCall__IJJII_3J", "VtblCall__IJJI_3I", "VtblCall__IJJI_3J", @@ -134,17 +125,15 @@ char * COM_nativeFunctionNames[] = { "VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I", "VtblCall__IJJJ_3J", "VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J", - "VtblCall__IJJZ", "VtblCall__IJJ_3I", "VtblCall__IJJ_3J", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2", - "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ", - "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2", + "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J", @@ -153,12 +142,10 @@ char * COM_nativeFunctionNames[] = { "VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I", "VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J", "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2", + "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI", "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ", - "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ", "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2", - "VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J", "VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", - "VtblCall__IJZ", "VtblCall__IJ_3C", "VtblCall__IJ_3CI", "VtblCall__IJ_3CIII_3J", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h index 5fcc08f92d..6480352297 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h @@ -37,14 +37,12 @@ typedef enum { CLSIDFromProgID_FUNC, CLSIDFromString_FUNC, CONTROLINFO_1sizeof_FUNC, - COSERVERINFO_1sizeof_FUNC, CoCreateInstance_FUNC, CoFreeUnusedLibraries_FUNC, CoGetClassObject_FUNC, CoLockObjectExternal_FUNC, CreateStdAccessibleObject_FUNC, DISPPARAMS_1sizeof_FUNC, - DVTARGETDEVICE_1sizeof_FUNC, DoDragDrop_FUNC, ELEMDESC_1sizeof_FUNC, EXCEPINFO_1sizeof_FUNC, @@ -57,15 +55,12 @@ typedef enum { LICINFO_1sizeof_FUNC, LresultFromObject_FUNC, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC, - MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC, - MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC, - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC, @@ -81,7 +76,6 @@ typedef enum { OleGetClipboard_FUNC, OleIsCurrentClipboard_FUNC, OleIsRunning_FUNC, - OleLoad_FUNC, OleRun_FUNC, OleSave_FUNC, OleSetClipboard_FUNC, @@ -94,13 +88,10 @@ typedef enum { ReleaseStgMedium_FUNC, RevokeDragDrop_FUNC, SHCreateItemFromParsingName_FUNC, - SHDoDragDrop_FUNC, - STATSTG_1sizeof_FUNC, STGMEDIUM_1sizeof_FUNC, StgCreateDocfile_FUNC, StgIsStorageFile_FUNC, StgOpenStorage_FUNC, - StringFromCLSID_FUNC, SysAllocString_FUNC, SysFreeString_FUNC, SysStringByteLen_FUNC, @@ -115,8 +106,7 @@ typedef enum { VtblCall__IJ_FUNC, VtblCall__IJI_FUNC, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC, - VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC, - VtblCall__IJII_3I_FUNC, + VtblCall__IJIIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC, VtblCall__IJIJ_FUNC, VtblCall__IJIJI_3J_FUNC, VtblCall__IJIJJ_FUNC, @@ -133,6 +123,7 @@ typedef enum { VtblCall__IJI_3J_3I_FUNC, VtblCall__IJI_3J_3J_3I_3J_FUNC, VtblCall__IJJ_FUNC, + VtblCall__IJJI_FUNC, VtblCall__IJJII_3J_FUNC, VtblCall__IJJI_3I_FUNC, VtblCall__IJJI_3J_FUNC, @@ -144,17 +135,15 @@ typedef enum { VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, VtblCall__IJJJ_3J_FUNC, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC, - VtblCall__IJJZ_FUNC, VtblCall__IJJ_3I_FUNC, VtblCall__IJJ_3J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC, + VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, @@ -163,12 +152,10 @@ typedef enum { VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC, + VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JI_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC, - VtblCall__IJZ_FUNC, VtblCall__IJ_3C_FUNC, VtblCall__IJ_3CI_FUNC, VtblCall__IJ_3CIII_3J_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c index bd6772d77c..19ee53f693 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c @@ -92,46 +92,6 @@ void setCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lpStruct) } #endif -#ifndef NO_COSERVERINFO -typedef struct COSERVERINFO_FID_CACHE { - int cached; - jclass clazz; - jfieldID dwReserved1, pwszName, pAuthInfo, dwReserved2; -} COSERVERINFO_FID_CACHE; - -COSERVERINFO_FID_CACHE COSERVERINFOFc; - -void cacheCOSERVERINFOFields(JNIEnv *env, jobject lpObject) -{ - if (COSERVERINFOFc.cached) return; - COSERVERINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); - COSERVERINFOFc.dwReserved1 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved1", "I"); - COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", "J"); - COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", "J"); - COSERVERINFOFc.dwReserved2 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved2", "I"); - COSERVERINFOFc.cached = 1; -} - -COSERVERINFO *getCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct) -{ - if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject); - lpStruct->dwReserved1 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved1); - lpStruct->pwszName = (LPWSTR)(*env)->GetLongField(env, lpObject, COSERVERINFOFc.pwszName); - lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetLongField(env, lpObject, COSERVERINFOFc.pAuthInfo); - lpStruct->dwReserved2 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved2); - return lpStruct; -} - -void setCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct) -{ - if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject); - (*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved1, (jint)lpStruct->dwReserved1); - (*env)->SetLongField(env, lpObject, COSERVERINFOFc.pwszName, (jlong)lpStruct->pwszName); - (*env)->SetLongField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jlong)lpStruct->pAuthInfo); - (*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved2, (jint)lpStruct->dwReserved2); -} -#endif - #ifndef NO_DISPPARAMS typedef struct DISPPARAMS_FID_CACHE { int cached; @@ -172,58 +132,6 @@ void setDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct) } #endif -#ifndef NO_DVTARGETDEVICE -typedef struct DVTARGETDEVICE_FID_CACHE { - int cached; - jclass clazz; - jfieldID tdSize, tdDriverNameOffset, tdDeviceNameOffset, tdPortNameOffset, tdExtDevmodeOffset, tdData; -} DVTARGETDEVICE_FID_CACHE; - -DVTARGETDEVICE_FID_CACHE DVTARGETDEVICEFc; - -void cacheDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject) -{ - if (DVTARGETDEVICEFc.cached) return; - DVTARGETDEVICEFc.clazz = (*env)->GetObjectClass(env, lpObject); - DVTARGETDEVICEFc.tdSize = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdSize", "I"); - DVTARGETDEVICEFc.tdDriverNameOffset = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdDriverNameOffset", "S"); - DVTARGETDEVICEFc.tdDeviceNameOffset = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdDeviceNameOffset", "S"); - DVTARGETDEVICEFc.tdPortNameOffset = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdPortNameOffset", "S"); - DVTARGETDEVICEFc.tdExtDevmodeOffset = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdExtDevmodeOffset", "S"); - DVTARGETDEVICEFc.tdData = (*env)->GetFieldID(env, DVTARGETDEVICEFc.clazz, "tdData", "[B"); - DVTARGETDEVICEFc.cached = 1; -} - -DVTARGETDEVICE *getDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject, DVTARGETDEVICE *lpStruct) -{ - if (!DVTARGETDEVICEFc.cached) cacheDVTARGETDEVICEFields(env, lpObject); - lpStruct->tdSize = (*env)->GetIntField(env, lpObject, DVTARGETDEVICEFc.tdSize); - lpStruct->tdDriverNameOffset = (*env)->GetShortField(env, lpObject, DVTARGETDEVICEFc.tdDriverNameOffset); - lpStruct->tdDeviceNameOffset = (*env)->GetShortField(env, lpObject, DVTARGETDEVICEFc.tdDeviceNameOffset); - lpStruct->tdPortNameOffset = (*env)->GetShortField(env, lpObject, DVTARGETDEVICEFc.tdPortNameOffset); - lpStruct->tdExtDevmodeOffset = (*env)->GetShortField(env, lpObject, DVTARGETDEVICEFc.tdExtDevmodeOffset); - { - jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DVTARGETDEVICEFc.tdData); - (*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->tdData), (jbyte *)lpStruct->tdData); - } - return lpStruct; -} - -void setDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject, DVTARGETDEVICE *lpStruct) -{ - if (!DVTARGETDEVICEFc.cached) cacheDVTARGETDEVICEFields(env, lpObject); - (*env)->SetIntField(env, lpObject, DVTARGETDEVICEFc.tdSize, (jint)lpStruct->tdSize); - (*env)->SetShortField(env, lpObject, DVTARGETDEVICEFc.tdDriverNameOffset, (jshort)lpStruct->tdDriverNameOffset); - (*env)->SetShortField(env, lpObject, DVTARGETDEVICEFc.tdDeviceNameOffset, (jshort)lpStruct->tdDeviceNameOffset); - (*env)->SetShortField(env, lpObject, DVTARGETDEVICEFc.tdPortNameOffset, (jshort)lpStruct->tdPortNameOffset); - (*env)->SetShortField(env, lpObject, DVTARGETDEVICEFc.tdExtDevmodeOffset, (jshort)lpStruct->tdExtDevmodeOffset); - { - jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DVTARGETDEVICEFc.tdData); - (*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->tdData), (jbyte *)lpStruct->tdData); - } -} -#endif - #ifndef NO_EXCEPINFO typedef struct EXCEPINFO_FID_CACHE { int cached; @@ -512,52 +420,6 @@ void setOLECMDFields(JNIEnv *env, jobject lpObject, OLECMD *lpStruct) } #endif -#ifndef NO_OLECMDTEXT -typedef struct OLECMDTEXT_FID_CACHE { - int cached; - jclass clazz; - jfieldID cmdtextf, cwActual, cwBuf, rgwz; -} OLECMDTEXT_FID_CACHE; - -OLECMDTEXT_FID_CACHE OLECMDTEXTFc; - -void cacheOLECMDTEXTFields(JNIEnv *env, jobject lpObject) -{ - if (OLECMDTEXTFc.cached) return; - OLECMDTEXTFc.clazz = (*env)->GetObjectClass(env, lpObject); - OLECMDTEXTFc.cmdtextf = (*env)->GetFieldID(env, OLECMDTEXTFc.clazz, "cmdtextf", "I"); - OLECMDTEXTFc.cwActual = (*env)->GetFieldID(env, OLECMDTEXTFc.clazz, "cwActual", "I"); - OLECMDTEXTFc.cwBuf = (*env)->GetFieldID(env, OLECMDTEXTFc.clazz, "cwBuf", "I"); - OLECMDTEXTFc.rgwz = (*env)->GetFieldID(env, OLECMDTEXTFc.clazz, "rgwz", "[S"); - OLECMDTEXTFc.cached = 1; -} - -OLECMDTEXT *getOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct) -{ - if (!OLECMDTEXTFc.cached) cacheOLECMDTEXTFields(env, lpObject); - lpStruct->cmdtextf = (*env)->GetIntField(env, lpObject, OLECMDTEXTFc.cmdtextf); - lpStruct->cwActual = (*env)->GetIntField(env, lpObject, OLECMDTEXTFc.cwActual); - lpStruct->cwBuf = (*env)->GetIntField(env, lpObject, OLECMDTEXTFc.cwBuf); - { - jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz); - (*env)->GetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz); - } - return lpStruct; -} - -void setOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct) -{ - if (!OLECMDTEXTFc.cached) cacheOLECMDTEXTFields(env, lpObject); - (*env)->SetIntField(env, lpObject, OLECMDTEXTFc.cmdtextf, (jint)lpStruct->cmdtextf); - (*env)->SetIntField(env, lpObject, OLECMDTEXTFc.cwActual, (jint)lpStruct->cwActual); - (*env)->SetIntField(env, lpObject, OLECMDTEXTFc.cwBuf, (jint)lpStruct->cwBuf); - { - jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz); - (*env)->SetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz); - } -} -#endif - #ifndef NO_OLEINPLACEFRAMEINFO typedef struct OLEINPLACEFRAMEINFO_FID_CACHE { int cached; @@ -601,91 +463,6 @@ void setOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAME } #endif -#ifndef NO_STATSTG -typedef struct STATSTG_FID_CACHE { - int cached; - jclass clazz; - jfieldID pwcsName, type, cbSize, mtime_dwLowDateTime, mtime_dwHighDateTime, ctime_dwLowDateTime, ctime_dwHighDateTime, atime_dwLowDateTime, atime_dwHighDateTime, grfMode, grfLocksSupported, clsid_Data1, clsid_Data2, clsid_Data3, clsid_Data4, grfStateBits, reserved; -} STATSTG_FID_CACHE; - -STATSTG_FID_CACHE STATSTGFc; - -void cacheSTATSTGFields(JNIEnv *env, jobject lpObject) -{ - if (STATSTGFc.cached) return; - STATSTGFc.clazz = (*env)->GetObjectClass(env, lpObject); - STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", "J"); - STATSTGFc.type = (*env)->GetFieldID(env, STATSTGFc.clazz, "type", "I"); - STATSTGFc.cbSize = (*env)->GetFieldID(env, STATSTGFc.clazz, "cbSize", "J"); - STATSTGFc.mtime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "mtime_dwLowDateTime", "I"); - STATSTGFc.mtime_dwHighDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "mtime_dwHighDateTime", "I"); - STATSTGFc.ctime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "ctime_dwLowDateTime", "I"); - STATSTGFc.ctime_dwHighDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "ctime_dwHighDateTime", "I"); - STATSTGFc.atime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "atime_dwLowDateTime", "I"); - STATSTGFc.atime_dwHighDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "atime_dwHighDateTime", "I"); - STATSTGFc.grfMode = (*env)->GetFieldID(env, STATSTGFc.clazz, "grfMode", "I"); - STATSTGFc.grfLocksSupported = (*env)->GetFieldID(env, STATSTGFc.clazz, "grfLocksSupported", "I"); - STATSTGFc.clsid_Data1 = (*env)->GetFieldID(env, STATSTGFc.clazz, "clsid_Data1", "I"); - STATSTGFc.clsid_Data2 = (*env)->GetFieldID(env, STATSTGFc.clazz, "clsid_Data2", "S"); - STATSTGFc.clsid_Data3 = (*env)->GetFieldID(env, STATSTGFc.clazz, "clsid_Data3", "S"); - STATSTGFc.clsid_Data4 = (*env)->GetFieldID(env, STATSTGFc.clazz, "clsid_Data4", "[B"); - STATSTGFc.grfStateBits = (*env)->GetFieldID(env, STATSTGFc.clazz, "grfStateBits", "I"); - STATSTGFc.reserved = (*env)->GetFieldID(env, STATSTGFc.clazz, "reserved", "I"); - STATSTGFc.cached = 1; -} - -STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct) -{ - if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject); - lpStruct->pwcsName = (LPWSTR)(*env)->GetLongField(env, lpObject, STATSTGFc.pwcsName); - lpStruct->type = (*env)->GetIntField(env, lpObject, STATSTGFc.type); - lpStruct->cbSize.QuadPart = (*env)->GetLongField(env, lpObject, STATSTGFc.cbSize); - lpStruct->mtime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime); - lpStruct->mtime.dwHighDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.mtime_dwHighDateTime); - lpStruct->ctime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.ctime_dwLowDateTime); - lpStruct->ctime.dwHighDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.ctime_dwHighDateTime); - lpStruct->atime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.atime_dwLowDateTime); - lpStruct->atime.dwHighDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.atime_dwHighDateTime); - lpStruct->grfMode = (*env)->GetIntField(env, lpObject, STATSTGFc.grfMode); - lpStruct->grfLocksSupported = (*env)->GetIntField(env, lpObject, STATSTGFc.grfLocksSupported); - lpStruct->clsid.Data1 = (*env)->GetIntField(env, lpObject, STATSTGFc.clsid_Data1); - lpStruct->clsid.Data2 = (*env)->GetShortField(env, lpObject, STATSTGFc.clsid_Data2); - lpStruct->clsid.Data3 = (*env)->GetShortField(env, lpObject, STATSTGFc.clsid_Data3); - { - jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, STATSTGFc.clsid_Data4); - (*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->clsid.Data4), (jbyte *)lpStruct->clsid.Data4); - } - lpStruct->grfStateBits = (*env)->GetIntField(env, lpObject, STATSTGFc.grfStateBits); - lpStruct->reserved = (*env)->GetIntField(env, lpObject, STATSTGFc.reserved); - return lpStruct; -} - -void setSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct) -{ - if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject); - (*env)->SetLongField(env, lpObject, STATSTGFc.pwcsName, (jlong)lpStruct->pwcsName); - (*env)->SetIntField(env, lpObject, STATSTGFc.type, (jint)lpStruct->type); - (*env)->SetLongField(env, lpObject, STATSTGFc.cbSize, (jlong)lpStruct->cbSize.QuadPart); - (*env)->SetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime, (jint)lpStruct->mtime.dwLowDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.mtime_dwHighDateTime, (jint)lpStruct->mtime.dwHighDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.ctime_dwLowDateTime, (jint)lpStruct->ctime.dwLowDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.ctime_dwHighDateTime, (jint)lpStruct->ctime.dwHighDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.atime_dwLowDateTime, (jint)lpStruct->atime.dwLowDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.atime_dwHighDateTime, (jint)lpStruct->atime.dwHighDateTime); - (*env)->SetIntField(env, lpObject, STATSTGFc.grfMode, (jint)lpStruct->grfMode); - (*env)->SetIntField(env, lpObject, STATSTGFc.grfLocksSupported, (jint)lpStruct->grfLocksSupported); - (*env)->SetIntField(env, lpObject, STATSTGFc.clsid_Data1, (jint)lpStruct->clsid.Data1); - (*env)->SetShortField(env, lpObject, STATSTGFc.clsid_Data2, (jshort)lpStruct->clsid.Data2); - (*env)->SetShortField(env, lpObject, STATSTGFc.clsid_Data3, (jshort)lpStruct->clsid.Data3); - { - jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, STATSTGFc.clsid_Data4); - (*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->clsid.Data4), (jbyte *)lpStruct->clsid.Data4); - } - (*env)->SetIntField(env, lpObject, STATSTGFc.grfStateBits, (jint)lpStruct->grfStateBits); - (*env)->SetIntField(env, lpObject, STATSTGFc.reserved, (jint)lpStruct->reserved); -} -#endif - #ifndef NO_STGMEDIUM typedef struct STGMEDIUM_FID_CACHE { int cached; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h index 73266764ce..0a84aa3bb5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -41,18 +41,6 @@ void setCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lpStruct); #define CONTROLINFO_sizeof() 0 #endif -#ifndef NO_COSERVERINFO -void cacheCOSERVERINFOFields(JNIEnv *env, jobject lpObject); -COSERVERINFO *getCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct); -void setCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct); -#define COSERVERINFO_sizeof() sizeof(COSERVERINFO) -#else -#define cacheCOSERVERINFOFields(a,b) -#define getCOSERVERINFOFields(a,b,c) NULL -#define setCOSERVERINFOFields(a,b,c) -#define COSERVERINFO_sizeof() 0 -#endif - #ifndef NO_DISPPARAMS void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject); DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct); @@ -65,18 +53,6 @@ void setDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct); #define DISPPARAMS_sizeof() 0 #endif -#ifndef NO_DVTARGETDEVICE -void cacheDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject); -DVTARGETDEVICE *getDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject, DVTARGETDEVICE *lpStruct); -void setDVTARGETDEVICEFields(JNIEnv *env, jobject lpObject, DVTARGETDEVICE *lpStruct); -#define DVTARGETDEVICE_sizeof() sizeof(DVTARGETDEVICE) -#else -#define cacheDVTARGETDEVICEFields(a,b) -#define getDVTARGETDEVICEFields(a,b,c) NULL -#define setDVTARGETDEVICEFields(a,b,c) -#define DVTARGETDEVICE_sizeof() 0 -#endif - #ifndef NO_EXCEPINFO void cacheEXCEPINFOFields(JNIEnv *env, jobject lpObject); EXCEPINFO *getEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct); @@ -149,18 +125,6 @@ void setOLECMDFields(JNIEnv *env, jobject lpObject, OLECMD *lpStruct); #define OLECMD_sizeof() 0 #endif -#ifndef NO_OLECMDTEXT -void cacheOLECMDTEXTFields(JNIEnv *env, jobject lpObject); -OLECMDTEXT *getOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct); -void setOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct); -#define OLECMDTEXT_sizeof() sizeof(OLECMDTEXT) -#else -#define cacheOLECMDTEXTFields(a,b) -#define getOLECMDTEXTFields(a,b,c) NULL -#define setOLECMDTEXTFields(a,b,c) -#define OLECMDTEXT_sizeof() 0 -#endif - #ifndef NO_OLEINPLACEFRAMEINFO void cacheOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject); OLEINPLACEFRAMEINFO *getOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAMEINFO *lpStruct); @@ -173,18 +137,6 @@ void setOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAME #define OLEINPLACEFRAMEINFO_sizeof() 0 #endif -#ifndef NO_STATSTG -void cacheSTATSTGFields(JNIEnv *env, jobject lpObject); -STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct); -void setSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct); -#define STATSTG_sizeof() sizeof(STATSTG) -#else -#define cacheSTATSTGFields(a,b) -#define getSTATSTGFields(a,b,c) NULL -#define setSTATSTGFields(a,b,c) -#define STATSTG_sizeof() 0 -#endif - #ifndef NO_STGMEDIUM void cacheSTGMEDIUMFields(JNIEnv *env, jobject lpObject); STGMEDIUM *getSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java index 43a6c0016c..9a67d30f1a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java @@ -28,8 +28,6 @@ public class COM extends OS { public static final GUID CLSID_TF_InputProcessorProfiles = IIDFromString("{33C53A50-F456-4884-B049-85FD643ECFED}"); //$NON-NLS-1$ public static final GUID GUID_TFCAT_TIP_KEYBOARD = IIDFromString("{34745C63-B2F0-4784-8B67-5E12C8701A31}"); //$NON-NLS-1$ public static final GUID IID_ICustomDestinationList = IIDFromString ("{6332debf-87b5-4670-90c0-5e57b408a49e}"); //$NON-NLS-1$ - public static final GUID IID_IDragSourceHelper = COM.IIDFromString("{DE5BF786-477A-11d2-839D-00C04FD918D0}"); //$NON-NLS-1$ - public static final GUID IID_IDragSourceHelper2 = COM.IIDFromString("{83E07D0D-0C5F-4163-BF1A-60B274051E40}"); //$NON-NLS-1$ public static final GUID IID_IDropTargetHelper = COM.IIDFromString("{4657278B-411B-11D2-839A-00C04FD918D0}"); //$NON-NLS-1$ public static final GUID IID_IFileOpenDialog = IIDFromString("{d57c7288-d4ad-4768-be02-9d969532d960}"); //$NON-NLS-1$ public static final GUID IID_IFileSaveDialog = IIDFromString("{84bccd23-5fde-4cdb-aea4-af64b83d78ab}"); //$NON-NLS-1$ @@ -44,26 +42,11 @@ public class COM extends OS { public static final GUID IID_ITfInputProcessorProfiles = IIDFromString("{1F02B6C5-7842-4EE6-8A0B-9A24183A95CA}"); //$NON-NLS-1$ public static final GUID IIDJavaBeansBridge = COM.IIDFromString("{8AD9C840-044E-11D1-B3E9-00805F499D93}"); //$NON-NLS-1$ public static final GUID IIDShockwaveActiveXControl = COM.IIDFromString("{166B1BCA-3F9C-11CF-8075-444553540000}"); //$NON-NLS-1$ - public static final GUID IIDIEditorSiteTime = IIDFromString("{6BD2AEFE-7876-45e6-A6E7-3BFCDF6540AA}"); //$NON-NLS-1$ - public static final GUID IIDIEditorSiteProperty = IIDFromString("{D381A1F4-2326-4f3c-AFB9-B7537DB9E238}"); //$NON-NLS-1$ - public static final GUID IIDIEditorBaseProperty = IIDFromString("{61E55B0B-2647-47c4-8C89-E736EF15D636}"); //$NON-NLS-1$ - public static final GUID IIDIEditorSite = IIDFromString("{CDD88AB9-B01D-426E-B0F0-30973E9A074B}"); //$NON-NLS-1$ - public static final GUID IIDIEditorService = IIDFromString("{BEE283FE-7B42-4FF3-8232-0F07D43ABCF1}"); //$NON-NLS-1$ - public static final GUID IIDIEditorManager = IIDFromString("{EFDE08C4-BE87-4B1A-BF84-15FC30207180}"); //$NON-NLS-1$ public static final GUID IIDIAccessible = IIDFromString("{618736E0-3C3D-11CF-810C-00AA00389B71}"); //$NON-NLS-1$ - //public static final GUID IIDIAccessibleHandler = IIDFromString("{03022430-ABC4-11D0-BDE2-00AA001A1953}"); //$NON-NLS-1$ - //public static final GUID IIDIAccessor = IIDFromString("{0C733A8C-2A1C-11CE-ADE5-00AA0044773D}"); //$NON-NLS-1$ public static final GUID IIDIAdviseSink = IIDFromString("{0000010F-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIAdviseSink2 = IIDFromString("{00000125-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIBindCtx = IIDFromString("{0000000E-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIClassFactory = IIDFromString("{00000001-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIClassFactory2 = IIDFromString("{B196B28F-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ - public static final GUID IIDIConnectionPoint = IIDFromString("{B196B286-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIConnectionPointContainer = IIDFromString("{B196B284-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ - //public static final GUID IIDICreateErrorInfo = IIDFromString("{22F03340-547D-101B-8E65-08002B2BD119}"); //$NON-NLS-1$ - //public static final GUID IIDICreateTypeInfo = IIDFromString("{00020405-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDICreateTypeLib = IIDFromString("{00020406-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIDataAdviseHolder = IIDFromString("{00000110-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIDataObject = IIDFromString("{0000010E-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIDispatch = IIDFromString("{00020400-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIDispatchEx = IIDFromString("{A6EF9860-C720-11D0-9337-00A0C90DCAA9}"); //$NON-NLS-1$ @@ -71,88 +54,33 @@ public class COM extends OS { public static final GUID IIDIDocHostShowUI = IIDFromString("{C4D244B0-D43E-11CF-893B-00AA00BDCE1A}"); //$NON-NLS-1$ public static final GUID IIDIDropSource = IIDFromString("{00000121-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIDropTarget = IIDFromString("{00000122-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumConnectionPoints = IIDFromString("{B196B285-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumConnections = IIDFromString("{B196B287-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIEnumFORMATETC = IIDFromString("{00000103-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumMoniker = IIDFromString("{00000102-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumOLEVERB = IIDFromString("{00000104-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumSTATDATA = IIDFromString("{00000105-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumSTATSTG = IIDFromString("{0000000D-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumString = IIDFromString("{00000101-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIEnumUnknown = IIDFromString("{00000100-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIEnumVARIANT = IIDFromString("{00020404-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIErrorInfo = IIDFromString("{1CF2B120-547D-101B-8E65-08002B2BD119}"); //$NON-NLS-1$ - //public static final GUID IIDIErrorLog = IIDFromString("{3127CA40-446E-11CE-8135-00AA004BB851}"); //$NON-NLS-1$ - //public static final GUID IIDIExternalConnection = IIDFromString("{00000019-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIFont = IIDFromString("{BEF6E002-A874-101A-8BBA-00AA00300CAB}"); //$NON-NLS-1$ - //public static final GUID IIDIFontDisp = IIDFromString("{BEF6E003-A874-101A-8BBA-00AA00300CAB}"); //$NON-NLS-1$ public static final /*GUID*/ String IIDIHTMLDocumentEvents2 = /*IIDFromString(*/"{3050F613-98B5-11CF-BB82-00AA00BDCE0B}"/*)*/; public static final GUID IIDIInternetSecurityManager = IIDFromString("{79eac9ee-baf9-11ce-8c82-00aa004ba90b}"); //$NON-NLS-1$ public static final GUID IIDIAuthenticate = IIDFromString("{79eac9d0-baf9-11ce-8c82-00aa004ba90b}"); //$NON-NLS-1$ public static final GUID IIDIJScriptTypeInfo = IIDFromString("{C59C6B12-F6C1-11CF-8835-00A0C911E8B2}"); //$NON-NLS-1$ - //public static final GUID IIDILockBytes = IIDFromString("{0000000A-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIMalloc = IIDFromString("{00000002-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIMallocSpy = IIDFromString("{0000001D-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIMarshal = IIDFromString("{00000003-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIMessageFilter = IIDFromString("{00000016-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIMoniker = IIDFromString("{0000000F-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIOleAdviseHolder = IIDFromString("{00000111-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIOleCache = IIDFromString("{0000011E-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIOleCache2 = IIDFromString("{00000128-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIOleCacheControl = IIDFromString("{00000129-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleClientSite = IIDFromString("{00000118-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleCommandTarget = IIDFromString("{B722BCCB-4E68-101B-A2BC-00AA00404770}"); //$NON-NLS-1$ - public static final GUID IIDIOleContainer = IIDFromString("{0000011B-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleControl = IIDFromString("{B196B288-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIOleControlSite = IIDFromString("{B196B289-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIOleDocument = IIDFromString("{B722BCC5-4E68-101B-A2BC-00AA00404770}"); //$NON-NLS-1$ public static final GUID IIDIOleDocumentSite = IIDFromString("{B722BCC7-4E68-101B-A2BC-00AA00404770}"); //$NON-NLS-1$ - public static final GUID IIDIOleInPlaceActiveObject = IIDFromString("{00000117-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleInPlaceFrame = IIDFromString("{00000116-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleInPlaceObject = IIDFromString("{00000113-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleInPlaceSite = IIDFromString("{00000119-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIOleInPlaceUIWindow = IIDFromString("{00000115-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIOleItemContainer = IIDFromString("{0000011C-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleLink = IIDFromString("{0000011D-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIOleObject = IIDFromString("{00000112-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIOleWindow = IIDFromString("{00000114-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIParseDisplayName = IIDFromString("{0000011A-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIPerPropertyBrowsing = IIDFromString("{376BD3AA-3845-101B-84ED-08002B2EC713}"); //$NON-NLS-1$ public static final GUID IIDIPersist = IIDFromString("{0000010C-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIPersistFile = IIDFromString("{0000010B-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIPersistMemory = IIDFromString("{BD1AE5E0-A6AE-11CE-BD37-504200C10000}"); //$NON-NLS-1$ - //public static final GUID IIDIPersistPropertyBag = IIDFromString("{37D84F60-42CB-11CE-8135-00AA004BB851}"); //$NON-NLS-1$ public static final GUID IIDIPersistStorage = IIDFromString("{0000010A-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIPersistStream = IIDFromString("{00000109-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIPersistStreamInit = IIDFromString("{7FD52380-4E07-101B-AE2D-08002B2EC713}"); //$NON-NLS-1$ - //public static final GUID IIDIPicture = IIDFromString("{7BF80980-BF32-101A-8BBB-00AA00300CAB}"); //$NON-NLS-1$ - //public static final GUID IIDIPictureDisp = IIDFromString("{7BF80981-BF32-101A-8BBB-00AA00300CAB}"); //$NON-NLS-1$ - //public static final GUID IIDIPropertyBag = IIDFromString("{55272A00-42CB-11CE-8135-00AA004BB851}"); //$NON-NLS-1$ public static final GUID IIDIPropertyNotifySink = IIDFromString("{9BFBBC02-EFF1-101A-84ED-00AA00341D07}"); //$NON-NLS-1$ - //public static final GUID IIDIPropertyPage = IIDFromString("{B196B28D-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ - //public static final GUID IIDIPropertyPage2 = IIDFromString("{01E44665-24AC-101B-84ED-08002B2EC713}"); //$NON-NLS-1$ - //public static final GUID IIDIPropertyPageSite = IIDFromString("{B196B28C-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIProvideClassInfo = IIDFromString("{B196B283-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ public static final GUID IIDIProvideClassInfo2 = IIDFromString("{A6BC3AC0-DBAA-11CE-9DE3-00AA004BB851}"); //$NON-NLS-1$ - //public static final GUID IIDIPSFactoryBuffer = IIDFromString("{D5F569D0-593B-101A-B569-08002B2DBF7A}"); //$NON-NLS-1$ - //public static final GUID IIDIRootStorage = IIDFromString("{00000012-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIROTData = IIDFromString("{F29F6BC0-5021-11CE-AA15-00006901293F}"); //$NON-NLS-1$ - //public static final GUID IIDIRpcChannelBuffer = IIDFromString("{D5F56B60-593B-101A-B569-08002B2DBF7A}"); //$NON-NLS-1$ - //public static final GUID IIDIRpcProxyBuffer = IIDFromString("{D5F56A34-593B-101A-B569-08002B2DBF7A}"); //$NON-NLS-1$ - //public static final GUID IIDIRpcStubBuffer = IIDFromString("{D5F56AFC-593B-101A-B569-08002B2DBF7A}"); //$NON-NLS-1$ - //public static final GUID IIDIRunnableObject = IIDFromString("{00000126-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIRunningObjectTable = IIDFromString("{00000010-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDISimpleFrameSite = IIDFromString("{742B0E01-14E6-101B-914E-00AA00300CAB}"); //$NON-NLS-1$ public static final GUID IIDIServiceProvider = IIDFromString("{6d5140c1-7436-11ce-8034-00aa006009fa}"); //$NON-NLS-1$ public static final GUID IIDISpecifyPropertyPages = IIDFromString("{B196B28B-BAB4-101A-B69C-00AA00341D07}"); //$NON-NLS-1$ - //public static final GUID IIDIStdMarshalInfo = IIDFromString("{00000018-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIStorage = IIDFromString("{0000000B-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - public static final GUID IIDIStream = IIDFromString("{0000000C-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDISupportErrorInfo = IIDFromString("{DF0B3D60-548F-101B-8E65-08002B2BD119}"); //$NON-NLS-1$ - //public static final GUID IIDITypeComp = IIDFromString("{00020403-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDITypeLib = IIDFromString("{00020402-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIUnknown = IIDFromString("{00000000-0000-0000-C000-000000000046}"); //$NON-NLS-1$ - //public static final GUID IIDIViewObject = IIDFromString("{0000010D-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID IIDIViewObject2 = IIDFromString("{00000127-0000-0000-C000-000000000046}"); //$NON-NLS-1$ public static final GUID CGID_DocHostCommandHandler = IIDFromString("{f38bc242-b950-11d1-8918-00c04fc2c836}"); //$NON-NLS-1$ public static final GUID CGID_Explorer = IIDFromString("{000214D0-0000-0000-C000-000000000046}"); //$NON-NLS-1$ @@ -175,13 +103,6 @@ public class COM extends OS { public static final GUID IIDIAccessibleContext = IIDFromString("{77A123E4-5794-44e0-B8BF-DE600C9D29BD}"); //$NON-NLS-1$ /** Constants */ - //public static final int ADVF_DATAONSTOP = 64; - //public static final int ADVF_NODATA = 1; - //public static final int ADVF_ONLYONCE = 2; - //public static final int ADVF_PRIMEFIRST = 4; - //public static final int ADVFCACHE_FORCEBUILTIN = 16; - //public static final int ADVFCACHE_NOHANDLER = 8; - //public static final int ADVFCACHE_ONSAVE = 32; public static final int CF_TEXT = 1; public static final int CF_BITMAP = 2; public static final int CF_METAFILEPICT = 3; @@ -202,12 +123,6 @@ public class COM extends OS { public static final int CLSCTX_INPROC_HANDLER = 2; public static final int CLSCTX_INPROC_SERVER = 1; public static final int CLSCTX_LOCAL_SERVER = 4; - public static final int CLSCTX_REMOTE_SERVER = 16; - public static final int CO_E_CLASSSTRING = -2147221005; - //public static final int COINIT_APARTMENTTHREADED = 2; - //public static final int COINIT_DISABLE_OLE1DDE = 4; - //public static final int COINIT_MULTITHREADED = 0; - //public static final int COINIT_SPEED_OVER_MEMORY = 8; public static final int DATADIR_GET = 1; public static final int DATADIR_SET = 2; public static final int DISPATCH_CONSTRUCT = 0x4000; @@ -215,28 +130,16 @@ public class COM extends OS { public static final int DISP_E_MEMBERNOTFOUND = -2147352573; public static final int DISP_E_UNKNOWNINTERFACE = 0x80020001; public static final int DISP_E_UNKNOWNNAME = 0x80020006; - //public static final int DISPID_AMBIENT_APPEARANCE = -716; - //public static final int DISPID_AMBIENT_AUTOCLIP = -715; public static final int DISPID_AMBIENT_BACKCOLOR = -701; - //public static final int DISPID_AMBIENT_CHARSET = -727; - //public static final int DISPID_AMBIENT_CODEPAGE = -725; - //public static final int DISPID_AMBIENT_DISPLAYASDEFAULT = -713; - //public static final int DISPID_AMBIENT_DISPLAYNAME = -702; public static final int DISPID_AMBIENT_FONT = -703; public static final int DISPID_AMBIENT_FORECOLOR = -704; public static final int DISPID_AMBIENT_LOCALEID = -705; public static final int DISPID_AMBIENT_MESSAGEREFLECT = -706; public static final int DISPID_AMBIENT_OFFLINEIFNOTCONNECTED = -5501; - //public static final int DISPID_AMBIENT_PALETTE = -726; - //public static final int DISPID_AMBIENT_RIGHTTOLEFT = -732; - //public static final int DISPID_AMBIENT_SCALEUNITS = -707; public static final int DISPID_AMBIENT_SHOWGRABHANDLES = -711; public static final int DISPID_AMBIENT_SHOWHATCHING = -712; public static final int DISPID_AMBIENT_SILENT = -5502; public static final int DISPID_AMBIENT_SUPPORTSMNEMONICS = -714; - //public static final int DISPID_AMBIENT_TEXTALIGN = -708; - //public static final int DISPID_AMBIENT_TOPTOBOTTOM = -733; - //public static final int DISPID_AMBIENT_TRANSFERPRIORITY = -728; public static final int DISPID_AMBIENT_UIDEAD = -710; public static final int DISPID_AMBIENT_USERMODE = -709; public static final int DISPID_BACKCOLOR = -501; @@ -263,8 +166,6 @@ public class COM extends OS { public static final int DISPID_HTMLDOCUMENTEVENTS_ONMOUSEUP = 0xFFFFFDA1; public static final int DISPID_HTMLDOCUMENTEVENTS_ONMOUSEWHEEL = 1033; - //public static final int DISPID_READYSTATE = -525; - //public static final int DISPID_READYSTATECHANGE = -609; public static final int DRAGDROP_S_DROP = 0x00040100; public static final int DRAGDROP_S_CANCEL = 0x00040101; public static final int DRAGDROP_S_USEDEFAULTCURSORS = 0x00040102; @@ -272,166 +173,53 @@ public class COM extends OS { public static final int DROPEFFECT_COPY = 1; public static final int DROPEFFECT_MOVE = 2; public static final int DROPEFFECT_LINK = 4; - public static final int DROPEFFECT_SCROLL = 0x80000000; - public static final int DSH_ALLOWDROPDESCRIPTIONTEXT = 0x1; public static final int DV_E_FORMATETC = -2147221404; public static final int DV_E_STGMEDIUM = -2147221402; public static final int DV_E_TYMED = -2147221399; public static final int DVASPECT_CONTENT = 1; - //public static final int DVASPECT_DOCPRINT = 8; - //public static final int DVASPECT_ICON = 4; - //public static final int DVASPECT_THUMBNAIL = 2; public static final int E_ACCESSDENIED = 0x80070005; public static final int E_FAIL = -2147467259; public static final int E_INVALIDARG = -2147024809; public static final int E_NOINTERFACE = -2147467262; public static final int E_NOTIMPL = -2147467263; public static final int E_NOTSUPPORTED = 0x80040100; - //public static final int E_NOTLICENSED = -2147221230; public static final int E_OUTOFMEMORY = -2147024882; - //public static final int E_POINTER = -2147467261; public static final int GMEM_FIXED = 0; - //public static final int GMEM_MOVABLE = 2; - //public static final int GMEM_NODISCARD = 32; public static final int GMEM_ZEROINIT = 64; public static final int GUIDKIND_DEFAULT_SOURCE_DISP_IID = 1; public static final int IMPLTYPEFLAG_FDEFAULT = 1; - //public static final int IMPLTYPEFLAG_FDEFAULTVTABLE = 2048; public static final int IMPLTYPEFLAG_FRESTRICTED = 4; public static final int IMPLTYPEFLAG_FSOURCE = 2; - public static final int LOCALE_SYSTEM_DEFAULT = 1024; public static final int LOCALE_USER_DEFAULT = 2048; - //public static final int MEMCTX_TASK = 1; - //public static final int OLEACTIVATEAUTO = 3; - //public static final int OLEACTIVATEDOUBLECLICK = 2; - //public static final int OLEACTIVATEGETFOCUS = 1; - //public static final int OLEACTIVATEMANUAL = 0; - //public static final int OLEAUTOMATIC = 0; - //public static final int OLECHANGED = 0; public static final int OLECLOSE_NOSAVE = 1; - //public static final int OLECLOSE_PROMPTSAVE = 2; public static final int OLECLOSE_SAVEIFDIRTY = 0; - //public static final int OLECLOSED = 2; - //public static final int OLECONTF_EMBEDDINGS = 1; - //public static final int OLECONTF_LINKS = 2; - //public static final int OLECONTF_ONLYIFRUNNING = 16; - //public static final int OLECONTF_ONLYUSER = 8; - //public static final int OLECONTF_OTHERS = 4; - //public static final int OLEDEACTIVATEMANUAL = 1; - //public static final int OLEDEACTIVATEONLOSEFOCUS = 0; - //public static final int OLEDECBORDER = 1; - //public static final int OLEDECBORDERANDNIBS = 3; - //public static final int OLEDECNIBS = 2; - //public static final int OLEDECNONE = 0; - //public static final int OLEDISPLAYCONTENT = 0; - //public static final int OLEDISPLAYICON = 1; - //public static final int OLEEITHER = 2; public static final int OLEEMBEDDED = 1; - //public static final int OLEFROZEN = 1; - public static final int OLEIVERB_DISCARDUNDOSTATE = -6; - //public static final int OLEIVERB_HIDE = -3; - public static final int OLEIVERB_INPLACEACTIVATE = -5; - //public static final int OLEIVERB_OPEN = -2; - public static final int OLEIVERB_PRIMARY = 0; - //public static final int OLEIVERB_PROPERTIES = -7; - //public static final int OLEIVERB_SHOW = -1; - //public static final int OLEIVERB_UIACTIVATE = -4; public static final int OLELINKED = 0; - //public static final int OLEMANUAL = 2; - //public static final int OLEMISC_ACTIVATEWHENVISIBLE = 256; - //public static final int OLEMISC_ACTSLIKEBUTTON = 4096; - //public static final int OLEMISC_ACTSLIKELABEL = 8192; - //public static final int OLEMISC_ALIGNABLE = 32768; - //public static final int OLEMISC_ALWAYSRUN = 2048; - //public static final int OLEMISC_CANLINKBYOLE1 = 32; - //public static final int OLEMISC_CANTLINKINSIDE = 16; - //public static final int OLEMISC_IGNOREACTIVATEWHENVISIBLE = 524288; - //public static final int OLEMISC_IMEMODE = 262144; - //public static final int OLEMISC_INSERTNOTREPLACE = 4; - //public static final int OLEMISC_INSIDEOUT = 128; - //public static final int OLEMISC_INVISIBLEATRUNTIME = 1024; - //public static final int OLEMISC_ISLINKOBJECT = 64; - //public static final int OLEMISC_NOUIACTIVATE = 16384; - //public static final int OLEMISC_ONLYICONIC = 2; - //public static final int OLEMISC_RECOMPOSEONRESIZE = 1; - //public static final int OLEMISC_RENDERINGISDEVICEINDEPENDENT = 512; - //public static final int OLEMISC_SETCLIENTSITEFIRST = 131072; - //public static final int OLEMISC_SIMPLEFRAME = 65536; - //public static final int OLEMISC_STATIC = 8; - //public static final int OLEMISC_SUPPORTSMULTILEVELUNDO = 2097152; - //public static final int OLEMISC_WANTSTOMENUMERGE = 1048576; - //public static final int OLENONE = 3; - //public static final int OLERENAMED = 3; - //public static final int OLERENDER_ASIS = 3; public static final int OLERENDER_DRAW = 1; - //public static final int OLERENDER_FORMAT = 2; - //public static final int OLERENDER_NONE = 0; - //public static final int OLESAVED = 1; - //public static final int OLESIZEAUTOSIZE = 2; - //public static final int OLESIZECLIP = 0; - //public static final int OLESIZESTRETCH = 1; - //public static final int OLESIZEZOOM = 3; - //public static final int OLEWHICHMK_CONTAINER = 1; - //public static final int OLEWHICHMK_OBJFULL = 3; - //public static final int OLEWHICHMK_OBJREL = 2; public static final int S_FALSE = 1; public static final int S_OK = 0; - public static final int STG_E_FILENOTFOUND = 0x80030002; - public static final int STG_S_CONVERTED = 0x00030200; - //public static final int STGC_CONSOLIDATE = 8; - //public static final int STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4; public static final int STGC_DEFAULT = 0; - //public static final int STGC_ONLYIFCURRENT = 2; - //public static final int STGC_OVERWRITE = 1; - public static final int STGM_CONVERT = 0x00020000; public static final int STGM_CREATE = 0x00001000; public static final int STGM_DELETEONRELEASE = 0x04000000; public static final int STGM_DIRECT = 0x00000000; - public static final int STGM_DIRECT_SWMR = 0x00400000; - public static final int STGM_FAILIFTHERE = 0x00000000; - public static final int STGM_NOSCRATCH = 0x00100000; - public static final int STGM_NOSNAPSHOT = 0x00200000; - public static final int STGM_PRIORITY = 0x00040000; public static final int STGM_READ = 0x00000000; public static final int STGM_READWRITE = 0x00000002; - public static final int STGM_SHARE_DENY_NONE = 0x00000040; - public static final int STGM_SHARE_DENY_READ = 0x00000030; - public static final int STGM_SHARE_DENY_WRITE = 0x00000020; public static final int STGM_SHARE_EXCLUSIVE = 0x00000010; - public static final int STGM_SIMPLE = 0x08000000; public static final int STGM_TRANSACTED = 0x00010000; - public static final int STGM_WRITE = 0x00000001; - public static final int STGTY_STORAGE = 1; - public static final int STGTY_STREAM = 2; - public static final int STGTY_LOCKBYTES = 3; - public static final int STGTY_PROPERTY = 4; - //public static final int TYMED_ENHMF = 64; - //public static final int TYMED_FILE = 2; - //public static final int TYMED_GDI = 16; public static final int TYMED_HGLOBAL = 1; - //public static final int TYMED_ISTORAGE = 8; - //public static final int TYMED_ISTREAM = 4; - //public static final int TYMED_MFPICT = 32; - //public static final int TYMED_NULL = 0; public static final short DISPATCH_METHOD = 0x1; public static final short DISPATCH_PROPERTYGET = 0x2; public static final short DISPATCH_PROPERTYPUT = 0x4; public static final short DISPATCH_PROPERTYPUTREF = 0x8; - //public static final short DISPID_CONSTRUCTOR = -6; - //public static final short DISPID_DESTRUCTOR = -7; - //public static final short DISPID_EVALUATE = -5; - //public static final short DISPID_NEWENUM = -4; public static final short DISPID_PROPERTYPUT = -3; public static final short DISPID_UNKNOWN = -1; public static final short DISPID_VALUE = 0; public static final short VT_BOOL = 11; public static final short VT_BSTR = 8; public static final short VT_BYREF = 16384; - public static final short VT_CY = 6; public static final short VT_DATE = 7; public static final short VT_DISPATCH = 9; public static final short VT_EMPTY = 0; - public static final short VT_ERROR = 10; public static final short VT_I1 = 16; public static final short VT_I2 = 2; public static final short VT_I4 = 3; @@ -499,21 +287,11 @@ public static final native void MoveMemory(long Destination, FORMATETC Source, i * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long DestinationPtr, GUID Source, int Length); -/** - * @param DestinationPtr cast=(PVOID) - * @param Source cast=(CONST VOID *),flags=no_out - */ public static final native void MoveMemory(long DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long Destination, STATSTG Source, int Length); -/** - * @param Destination cast=(PVOID) - * @param Source cast=(CONST VOID *),flags=no_out - */ public static final native void MoveMemory(long Destination, STGMEDIUM Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in @@ -537,11 +315,6 @@ public static final native void MoveMemory(FORMATETC Destination, long Source, i public static final native void MoveMemory(GUID Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in - * @param Source cast=(CONST VOID *) - */ -public static final native void MoveMemory(STATSTG Destination, long Source, int Length); -/** - * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ public static final native void MoveMemory(TYPEATTR Destination, long SourcePtr, int Length); @@ -601,12 +374,6 @@ public static final native int OleGetClipboard(long[] ppDataObject); public static final native int OleIsCurrentClipboard(long pDataObject); /** @param pObject cast=(LPOLEOBJECT) */ public static final native boolean OleIsRunning(long pObject); -/** - * @param pStg cast=(IStorage *) - * @param pClientSite cast=(IOleClientSite *) - * @param ppvObj cast=(LPVOID *) - */ -public static final native int OleLoad(long pStg, GUID riid, long pClientSite, long[] ppvObj); /** @param pUnknown cast=(LPUNKNOWN) */ public static final native int OleRun(long pUnknown); /** @@ -657,13 +424,6 @@ public static final native int RevokeDragDrop(long hwnd); * @param ppv cast=(void **) */ public static final native int SHCreateItemFromParsingName (char [] pszName, long pbc, GUID riid, long [] ppv); -/** - * @param hwnd cast=(HWND) - * @param pDataObject cast=(IDataObject *) - * @param pDropSource cast=(IDropSource *) - * @param pdwEffect cast=(DWORD *) - */ -public static final native int SHDoDragDrop(long hwnd, long pDataObject, long pDropSource, int dwOKEffect, int[] pdwEffect); /** @param ppstgOpen cast=(IStorage **) */ public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, long[] ppstgOpen); /** @param pwcsName cast=(const WCHAR *) */ @@ -675,8 +435,6 @@ public static final native int StgIsStorageFile(char[] pwcsName); * @param ppstgOpen cast=(IStorage **) */ public static final native int StgOpenStorage(char[] pwcsName, long pstgPriority, int grfMode, long snbExclude, int reserved, long[] ppstgOpen); -/** @param ppsz cast=(LPOLESTR *) */ -public static final native int StringFromCLSID(GUID rclsid, long[] ppsz); /** @param sz cast=(OLECHAR *) */ public static final native long SysAllocString(char [] sz); /** @param bstr cast=(BSTR) */ @@ -695,6 +453,8 @@ public static final native int VariantChangeType(long pvargDest, long pvarSrc, s public static final native int VariantClear(long pvarg); /** @param pvarg cast=(VARIANTARG FAR* ) */ public static final native void VariantInit(long pvarg); +/** @param pStg cast=(IStorage *) */ +public static final native int WriteClassStg(long pStg, GUID rclsid); /** @method flags=trycatch */ public static final native int VtblCall(int fnNumber, long ppVtbl); @@ -724,17 +484,15 @@ public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, lo public static final native int VtblCall(int fnNumber, long ppVtbl, int[] arg0, GUID arg1, long[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, POINT arg1, long arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, POINT arg0, int arg1); -public static final native int VtblCall(int fnNumber, long ppVtbl, SHDRAGIMAGE arg0, long arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long[] arg1); -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, long[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long arg1, int[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, long arg2, SIZE arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, long arg2, long arg3); @@ -742,22 +500,20 @@ public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUI public static final native int VtblCall(int fnNumber, long ppVtbl, MSG arg0); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, SIZE arg1); -public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, boolean arg1); -public static final native int VtblCall(int fnNumber, long ppVtbl, boolean arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, CAUUID arg0); public static final native int VtblCall(int fnNumber, long ppVtbl, CONTROLINFO arg0); public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0); public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0, STGMEDIUM arg1); -public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0); public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, long[] arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, GUID arg1, long[] arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4); -public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, OLECMD arg2, long arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, GUID arg2, GUID arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, LICINFO arg0); -public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, boolean arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, int arg2); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, RECT arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0); @@ -769,31 +525,19 @@ public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int */ public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, long arg2); -/** @param pStg cast=(IStorage *) */ -public static final native int WriteClassStg(long pStg, GUID rclsid); - /** Accessibility constants */ public static final int CHILDID_SELF = 0; public static final int CO_E_OBJNOTCONNECTED = 0x800401FD; -//public static final int ROLE_SYSTEM_TITLEBAR = 0x1; public static final int ROLE_SYSTEM_MENUBAR = 0x2; public static final int ROLE_SYSTEM_SCROLLBAR = 0x3; -//public static final int ROLE_SYSTEM_GRIP = 0x4; -//public static final int ROLE_SYSTEM_SOUND = 0x5; -//public static final int ROLE_SYSTEM_CURSOR = 0x6; -//public static final int ROLE_SYSTEM_CARET = 0x7; public static final int ROLE_SYSTEM_ALERT = 0x8; public static final int ROLE_SYSTEM_WINDOW = 0x9; public static final int ROLE_SYSTEM_CLIENT = 0xa; public static final int ROLE_SYSTEM_MENUPOPUP = 0xb; public static final int ROLE_SYSTEM_MENUITEM = 0xc; public static final int ROLE_SYSTEM_TOOLTIP = 0xd; -//public static final int ROLE_SYSTEM_APPLICATION = 0xe; public static final int ROLE_SYSTEM_DOCUMENT = 0xf; -//public static final int ROLE_SYSTEM_PANE = 0x10; -//public static final int ROLE_SYSTEM_CHART = 0x11; public static final int ROLE_SYSTEM_DIALOG = 0x12; -//public static final int ROLE_SYSTEM_BORDER = 0x13; public static final int ROLE_SYSTEM_GROUPING = 0x14; public static final int ROLE_SYSTEM_SEPARATOR = 0x15; public static final int ROLE_SYSTEM_TOOLBAR = 0x16; @@ -805,15 +549,11 @@ public static final int ROLE_SYSTEM_COLUMN = 0x1b; public static final int ROLE_SYSTEM_ROW = 0x1c; public static final int ROLE_SYSTEM_CELL = 0x1d; public static final int ROLE_SYSTEM_LINK = 0x1e; -//public static final int ROLE_SYSTEM_HELPBALLOON = 0x1f; -//public static final int ROLE_SYSTEM_CHARACTER = 0x20; public static final int ROLE_SYSTEM_LIST = 0x21; public static final int ROLE_SYSTEM_LISTITEM = 0x22; public static final int ROLE_SYSTEM_OUTLINE = 0x23; public static final int ROLE_SYSTEM_OUTLINEITEM = 0x24; public static final int ROLE_SYSTEM_PAGETAB = 0x25; -//public static final int ROLE_SYSTEM_PROPERTYPAGE = 0x26; -//public static final int ROLE_SYSTEM_INDICATOR = 0x27; public static final int ROLE_SYSTEM_GRAPHIC = 0x28; public static final int ROLE_SYSTEM_STATICTEXT = 0x29; public static final int ROLE_SYSTEM_TEXT = 0x2a; @@ -823,22 +563,12 @@ public static final int ROLE_SYSTEM_RADIOBUTTON = 0x2d; public static final int ROLE_SYSTEM_COMBOBOX = 0x2e; public static final int ROLE_SYSTEM_DROPLIST = 0x2f; public static final int ROLE_SYSTEM_PROGRESSBAR = 0x30; -//public static final int ROLE_SYSTEM_DIAL = 0x31; -//public static final int ROLE_SYSTEM_HOTKEYFIELD = 0x32; public static final int ROLE_SYSTEM_SLIDER = 0x33; public static final int ROLE_SYSTEM_SPINBUTTON = 0x34; -//public static final int ROLE_SYSTEM_DIAGRAM = 0x35; public static final int ROLE_SYSTEM_ANIMATION = 0x36; -//public static final int ROLE_SYSTEM_EQUATION = 0x37; -//public static final int ROLE_SYSTEM_BUTTONDROPDOWN = 0x38; -//public static final int ROLE_SYSTEM_BUTTONMENU = 0x39; -//public static final int ROLE_SYSTEM_BUTTONDROPDOWNGRID = 0x3a; -//public static final int ROLE_SYSTEM_WHITESPACE = 0x3b; public static final int ROLE_SYSTEM_PAGETABLIST = 0x3c; public static final int ROLE_SYSTEM_CLOCK = 0x3d; public static final int ROLE_SYSTEM_SPLITBUTTON = 0x3e; -//public static final int ROLE_SYSTEM_IPADDRESS = 0x3f; -//public static final int ROLE_SYSTEM_OUTLINEBUTTON = 0x40; public static final int STATE_SYSTEM_NORMAL = 0; public static final int STATE_SYSTEM_UNAVAILABLE = 0x1; @@ -849,94 +579,81 @@ public static final int STATE_SYSTEM_CHECKED = 0x10; public static final int STATE_SYSTEM_MIXED = 0x20; public static final int STATE_SYSTEM_READONLY = 0x40; public static final int STATE_SYSTEM_HOTTRACKED = 0x80; -//public static final int STATE_SYSTEM_DEFAULT = 0x100; public static final int STATE_SYSTEM_EXPANDED = 0x200; public static final int STATE_SYSTEM_COLLAPSED = 0x400; public static final int STATE_SYSTEM_BUSY = 0x800; -//public static final int STATE_SYSTEM_FLOATING = 0x1000; -//public static final int STATE_SYSTEM_MARQUEED = 0x2000; -//public static final int STATE_SYSTEM_ANIMATED = 0x4000; public static final int STATE_SYSTEM_INVISIBLE = 0x8000; public static final int STATE_SYSTEM_OFFSCREEN = 0x10000; public static final int STATE_SYSTEM_SIZEABLE = 0x20000; -//public static final int STATE_SYSTEM_MOVEABLE = 0x40000; -//public static final int STATE_SYSTEM_SELFVOICING = 0x80000; public static final int STATE_SYSTEM_FOCUSABLE = 0x100000; public static final int STATE_SYSTEM_SELECTABLE = 0x200000; public static final int STATE_SYSTEM_LINKED = 0x400000; -//public static final int STATE_SYSTEM_TRAVERSED = 0x800000; public static final int STATE_SYSTEM_MULTISELECTABLE = 0x1000000; -//public static final int STATE_SYSTEM_EXTSELECTABLE = 0x2000000; -//public static final int STATE_SYSTEM_ALERT_LOW = 0x4000000; -//public static final int STATE_SYSTEM_ALERT_MEDIUM = 0x8000000; -//public static final int STATE_SYSTEM_ALERT_HIGH = 0x10000000; -//public static final int STATE_SYSTEM_PROTECTED = 0x20000000; -//public static final int STATE_SYSTEM_VALID = 0x3fffffff; -public static final int EVENT_OBJECT_SELECTIONWITHIN = 0x8009; -public static final int EVENT_OBJECT_STATECHANGE = 0x800A; -public static final int EVENT_OBJECT_LOCATIONCHANGE = 0x800B; -public static final int EVENT_OBJECT_NAMECHANGE = 0x800C; -public static final int EVENT_OBJECT_DESCRIPTIONCHANGE = 0x800D; -public static final int EVENT_OBJECT_VALUECHANGE = 0x800E; +public static final int EVENT_OBJECT_SELECTIONWITHIN = 0x8009; +public static final int EVENT_OBJECT_STATECHANGE = 0x800A; +public static final int EVENT_OBJECT_LOCATIONCHANGE = 0x800B; +public static final int EVENT_OBJECT_NAMECHANGE = 0x800C; +public static final int EVENT_OBJECT_DESCRIPTIONCHANGE = 0x800D; +public static final int EVENT_OBJECT_VALUECHANGE = 0x800E; public static final int EVENT_OBJECT_TEXTSELECTIONCHANGED = 0x8014; /* IA2 additional constants */ public static final int IA2_COORDTYPE_SCREEN_RELATIVE = 0; public static final int IA2_COORDTYPE_PARENT_RELATIVE = 1; -public static final int IA2_STATE_ACTIVE = 0x00000001; -public static final int IA2_STATE_SINGLE_LINE = 0x00002000; -public static final int IA2_STATE_MULTI_LINE = 0x00000200; -public static final int IA2_STATE_REQUIRED = 0x00000800; -public static final int IA2_STATE_INVALID_ENTRY = 0x00000040; -public static final int IA2_STATE_SUPPORTS_AUTOCOMPLETION = 0x00008000; -public static final int IA2_STATE_EDITABLE = 0x00000008; +public static final int IA2_STATE_ACTIVE = 0x00000001; +public static final int IA2_STATE_SINGLE_LINE = 0x00002000; +public static final int IA2_STATE_MULTI_LINE = 0x00000200; +public static final int IA2_STATE_REQUIRED = 0x00000800; +public static final int IA2_STATE_INVALID_ENTRY = 0x00000040; +public static final int IA2_STATE_SUPPORTS_AUTOCOMPLETION = 0x00008000; +public static final int IA2_STATE_EDITABLE = 0x00000008; -public static final int IA2_EVENT_DOCUMENT_LOAD_COMPLETE = 0x00000105; -public static final int IA2_EVENT_DOCUMENT_LOAD_STOPPED = 0x00000106; -public static final int IA2_EVENT_DOCUMENT_RELOAD = 0x00000107; -public static final int IA2_EVENT_PAGE_CHANGED = 0x00000111; -public static final int IA2_EVENT_SECTION_CHANGED = 0x00000112; -public static final int IA2_EVENT_ACTION_CHANGED = 0x00000101; -public static final int IA2_EVENT_HYPERLINK_START_INDEX_CHANGED = 0x0000010d; -public static final int IA2_EVENT_HYPERLINK_END_INDEX_CHANGED = 0x00000108; -public static final int IA2_EVENT_HYPERLINK_ANCHOR_COUNT_CHANGED = 0x00000109; +public static final int IA2_EVENT_DOCUMENT_LOAD_COMPLETE = 0x00000105; +public static final int IA2_EVENT_DOCUMENT_LOAD_STOPPED = 0x00000106; +public static final int IA2_EVENT_DOCUMENT_RELOAD = 0x00000107; +public static final int IA2_EVENT_PAGE_CHANGED = 0x00000111; +public static final int IA2_EVENT_SECTION_CHANGED = 0x00000112; +public static final int IA2_EVENT_ACTION_CHANGED = 0x00000101; +public static final int IA2_EVENT_HYPERLINK_START_INDEX_CHANGED = 0x0000010d; +public static final int IA2_EVENT_HYPERLINK_END_INDEX_CHANGED = 0x00000108; +public static final int IA2_EVENT_HYPERLINK_ANCHOR_COUNT_CHANGED = 0x00000109; public static final int IA2_EVENT_HYPERLINK_SELECTED_LINK_CHANGED = 0x0000010a; -public static final int IA2_EVENT_HYPERLINK_ACTIVATED = 0x0000010b; -public static final int IA2_EVENT_HYPERTEXT_LINK_SELECTED = 0x0000010c; -public static final int IA2_EVENT_HYPERTEXT_LINK_COUNT_CHANGED = 0x0000010f; -public static final int IA2_EVENT_ATTRIBUTE_CHANGED = 0x00000110; -public static final int IA2_EVENT_TABLE_CAPTION_CHANGED = 0x00000113; +public static final int IA2_EVENT_HYPERLINK_ACTIVATED = 0x0000010b; +public static final int IA2_EVENT_HYPERTEXT_LINK_SELECTED = 0x0000010c; +public static final int IA2_EVENT_HYPERTEXT_LINK_COUNT_CHANGED = 0x0000010f; +public static final int IA2_EVENT_ATTRIBUTE_CHANGED = 0x00000110; +public static final int IA2_EVENT_TABLE_CAPTION_CHANGED = 0x00000113; public static final int IA2_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 0x00000114; -public static final int IA2_EVENT_TABLE_COLUMN_HEADER_CHANGED = 0x00000115; -public static final int IA2_EVENT_TABLE_CHANGED = 0x00000116; -public static final int IA2_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 0x00000117; -public static final int IA2_EVENT_TABLE_ROW_HEADER_CHANGED = 0x00000118; -public static final int IA2_EVENT_TABLE_SUMMARY_CHANGED = 0x00000119; -public static final int IA2_EVENT_TEXT_ATTRIBUTE_CHANGED = 0x0000011a; -public static final int IA2_EVENT_TEXT_CARET_MOVED = 0x0000011b; -public static final int IA2_EVENT_TEXT_COLUMN_CHANGED = 0x0000011d; -public static final int IA2_EVENT_TEXT_INSERTED = 0x0000011e; -public static final int IA2_EVENT_TEXT_REMOVED = 0x0000011f; +public static final int IA2_EVENT_TABLE_COLUMN_HEADER_CHANGED = 0x00000115; +public static final int IA2_EVENT_TABLE_CHANGED = 0x00000116; +public static final int IA2_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 0x00000117; +public static final int IA2_EVENT_TABLE_ROW_HEADER_CHANGED = 0x00000118; +public static final int IA2_EVENT_TABLE_SUMMARY_CHANGED = 0x00000119; +public static final int IA2_EVENT_TEXT_ATTRIBUTE_CHANGED = 0x0000011a; +public static final int IA2_EVENT_TEXT_CARET_MOVED = 0x0000011b; +public static final int IA2_EVENT_TEXT_COLUMN_CHANGED = 0x0000011d; +public static final int IA2_EVENT_TEXT_INSERTED = 0x0000011e; +public static final int IA2_EVENT_TEXT_REMOVED = 0x0000011f; -public static final int IA2_TEXT_BOUNDARY_CHAR = 0; -public static final int IA2_TEXT_BOUNDARY_WORD = 1; -public static final int IA2_TEXT_BOUNDARY_SENTENCE = 2; -public static final int IA2_TEXT_BOUNDARY_PARAGRAPH = 3; -public static final int IA2_TEXT_BOUNDARY_LINE = 4; -public static final int IA2_TEXT_BOUNDARY_ALL = 5; +public static final int IA2_TEXT_BOUNDARY_CHAR = 0; +public static final int IA2_TEXT_BOUNDARY_WORD = 1; +public static final int IA2_TEXT_BOUNDARY_SENTENCE = 2; +public static final int IA2_TEXT_BOUNDARY_PARAGRAPH = 3; +public static final int IA2_TEXT_BOUNDARY_LINE = 4; +public static final int IA2_TEXT_BOUNDARY_ALL = 5; -public static final int IA2_TEXT_OFFSET_LENGTH = -1; -public static final int IA2_TEXT_OFFSET_CARET = -2; +public static final int IA2_TEXT_OFFSET_LENGTH = -1; +public static final int IA2_TEXT_OFFSET_CARET = -2; -public static final int IA2_SCROLL_TYPE_TOP_LEFT = 0; -public static final int IA2_SCROLL_TYPE_BOTTOM_RIGHT = 1; -public static final int IA2_SCROLL_TYPE_TOP_EDGE = 2; -public static final int IA2_SCROLL_TYPE_BOTTOM_EDGE = 3; -public static final int IA2_SCROLL_TYPE_LEFT_EDGE = 4; -public static final int IA2_SCROLL_TYPE_RIGHT_EDGE = 5; -public static final int IA2_SCROLL_TYPE_ANYWHERE = 6; +public static final int IA2_SCROLL_TYPE_TOP_LEFT = 0; +public static final int IA2_SCROLL_TYPE_BOTTOM_RIGHT = 1; +public static final int IA2_SCROLL_TYPE_TOP_EDGE = 2; +public static final int IA2_SCROLL_TYPE_BOTTOM_EDGE = 3; +public static final int IA2_SCROLL_TYPE_LEFT_EDGE = 4; +public static final int IA2_SCROLL_TYPE_RIGHT_EDGE = 5; +public static final int IA2_SCROLL_TYPE_ANYWHERE = 6; /** Accessibility natives */ @@ -971,9 +688,7 @@ public static final native int AccessibleChildren(long paccContainer, int iChild /* sizeof's */ public static final native int CAUUID_sizeof(); public static final native int CONTROLINFO_sizeof(); -public static final native int COSERVERINFO_sizeof(); public static final native int DISPPARAMS_sizeof(); -public static final native int DVTARGETDEVICE_sizeof(); public static final native int ELEMDESC_sizeof(); public static final native int EXCEPINFO_sizeof(); public static final native int FORMATETC_sizeof(); @@ -982,7 +697,6 @@ public static final native int GUID_sizeof(); public static final native int LICINFO_sizeof(); public static final native int OLECMD_sizeof(); public static final native int OLEINPLACEFRAMEINFO_sizeof(); -public static final native int STATSTG_sizeof(); public static final native int STGMEDIUM_sizeof(); public static final native int TYPEATTR_sizeof(); public static final native int TYPEDESC_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java deleted file mode 100644 index 2a7549f44d..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class COSERVERINFO { - public int dwReserved1; - /** @field cast=(LPWSTR) */ - public long pwszName; - /** @field cast=(COAUTHINFO *) */ - public long pAuthInfo; - public int dwReserved2; - public static final int sizeof = COM.COSERVERINFO_sizeof (); -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java deleted file mode 100644 index b5b2a31526..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public final class DVTARGETDEVICE { - public int tdSize; - public short tdDriverNameOffset; - public short tdDeviceNameOffset; - public short tdPortNameOffset; - public short tdExtDevmodeOffset; - public byte[] tdData = new byte[1]; - public static final int sizeof = COM.DVTARGETDEVICE_sizeof (); -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java index 0abdb3f9c2..1f8214e24a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java @@ -27,20 +27,7 @@ public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) { //The caller then assumes responsibility for releasing the STGMEDIUM structure. return COM.VtblCall(3, address, pFormatetc, pmedium); } -public int GetDataHere(FORMATETC pFormatetc, STGMEDIUM pmedium) { - //Called by a data consumer to obtain data from a source data object. - //This method differs from the GetData method in that the caller must - //allocate and free the specified storage medium. - return COM.VtblCall(4, address, pFormatetc, pmedium); -} public int QueryGetData(FORMATETC pFormatetc) { return COM.VtblCall(5, address, pFormatetc); } -public int SetData( - FORMATETC pFormatetc, // Pointer to the FORMATETC structure - STGMEDIUM pmedium, // Pointer to STGMEDIUM structure - boolean fRelease // Indicates which object owns the storage medium after the call is completed - ){ - return COM.VtblCall(7, address, pFormatetc, pmedium, fRelease); -} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java index 7c03aa8d58..a93811e97d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java @@ -61,9 +61,6 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in public int GetTypeInfo(int iTInfo, int lcid, long[] ppTInfo ){ return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo); } -public int GetTypeInfoCount(int [] pctinfo ){ - return COM.VtblCall(3, address, pctinfo); -} public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, long pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java index 32f4d1ff26..08f5f1c6b9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java @@ -19,35 +19,8 @@ public IDispatchEx (long address) { super (address); } -public int GetDispID (long bstrName, int grfdex, int[] pid) { - return COM.VtblCall (7, address, bstrName, grfdex, pid); -} - public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long pvarRes, EXCEPINFO pei, long pspCaller) { return COM.VtblCall (8, address, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } -public int DeleteMemberByName (long bstrName, int grfdex) { - return COM.VtblCall (9, address, bstrName, grfdex); -} - -public int DeleteMemberByDispID (int id) { - return COM.VtblCall (10, address, id); -} - -public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) { - return COM.VtblCall (11, address, id, grfdexFetch, pgrfdex); -} - -public int GetMemberName (int id, long[] pbstrName) { - return COM.VtblCall (12, address, id, pbstrName); -} - -public int GetNextDispID (int grfdex, int id, int[] pid) { - return COM.VtblCall (13, address, grfdex, id, pid); -} - -public int GetNameSpaceParent (long[] ppunk) { - return COM.VtblCall (14, address, ppunk); -} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java deleted file mode 100644 index 5ed69b5b77..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -import org.eclipse.swt.internal.win32.*; - -public class IDragSourceHelper extends IUnknown { -public IDragSourceHelper(long address) { - super(address); -} -public int InitializeFromBitmap(SHDRAGIMAGE pshdi, long pDataObject) { - return COM.VtblCall(3, address, pshdi, pDataObject); -} -public int InitializeFromWindow(long hwnd, POINT ppt, long pDataObject) { - return COM.VtblCall(4, address, hwnd, ppt, pDataObject); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java deleted file mode 100644 index 24b506f90c..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class IDragSourceHelper2 extends IDragSourceHelper { -public IDragSourceHelper2(long address) { - super(address); -} -public int SetFlags(int dwFlags) { - return COM.VtblCall(5, address, dwFlags); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java deleted file mode 100644 index 3450405a27..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -import org.eclipse.swt.internal.win32.*; - -public class IDropTargetHelper extends IUnknown { -public IDropTargetHelper(long address) { - super(address); -} -public int DragEnter(long hwndTarget, long pDataObject, POINT ppt, int dwEffect) { - return COM.VtblCall(3, address, hwndTarget, pDataObject, ppt, dwEffect); -} -public int DragLeave() { - return COM.VtblCall(4, address); -} -public int DragOver(POINT ppt, int dwEffect) { - return COM.VtblCall(5, address, ppt, dwEffect); -} -public int Drop(long pDataObject, POINT ppt, int dwEffect) { - return COM.VtblCall(6, address, pDataObject, ppt, dwEffect); -} -public int Show(boolean fShow) { - return COM.VtblCall(7, address, fShow); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java deleted file mode 100644 index 80949f1699..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class IEnumSTATSTG extends IEnum { -public IEnumSTATSTG(long address) { - super(address); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java deleted file mode 100644 index b09a1e958d..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class IFont extends IUnknown { -public IFont(long address) { - super(address); -} -public int get_hFont(long[] phfont){ - return COM.VtblCall(3, address, phfont); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java deleted file mode 100644 index 21ce83454e..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class IMoniker extends IPersist -{ -public IMoniker(long address) { - super(address); -} -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java index 313c41b3b0..d7103958f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java @@ -30,7 +30,7 @@ public int QueryStatus( GUID pguidCmdGroup, // Pointer to command group int cCmds, // Number of commands in prgCmds array OLECMD prgCmds, // Array of commands - OLECMDTEXT pCmdText // Pointer to name or status of command + long pCmdText // Pointer to name or status of command ){ // we only support querying for one command at a time if (cCmds > 1) return COM.E_INVALIDARG; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java index 6114adc97a..059a3a942b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java @@ -25,12 +25,9 @@ public int TranslateAccelerator(MSG lpmsg) { return COM.VtblCall(5, address, lpmsg); } public void OnFrameWindowActivate(boolean fActivate) { - COM.VtblCall(6, getAddress(), fActivate); -} -public void OnDocWindowActivate(boolean fActivate) { - COM.VtblCall(7, getAddress(), fActivate); + COM.VtblCall(6, address, fActivate ? 1 : 0); } public int ResizeBorder(RECT prcBorder, long pUIWindow, boolean fFrameWindow) { - return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow); + return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow ? 1 : 0); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java index 18c60d9ca1..3ba5c507d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java @@ -29,7 +29,4 @@ public int UIDeactivate() { public int SetObjectRects(RECT lprcPosRect, RECT lprcClipRect) { return COM.VtblCall(7, address, lprcPosRect, lprcClipRect); } -public int ReactivateAndUndo() { - return COM.VtblCall(8, address); -} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java index a05a66539c..52f2797719 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java @@ -21,16 +21,4 @@ public IPersistFile(long address) { public int IsDirty() { return COM.VtblCall(4, address); } -public int Load(long pszFileName, int dwMode) { - return COM.VtblCall(5, address, pszFileName, dwMode); -} -public int Save(long pszFileName, boolean fRemember) { - return COM.VtblCall(6, address, pszFileName, fRemember); -} -public int SaveCompleted(long pszFileName) { - return COM.VtblCall(7, address, pszFileName); -} -public int GetCurFile(long [] ppszFileName){ - return COM.VtblCall(8, address, ppszFileName); -} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java index 15fff3daac..5e6f2aa51b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java @@ -18,9 +18,6 @@ public class IPersistStorage extends IPersist public IPersistStorage(long address) { super(address); } -public int IsDirty() { - return COM.VtblCall(4, address); -} public int InitNew(long pStg) { return COM.VtblCall(5, address, pStg); } @@ -28,7 +25,7 @@ public int Load(long pStg) { return COM.VtblCall(6, address, pStg); } public int Save(long pStgSave, boolean fSameAsLoad) { - return COM.VtblCall(7, address, pStgSave, fSameAsLoad); + return COM.VtblCall(7, address, pStgSave, fSameAsLoad ? 1 : 0); } public int SaveCompleted(long pStgNew) { return COM.VtblCall(8, address, pStgNew); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java index 054c76def7..173f5f14c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java @@ -33,22 +33,6 @@ public int CopyTo( } return COM.VtblCall(7, address, ciidExclude, rgiidExclude, 0, pstgDest); } -public int CreateStorage( - String pwcsName, //Pointer to the name of the new storage object - int grfMode, //Access mode for the new storage object - int reserved1, //Reserved; must be zero - int reserved2, //Reserved; must be zero - long[] ppStg //Pointer to new storage object -){ - - // create a null terminated array of char - char[] buffer = null; - if (pwcsName != null) { - buffer = (pwcsName+"\0").toCharArray(); - } - - return COM.VtblCall(5, address, buffer, grfMode, reserved1, reserved2, ppStg); -} public int CreateStream( String pwcsName, //Pointer to the name of the new stream int grfMode, //Access mode for the new stream @@ -65,46 +49,6 @@ public int CreateStream( return COM.VtblCall(3, address, buffer, grfMode, reserved1, reserved2, ppStm); } -public int DestroyElement(String pwcsName) { - - // create a null terminated array of char - char[] buffer = null; - if (pwcsName != null) { - buffer = (pwcsName+"\0").toCharArray(); - } - return COM.VtblCall(12, address, buffer); -} -public int EnumElements( - int reserved1, //Reserved; must be zero - long reserved2, //Reserved; must be NULL - int reserved3, //Reserved; must be zero - long[] ppenum //Pointer to output variable that - // receives the IEnumSTATSTG interface -){ - return COM.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum); -} -public int OpenStorage( - String pwcsName, //Pointer to the name of the - // storage object to open - long pstgPriority, //Must be NULL. - int grfMode, //Access mode for the new storage object - String snbExclude[], //Must be NULL. - int reserved, //Reserved; must be zero - long[] ppStg //Pointer to opened storage object -){ - - // create a null terminated array of char - char[] buffer = null; - if (pwcsName != null) { - buffer = (pwcsName+"\0").toCharArray(); - } - - // we only support the case where snbExclude = null - if (snbExclude != null) { - return COM.E_INVALIDARG; - } - return COM.VtblCall(6, address, buffer, pstgPriority, grfMode, 0, reserved, ppStg); -} public int OpenStream( String pwcsName, //Pointer to name of stream to open long reserved1, //Reserved; must be NULL @@ -122,31 +66,4 @@ public int OpenStream( return COM.VtblCall(4, address, buffer, reserved1, grfMode, reserved2, ppStm); } -public int RenameElement( - String pwcsOldName, //Pointer to the name of the - // element to be changed - String pwcsNewName //Pointer to the new name for - // the specified element -){ - - // create a null terminated array of char - char[] buffer1 = null; - if (pwcsOldName != null) { - buffer1 = (pwcsOldName+"\0").toCharArray(); - } - // create a null terminated array of char - char[] buffer2 = null; - if (pwcsNewName != null) { - buffer2 = (pwcsNewName+"\0").toCharArray(); - } - return COM.VtblCall(13, address, buffer1, buffer2); -} -public int Revert() { - return COM.VtblCall(10, address); -} -public int SetClass( - GUID clsid //CLSID to be assigned to the storage object -){ - return COM.VtblCall(15, address, clsid); -} } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java index bd2735ec8d..36109589d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java @@ -17,11 +17,6 @@ public class IStream extends IUnknown { public IStream(long address) { super(address); } -public int Clone( - long[] ppstm //Pointer to location for pointer to the new stream object -){ - return COM.VtblCall(13, address, ppstm); -} public int Commit( int grfCommitFlags //Specifies how changes are committed ){ return COM.VtblCall(8, address, grfCommitFlags); @@ -29,9 +24,6 @@ public int Commit( int grfCommitFlags //Specifies how changes are committed public int Read(long pv, int cb, int[] pcbWritten) { return COM.VtblCall(3, address, pv, cb, pcbWritten); } -public int Revert(){ - return COM.VtblCall(9, address); -} public int Write(long pv, int cb, int[] pcbWritten) { return COM.VtblCall(4, address, pv, cb, pcbWritten); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java index ee68c8d0d4..ad33f5debf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java @@ -14,7 +14,6 @@ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.win32.*; public class ITypeInfo extends IUnknown @@ -75,44 +74,6 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[] public int GetFuncDesc(int index, long[] ppFuncDesc) { return COM.VtblCall(5, address, index, ppFuncDesc); } -public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { - - char[] buffer; - int size = rgszNames.length; - - // create an array to hold the addresses - long hHeap = OS.GetProcessHeap(); - long ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * C.PTR_SIZEOF); - long[] memTracker = new long[size]; - - try { - // add the address of each string to the array - - for (int i=0; i<size; i++){ - // create a null terminated array of char for each String - int nameSize = rgszNames[i].length(); - buffer = new char[nameSize +1]; - rgszNames[i].getChars(0, nameSize, buffer, 0); - // get the address of the start of the array of char - long pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); - OS.MoveMemory(pName, buffer, buffer.length * 2); - // copy the address to the array of addresses - OS.MoveMemory(ppNames + C.PTR_SIZEOF * i, new long[]{pName}, C.PTR_SIZEOF); - // keep track of the Global Memory so we can free it - memTracker[i] = pName; - } - - return COM.VtblCall(10, address, ppNames, cNames, pMemId); - - } finally { - // free the memory - for (int i=0; i<memTracker.length; i++){ - OS.HeapFree(hHeap, 0, memTracker[i]); - } - OS.HeapFree(hHeap, 0, ppNames); - } -} - public int GetImplTypeFlags(int index, int[] pImplTypeFlags) { return COM.VtblCall(9, address, index, pImplTypeFlags); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java index d5aef32572..606fa9e89d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java @@ -20,7 +20,7 @@ public class IViewObject2 extends IUnknown public IViewObject2(long address) { super(address); } -public int GetExtent(int dwAspect, int lindex, DVTARGETDEVICE ptd, SIZE lpsizel) { +public int GetExtent(int dwAspect, int lindex, long ptd, SIZE lpsizel) { return COM.VtblCall(9, address, dwAspect, lindex, ptd, lpsizel); } public int SetAdvise(int dwAspects, int dwAdvf, long pIAdviseSink) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java deleted file mode 100644 index fb0dc4d4ee..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class OLECMDTEXT { - public int cmdtextf; - public int cwActual; - public int cwBuf; - public short[] rgwz = new short[1]; -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java deleted file mode 100644 index 0dfb29b581..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.ole.win32; - -public class STATSTG { - /** @field cast=(LPWSTR) */ - public long pwcsName; - public int type; - /** @field accessor=cbSize.QuadPart */ - public long cbSize; -// FILETIME mtime; - /** @field accessor=mtime.dwLowDateTime */ - public int mtime_dwLowDateTime; - /** @field accessor=mtime.dwHighDateTime */ - public int mtime_dwHighDateTime; -// FILETIME ctime; - /** @field accessor=ctime.dwLowDateTime */ - public int ctime_dwLowDateTime; - /** @field accessor=ctime.dwHighDateTime */ - public int ctime_dwHighDateTime; -// FILETIME atime; - /** @field accessor=atime.dwLowDateTime */ - public int atime_dwLowDateTime; - /** @field accessor=atime.dwHighDateTime */ - public int atime_dwHighDateTime; - public int grfMode; - public int grfLocksSupported; -// GUID clsid; - /** @field accessor=clsid.Data1 */ - public int clsid_Data1; - /** @field accessor=clsid.Data2 */ - public short clsid_Data2; - /** @field accessor=clsid.Data3 */ - public short clsid_Data3; - /** @field accessor=clsid.Data4 */ - public byte[] clsid_Data4 = new byte[8]; - public int grfStateBits; - public int reserved; - public static final int sizeof = COM.STATSTG_sizeof (); -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index 559e50bb43..3d77d71682 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -303,9 +303,6 @@ public class OS extends C { public static final int CLR_DEFAULT = 0xff000000; public static final int CLR_INVALID = 0xffffffff; public static final int CLR_NONE = 0xffffffff; - public static final int CLSCTX_INPROC_SERVER = 1; - public static final int CSIDL_APPDATA = 0x1a; - public static final int CSIDL_LOCAL_APPDATA = 0x1c; public static final int COLORONCOLOR = 0x3; public static final int COLOR_3DDKSHADOW = 0x15; public static final int COLOR_3DFACE = 0xf; @@ -368,7 +365,6 @@ public class OS extends C { public static final int DFC_BUTTON = 0x4; public static final int DFC_SCROLL = 0x3; public static final int DIB_RGB_COLORS = 0x0; - public static final int DISP_E_EXCEPTION = 0x80020009; public static final int DI_NORMAL = 0x3; public static final int DI_NOMIRROR = 0x10; public static final int DLGC_BUTTON = 0x2000; |