diff options
67 files changed, 521 insertions, 1583 deletions
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 d663eca6e7..785518b009 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 @@ -1233,21 +1233,26 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit) } #endif -#ifndef NO_VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8) +#ifndef NO_VtblCall__IJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1) { - DISPPARAMS _arg5, *lparg5=NULL; - EXCEPINFO _arg7, *lparg7=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); - if (arg5) if ((lparg5 = getDISPPARAMSFields(env, arg5, &_arg5)) == NULL) goto fail; - if (arg7) if ((lparg7 = getEXCEPINFOFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, arg6, lparg7, arg8); -fail: - if (arg7 && lparg7) setEXCEPINFOFields(env, arg7, lparg7); - if (arg5 && lparg5) setDISPPARAMSFields(env, arg5, lparg5); - COM_NATIVE_EXIT(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); + COM_NATIVE_ENTER_TRY(env, that, VtblCall__IJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong))(*(jlong **)arg1)[arg0])(arg1); + COM_NATIVE_EXIT_CATCH(env, that, VtblCall__IJ_FUNC); + return rc; +} +#endif + +#ifndef NO_VtblCall__IJI +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2); + COM_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC); return rc; } #endif @@ -1271,18 +1276,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJIIJ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlong arg4) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIIJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJIIJ_FUNC); - return rc; -} -#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) @@ -1302,81 +1295,58 @@ fail: } #endif -#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6) -{ - GUID _arg4, *lparg4=NULL; - jint *lparg6=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); - if (arg4) if ((lparg4 = getGUIDFields(env, arg4, &_arg4)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, GUID *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6); -fail: - if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); - if (arg4 && lparg4) setGUIDFields(env, arg4, lparg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jint arg5) +#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) { - POINT _arg4, *lparg4=NULL; + jint *lparg4=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); - if (arg4) if ((lparg4 = getPOINTFields(env, arg4, &_arg4)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5); + 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) setPOINTFields(env, arg4, lparg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); + if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJIIZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jboolean arg4) +#ifndef NO_VtblCall__IJIJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3) { jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIIZ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJIIZ_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJIJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); + COM_NATIVE_EXIT(env, that, VtblCall__IJIJ_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) +#ifndef NO_VtblCall__IJIJI_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) { - jint *lparg4=NULL; + jlong *lparg5=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); + COM_NATIVE_ENTER(env, that, VtblCall__IJIJI_3J_FUNC); + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC); + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJIJI_3J_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJII_3J -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4) +#ifndef NO_VtblCall__IJIJJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4) { - jlong *lparg4=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC); - if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJIJJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); + COM_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC); return rc; } #endif @@ -1397,25 +1367,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4) -{ - FORMATETC _arg3, *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); - if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, FORMATETC *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3) @@ -1432,47 +1383,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5) -{ - GUID _arg3, *lparg3=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); - if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5); -fail: - if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9) -{ - GUID _arg3, *lparg3=NULL; - DISPPARAMS _arg6, *lparg6=NULL; - EXCEPINFO _arg8, *lparg8=NULL; - jint *lparg9=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); - if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg6) if ((lparg6 = getDISPPARAMSFields(env, arg6, &_arg6)) == NULL) goto fail; - if (arg8) if ((lparg8 = getEXCEPINFOFields(env, arg8, &_arg8)) == NULL) goto fail; - if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9); -fail: - if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0); - if (arg8 && lparg8) setEXCEPINFOFields(env, arg8, lparg8); - if (arg6 && lparg6) setDISPPARAMSFields(env, arg6, lparg6); - if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jlong arg7, jobject arg8, jintArray arg9) @@ -1536,44 +1446,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4) -{ - STATSTG _arg3, *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); - if (arg3) if ((lparg3 = getSTATSTGFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, STATSTG *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7) -{ - MSG _arg3, *lparg3=NULL; - RECT _arg7, *lparg7=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); - if (arg3) if ((lparg3 = getMSGFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, MSG *, jint, jint, jint, RECT *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7); -fail: - if (arg7 && lparg7) setRECTFields(env, arg7, lparg7); - if (arg3 && lparg3) setMSGFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jint arg5, jlong arg6, jobject arg7) @@ -1593,22 +1465,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4) -{ - POINT _arg3, *lparg3=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); - if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4); -fail: - if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3) @@ -1625,58 +1481,34 @@ fail: } #endif -#ifndef NO_VtblCall__IJIZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jboolean arg3) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJIZ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJIZ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJI_3II_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3II_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5) +#ifndef NO_VtblCall__IJI_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3) { jint *lparg3=NULL; - jint *lparg5=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJI_3II_3I_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJI_3II_3I_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJI_3I_3I_3I_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I_3I_3I_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) +#ifndef NO_VtblCall__IJI_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3) { - jint *lparg3=NULL; - jint *lparg4=NULL; - jint *lparg5=NULL; - jint *lparg6=NULL; + jlong *lparg3=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6); + COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC); + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: - if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC); return rc; } #endif @@ -1700,6 +1532,25 @@ fail: } #endif +#ifndef NO_VtblCall__IJI_3J_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jintArray arg4) +{ + jlong *lparg3=NULL; + jint *lparg4=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3I_FUNC); + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); +fail: + if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3I_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__IJI_3J_3J_3I_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3J_3I_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jlongArray arg6) @@ -1725,6 +1576,34 @@ fail: } #endif +#ifndef NO_VtblCall__IJJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2); + COM_NATIVE_EXIT(env, that, VtblCall__IJJ_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) +{ + jlong *lparg5=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJII_3J_FUNC); + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); +fail: + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJJII_3J_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__IJJI_3I JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3I) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jintArray arg4) @@ -1757,6 +1636,46 @@ fail: } #endif +#ifndef NO_VtblCall__IJJJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); + COM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC); + return rc; +} +#endif + +#ifndef NO_VtblCall__IJJJI_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) +{ + jlong *lparg5=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJJI_3J_FUNC); + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); +fail: + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJJJI_3J_FUNC); + return rc; +} +#endif + +#ifndef NO_VtblCall__IJJJJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJJJ_FUNC); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); + COM_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__IJJJJJJ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJJ) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6) @@ -1804,18 +1723,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJJJZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jboolean arg4) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJJJZ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - COM_NATIVE_EXIT(env, that, VtblCall__IJJJZ_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJJJ_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlongArray arg4) @@ -1832,44 +1739,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4) -{ - FORMATETC _arg3, *lparg3=NULL; - jlong *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); - if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, FORMATETC *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4) -{ - STATSTG _arg3, *lparg3=NULL; - jlong *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); - if (arg3) if ((lparg3 = getSTATSTGFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, STATSTG *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4) @@ -1898,6 +1767,22 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ) } #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) +{ + jint *lparg3=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC); + if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); +fail: + if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__IJJ_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3) @@ -2016,41 +1901,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6) -{ - GUID _arg2, *lparg2=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); - if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6); -fail: - if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) -{ - GUID _arg2, *lparg2=NULL; - jint *lparg6=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); - if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); -fail: - if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); - if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jlong arg5, jlong arg6) @@ -2108,28 +1958,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jintArray arg4) -{ - GUID _arg2, *lparg2=NULL; - GUID _arg3, *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); - if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, GUID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); - if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jlongArray arg4) @@ -2152,25 +1980,6 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jintArray arg3) -{ - GUID _arg2, *lparg2=NULL; - jint *lparg3=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); - if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); - return rc; -} -#endif - #ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J) (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlongArray arg3) @@ -2238,50 +2047,34 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) -{ - RECT _arg2, *lparg2=NULL; - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); - if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *))(*(jlong **)arg1)[arg0])(arg1, lparg2); -fail: - if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4) +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3) { - RECT _arg2, *lparg2=NULL; + PROPERTYKEY _arg2, *lparg2=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II_FUNC); - if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT, jint, jint))(*(jlong **)arg1)[arg0])(arg1, *lparg2, arg3, arg4); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); + if (arg2) if ((lparg2 = getPROPERTYKEYFields(env, arg2, &_arg2)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, PROPERTYKEY *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: - if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II_FUNC); + if (arg2 && lparg2) setPROPERTYKEYFields(env, arg2, lparg2); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jboolean arg4) +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { RECT _arg2, *lparg2=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, jint, jboolean))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); return rc; } #endif @@ -2337,34 +2130,34 @@ fail: } #endif -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3) +#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_2I_FUNC); + 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 *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); + 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_2I_FUNC); + 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_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) +#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) { - SHDRAGIMAGE _arg2, *lparg2=NULL; + TF_DISPLAYATTRIBUTE _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); + COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); + if (arg2) if ((lparg2 = getTF_DISPLAYATTRIBUTEFields(env, arg2, &_arg2)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, TF_DISPLAYATTRIBUTE *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: - if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2); - COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); + if (arg2 && lparg2) setTF_DISPLAYATTRIBUTEFields(env, arg2, lparg2); + COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); return rc; } #endif @@ -2381,64 +2174,34 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ) } #endif -#ifndef NO_VtblCall__IJZI -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZI) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2, jint arg3) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJZI_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJZI_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJZJ -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2, jlong arg3) -{ - jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJZJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - COM_NATIVE_EXIT(env, that, VtblCall__IJZJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3CIIII_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIIII_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7) +#ifndef NO_VtblCall__IJ_3C +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2) { jchar *lparg2=NULL; - jint *lparg7=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIIII_3I_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC); if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: - if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIIII_3I_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC); return rc; } #endif -#ifndef NO_VtblCall__IJ_3CIII_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) +#ifndef NO_VtblCall__IJ_3CI +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3) { jchar *lparg2=NULL; - jint *lparg6=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3I_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_FUNC); if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: - if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3I_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_FUNC); return rc; } #endif @@ -2462,21 +2225,40 @@ fail: } #endif -#ifndef NO_VtblCall__IJ_3CI_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CI_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jintArray arg4) +#ifndef NO_VtblCall__IJ_3CII_3I_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CII_3I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) { jchar *lparg2=NULL; - jint *lparg4=NULL; + jint *lparg5=NULL; + jint *lparg6=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_3I_FUNC); + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4); + if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; + if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6); fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); + if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); + if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_3I_FUNC); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); + return rc; +} +#endif + +#ifndef NO_VtblCall__IJ_3CJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3) +{ + jchar *lparg2=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_FUNC); + if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); +fail: + if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_FUNC); return rc; } #endif @@ -2538,24 +2320,18 @@ fail: } #endif -#ifndef NO_VtblCall__IJ_3C_3I_3I -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3I_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jintArray arg3, jintArray arg4) +#ifndef NO_VtblCall__IJ_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2) { - jchar *lparg2=NULL; - jint *lparg3=NULL; - jint *lparg4=NULL; + jint *lparg2=NULL; jint rc = 0; - COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3I_3I_FUNC); - if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC); + if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3I_3I_FUNC); + if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC); return rc; } #endif @@ -2582,6 +2358,22 @@ fail: } #endif +#ifndef NO_VtblCall__IJ_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2) +{ + jlong *lparg2=NULL; + jint rc = 0; + COM_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC); + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2); +fail: + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); + COM_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC); + return rc; +} +#endif + #ifndef NO_WriteClassStg JNIEXPORT jint JNICALL COM_NATIVE(WriteClassStg) (JNIEnv *env, jclass that, jlong arg0, jobject arg1) 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 492c6b530e..1cf95adeac 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 @@ -102,44 +102,40 @@ char * COM_nativeFunctionNames[] = { "VariantChangeType", "VariantClear", "VariantInit", - "VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I", + "VtblCall__IJ", + "VtblCall__IJI", "VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J", - "VtblCall__IJIIJ", "VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2", - "VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I", - "VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I", - "VtblCall__IJIIZ", "VtblCall__IJII_3I", - "VtblCall__IJII_3J", + "VtblCall__IJIJ", + "VtblCall__IJIJI_3J", + "VtblCall__IJIJJ", "VtblCall__IJIJ_3I", - "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I", "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2", - "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II", - "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ", "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2", - "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I", - "VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2", "VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2", - "VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I", "VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2", - "VtblCall__IJIZ", - "VtblCall__IJI_3II_3I", - "VtblCall__IJI_3I_3I_3I_3I", + "VtblCall__IJI_3I", + "VtblCall__IJI_3J", "VtblCall__IJI_3JI_3I", + "VtblCall__IJI_3J_3I", "VtblCall__IJI_3J_3J_3I_3J", + "VtblCall__IJJ", + "VtblCall__IJJII_3J", "VtblCall__IJJI_3I", "VtblCall__IJJI_3J", + "VtblCall__IJJJ", + "VtblCall__IJJJI_3J", + "VtblCall__IJJJJ", "VtblCall__IJJJJJJ", "VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J", "VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I", - "VtblCall__IJJJZ", "VtblCall__IJJJ_3J", - "VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J", - "VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_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", @@ -147,38 +143,33 @@ char * COM_nativeFunctionNames[] = { "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_2IIII", - "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I", "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_2JII_3I", - "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_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_3I", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J", "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2", "VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2", "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_2II", - "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ", "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_2I", "VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J", + "VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", "VtblCall__IJZ", - "VtblCall__IJZI", - "VtblCall__IJZJ", - "VtblCall__IJ_3CIIII_3I", - "VtblCall__IJ_3CIII_3I", + "VtblCall__IJ_3C", + "VtblCall__IJ_3CI", "VtblCall__IJ_3CIII_3J", - "VtblCall__IJ_3CI_3I", + "VtblCall__IJ_3CII_3I_3I", + "VtblCall__IJ_3CJ", "VtblCall__IJ_3CJIII_3J", "VtblCall__IJ_3CJII_3J", "VtblCall__IJ_3C_3C", - "VtblCall__IJ_3C_3I_3I", + "VtblCall__IJ_3I", "VtblCall__IJ_3ILorg_eclipse_swt_internal_ole_win32_GUID_2_3J", + "VtblCall__IJ_3J", "WriteClassStg", }; #define NATIVE_FUNCTION_COUNT sizeof(COM_nativeFunctionNames) / sizeof(char*) 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 b25d4f9f20..5fcc08f92d 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 @@ -112,44 +112,40 @@ typedef enum { VariantChangeType_FUNC, VariantClear_FUNC, VariantInit_FUNC, - VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC, + VtblCall__IJ_FUNC, + VtblCall__IJI_FUNC, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC, - VtblCall__IJIIJ_FUNC, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC, - VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC, - VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, - VtblCall__IJIIZ_FUNC, VtblCall__IJII_3I_FUNC, - VtblCall__IJII_3J_FUNC, + VtblCall__IJIJ_FUNC, + VtblCall__IJIJI_3J_FUNC, + VtblCall__IJIJJ_FUNC, VtblCall__IJIJ_3I_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC, - VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC, - VtblCall__IJIZ_FUNC, - VtblCall__IJI_3II_3I_FUNC, - VtblCall__IJI_3I_3I_3I_3I_FUNC, + VtblCall__IJI_3I_FUNC, + VtblCall__IJI_3J_FUNC, VtblCall__IJI_3JI_3I_FUNC, + VtblCall__IJI_3J_3I_FUNC, VtblCall__IJI_3J_3J_3I_3J_FUNC, + VtblCall__IJJ_FUNC, + VtblCall__IJJII_3J_FUNC, VtblCall__IJJI_3I_FUNC, VtblCall__IJJI_3J_FUNC, + VtblCall__IJJJ_FUNC, + VtblCall__IJJJI_3J_FUNC, + VtblCall__IJJJJ_FUNC, VtblCall__IJJJJJJ_FUNC, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, - VtblCall__IJJJZ_FUNC, VtblCall__IJJJ_3J_FUNC, - VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC, - VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_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, @@ -157,37 +153,32 @@ typedef enum { 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_2IIII_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_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_2JII_3I_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_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_3I_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC, 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_2II_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_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_2I_FUNC, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC, + VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC, VtblCall__IJZ_FUNC, - VtblCall__IJZI_FUNC, - VtblCall__IJZJ_FUNC, - VtblCall__IJ_3CIIII_3I_FUNC, - VtblCall__IJ_3CIII_3I_FUNC, + VtblCall__IJ_3C_FUNC, + VtblCall__IJ_3CI_FUNC, VtblCall__IJ_3CIII_3J_FUNC, - VtblCall__IJ_3CI_3I_FUNC, + VtblCall__IJ_3CII_3I_3I_FUNC, + VtblCall__IJ_3CJ_FUNC, VtblCall__IJ_3CJIII_3J_FUNC, VtblCall__IJ_3CJII_3J_FUNC, VtblCall__IJ_3C_3C_FUNC, - VtblCall__IJ_3C_3I_3I_FUNC, + VtblCall__IJ_3I_FUNC, VtblCall__IJ_3ILorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, + VtblCall__IJ_3J_FUNC, WriteClassStg_FUNC, } COM_FUNCS; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index 7ff02ec395..dd3dbaa407 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -10346,603 +10346,6 @@ JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScan) } #endif -#ifndef NO_VtblCall__IJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1) -{ - jint rc = 0; - OS_NATIVE_ENTER_TRY(env, that, VtblCall__IJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong))(*(jlong **)arg1)[arg0])(arg1); - OS_NATIVE_EXIT_CATCH(env, that, VtblCall__IJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJI -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2); - OS_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJII -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJII_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - OS_NATIVE_EXIT(env, that, VtblCall__IJII_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIII -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJIII_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - OS_NATIVE_EXIT(env, that, VtblCall__IJIII_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIII_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5) -{ - jint *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJIII_3I_FUNC); - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJIII_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJII_3C_3CI -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII_3C_3CI) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6) -{ - jchar *lparg4=NULL; - jchar *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJII_3C_3CI_FUNC); - if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetCharArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); -fail: - if (arg5 && lparg5) (*env)->ReleaseCharArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJII_3C_3CI_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJIJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - OS_NATIVE_EXIT(env, that, VtblCall__IJIJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIJI_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJI_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) -{ - jlong *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJIJI_3J_FUNC); - if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJIJI_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJIJJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJIJJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - OS_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJI_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3) -{ - jint *lparg3=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJI_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3) -{ - jlong *lparg3=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC); - if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJI_3J_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jintArray arg4) -{ - jlong *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3I_FUNC); - if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2); - OS_NATIVE_EXIT(env, that, VtblCall__IJJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJI -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - OS_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJII_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5) -{ - jint *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJII_3I_FUNC); - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJII_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJII_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5) -{ - jlong *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJII_3J_FUNC); - if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJII_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJI_3C_3CJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI_3C_3CJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jcharArray arg4, jcharArray arg5, jlong arg6) -{ - jchar *lparg4=NULL; - jchar *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJI_3C_3CJ_FUNC); - if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetCharArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jchar *, jchar *, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); -fail: - if (arg5 && lparg5) (*env)->ReleaseCharArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJI_3C_3CJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); - OS_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJJI_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJI_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) -{ - jlong *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJJI_3J_FUNC); - if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJJI_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJJJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJJJ_FUNC); - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); - OS_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJ_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3) -{ - jint *lparg3=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJ_3I_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3, jintArray arg4) -{ - jint *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_3I_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJJ_3J_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3J_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3, jlongArray arg4) -{ - jlong *lparg3=NULL; - jlong *lparg4=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_3J_FUNC); - if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3J_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3) -{ - PROPERTYKEY _arg2, *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); - if (arg2) if ((lparg2 = getPROPERTYKEYFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, PROPERTYKEY *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); -fail: - if (arg2 && lparg2) setPROPERTYKEYFields(env, arg2, lparg2); - OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3) -{ - PROPERTYKEY _arg2, *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); - if (arg2) if ((lparg2 = getPROPERTYKEYFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, PROPERTYKEY *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); -fail: - if (arg2 && lparg2) setPROPERTYKEYFields(env, arg2, lparg2); - OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) -{ - TF_DISPLAYATTRIBUTE _arg2, *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); - if (arg2) if ((lparg2 = getTF_DISPLAYATTRIBUTEFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, TF_DISPLAYATTRIBUTE *))(*(jlong **)arg1)[arg0])(arg1, lparg2); -fail: - if (arg2 && lparg2) setTF_DISPLAYATTRIBUTEFields(env, arg2, lparg2); - OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJS_3B_3B_3B -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJS_3B_3B_3B) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5) -{ - jbyte *lparg3=NULL; - jbyte *lparg4=NULL; - jbyte *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJS_3B_3B_3B_FUNC); - if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jshort, jbyte *, jbyte *, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJS_3B_3B_3B_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3B_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3) -{ - jbyte *lparg2=NULL; - jint *lparg3=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_FUNC); - if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3B_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3) -{ - jbyte *lparg2=NULL; - jlong *lparg3=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_FUNC); - if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); -fail: - if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3C -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3C) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2) -{ - jchar *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC); - if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2); -fail: - if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3CI -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CI) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3) -{ - jchar *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_FUNC); - if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); -fail: - if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3CII_3I_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CII_3I_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) -{ - jchar *lparg2=NULL; - jint *lparg5=NULL; - jint *lparg6=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); - if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6); -fail: - if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); - if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3CJ -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CJ) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3) -{ - jchar *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_FUNC); - if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); -fail: - if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2) -{ - jint *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2); -fail: - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3I_3B_3I -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3I) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jbyteArray arg3, jintArray arg4) -{ - jint *lparg2=NULL; - jbyte *lparg3=NULL; - jint *lparg4=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3B_3I_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3B_3I_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3I_3B_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jbyteArray arg3, jlongArray arg4) -{ - jint *lparg2=NULL; - jbyte *lparg3=NULL; - jlong *lparg4=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3B_3J_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3B_3J_FUNC); - return rc; -} -#endif - -#ifndef NO_VtblCall__IJ_3J -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3J) - (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2) -{ - jlong *lparg2=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC); - if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2); -fail: - if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC); - return rc; -} -#endif - #ifndef NO_WINDOWPLACEMENT_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(WINDOWPLACEMENT_1sizeof) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index fb697d329a..d4434815bc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -759,43 +759,6 @@ char * OS_nativeFunctionNames[] = { "UrlCreateFromPath", "ValidateRect", "VkKeyScan", - "VtblCall__IJ", - "VtblCall__IJI", - "VtblCall__IJII", - "VtblCall__IJIII", - "VtblCall__IJIII_3I", - "VtblCall__IJII_3C_3CI", - "VtblCall__IJIJ", - "VtblCall__IJIJI_3J", - "VtblCall__IJIJJ", - "VtblCall__IJI_3I", - "VtblCall__IJI_3J", - "VtblCall__IJI_3J_3I", - "VtblCall__IJJ", - "VtblCall__IJJI", - "VtblCall__IJJII_3I", - "VtblCall__IJJII_3J", - "VtblCall__IJJI_3C_3CJ", - "VtblCall__IJJJ", - "VtblCall__IJJJI_3J", - "VtblCall__IJJJJ", - "VtblCall__IJJ_3I", - "VtblCall__IJJ_3I_3I", - "VtblCall__IJJ_3J_3J", - "VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I", - "VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J", - "VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", - "VtblCall__IJS_3B_3B_3B", - "VtblCall__IJ_3B_3I", - "VtblCall__IJ_3B_3J", - "VtblCall__IJ_3C", - "VtblCall__IJ_3CI", - "VtblCall__IJ_3CII_3I_3I", - "VtblCall__IJ_3CJ", - "VtblCall__IJ_3I", - "VtblCall__IJ_3I_3B_3I", - "VtblCall__IJ_3I_3B_3J", - "VtblCall__IJ_3J", "WINDOWPLACEMENT_1sizeof", "WINDOWPOS_1sizeof", "WNDCLASS_1sizeof", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h index 0508568c46..7bf2950cfc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h @@ -769,43 +769,6 @@ typedef enum { UrlCreateFromPath_FUNC, ValidateRect_FUNC, VkKeyScan_FUNC, - VtblCall__IJ_FUNC, - VtblCall__IJI_FUNC, - VtblCall__IJII_FUNC, - VtblCall__IJIII_FUNC, - VtblCall__IJIII_3I_FUNC, - VtblCall__IJII_3C_3CI_FUNC, - VtblCall__IJIJ_FUNC, - VtblCall__IJIJI_3J_FUNC, - VtblCall__IJIJJ_FUNC, - VtblCall__IJI_3I_FUNC, - VtblCall__IJI_3J_FUNC, - VtblCall__IJI_3J_3I_FUNC, - VtblCall__IJJ_FUNC, - VtblCall__IJJI_FUNC, - VtblCall__IJJII_3I_FUNC, - VtblCall__IJJII_3J_FUNC, - VtblCall__IJJI_3C_3CJ_FUNC, - VtblCall__IJJJ_FUNC, - VtblCall__IJJJI_3J_FUNC, - VtblCall__IJJJJ_FUNC, - VtblCall__IJJ_3I_FUNC, - VtblCall__IJJ_3I_3I_FUNC, - VtblCall__IJJ_3J_3J_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC, - VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC, - VtblCall__IJS_3B_3B_3B_FUNC, - VtblCall__IJ_3B_3I_FUNC, - VtblCall__IJ_3B_3J_FUNC, - VtblCall__IJ_3C_FUNC, - VtblCall__IJ_3CI_FUNC, - VtblCall__IJ_3CII_3I_3I_FUNC, - VtblCall__IJ_3CJ_FUNC, - VtblCall__IJ_3I_FUNC, - VtblCall__IJ_3I_3B_3I_FUNC, - VtblCall__IJ_3I_3B_3J_FUNC, - VtblCall__IJ_3J_FUNC, WINDOWPLACEMENT_1sizeof_FUNC, WINDOWPOS_1sizeof_FUNC, WNDCLASS_1sizeof_FUNC, 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 11da510822..43a6c0016c 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 @@ -696,123 +696,78 @@ public static final native int VariantClear(long pvarg); /** @param pvarg cast=(VARIANTARG FAR* ) */ public static final native void VariantInit(long pvarg); +/** @method flags=trycatch */ +public static final native int VtblCall(int fnNumber, long ppVtbl); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, int arg2, long[] arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long arg1, int arg2, long[] arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, long[] arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, int[] arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, long[] arg0); +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, TF_DISPLAYATTRIBUTE arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long 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); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, long arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, PROPERTYKEY arg0, long arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long[] arg1); public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, char[] arg1); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, POINT arg2, int arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, POINT arg2, int arg3); -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, POINT arg1, int arg2); 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, 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, int[] arg4); 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, int arg1, int arg2, int arg3, int arg4, int [] arg5); 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, int 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, long 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, GUID arg2, int arg3, int [] arg4); 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, FORMATETC arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, FORMATETC arg1, long[] arg2); - 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, int arg2, int arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, long arg2, long arg3); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, STATSTG arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, STATSTG arg1, long[] arg2); - 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, int arg2, int arg3, int arg4, RECT arg5); 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, int arg0, boolean 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, boolean arg0, int arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, boolean arg0, long arg1); - +public static final native int VtblCall(int fnNumber, long ppVtbl, boolean arg0); 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, int[] arg1); 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, int[] arg2); 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, int arg1, int arg2, int arg3, int[] arg4); 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, 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, 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, int arg1, boolean arg2); 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, long arg0, long arg1, long arg2, long arg3, long arg4); -/** - * @param arg0 flags=struct - */ -public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, int arg1, int arg2); -/** - * @param arg0 flags=struct - */ -public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, long arg2); - 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); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6); public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6); - -public static final native int VtblCall(int fnNumber, long ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog); -public static final native int VtblCall(int fnNumber, long ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int type, int listener, boolean useCapture); -public static final native int VtblCall(int fnNumber, long ppVtbl, long type, long listener, boolean useCapture); +/** + * @param arg0 flags=struct + */ +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); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java index 97716fa178..7bb82c31f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IAccessible extends IDispatch { public IAccessible(long address) { @@ -22,66 +20,66 @@ public IAccessible(long address) { } public int get_accParent(long ppdispParent) { - return OS.VtblCall(7, address, ppdispParent); + return COM.VtblCall(7, address, ppdispParent); } public int get_accChildCount(long pcountChildren) { - return OS.VtblCall(8, address, pcountChildren); + return COM.VtblCall(8, address, pcountChildren); } public int get_accChild(long variant, long ppdispChild) { - return OS.VtblCall(9, address, variant, ppdispChild); + return COM.VtblCall(9, address, variant, ppdispChild); } public int get_accName(long variant, long pszName) { - return OS.VtblCall(10, address, variant, pszName); + return COM.VtblCall(10, address, variant, pszName); } public int get_accValue(long variant, long pszValue) { - return OS.VtblCall(11, address, variant, pszValue); + return COM.VtblCall(11, address, variant, pszValue); } public int get_accDescription(long variant, long pszDescription) { - return OS.VtblCall(12, address, variant, pszDescription); + return COM.VtblCall(12, address, variant, pszDescription); } public int get_accRole(long variant, long pvarRole) { - return OS.VtblCall(13, address, variant, pvarRole); + return COM.VtblCall(13, address, variant, pvarRole); } public int get_accState(long variant, long pvarState) { - return OS.VtblCall(14, address, variant, pvarState); + return COM.VtblCall(14, address, variant, pvarState); } public int get_accHelp(long variant, long pszHelp) { - return OS.VtblCall(15, address, variant, pszHelp); + return COM.VtblCall(15, address, variant, pszHelp); } public int get_accHelpTopic(long pszHelpFile, long variant, long pidTopic) { - return OS.VtblCall(16, address, pszHelpFile, variant, pidTopic); + return COM.VtblCall(16, address, pszHelpFile, variant, pidTopic); } public int get_accKeyboardShortcut(long variant, long pszKeyboardShortcut) { - return OS.VtblCall(17, address, variant, pszKeyboardShortcut); + return COM.VtblCall(17, address, variant, pszKeyboardShortcut); } public int get_accFocus(long pvarChild) { - return OS.VtblCall(18, address, pvarChild); + return COM.VtblCall(18, address, pvarChild); } public int get_accSelection(long pvarChildren) { - return OS.VtblCall(19, address, pvarChildren); + return COM.VtblCall(19, address, pvarChildren); } public int get_accDefaultAction(long variant, long pszDefaultAction) { - return OS.VtblCall(20, address, variant, pszDefaultAction); + return COM.VtblCall(20, address, variant, pszDefaultAction); } public int accSelect(int flagsSelect, long variant) { - return OS.VtblCall(21, address, flagsSelect, variant); + return COM.VtblCall(21, address, flagsSelect, variant); } public int accLocation(long pxLeft, long pyTop, long pcxWidth, long pcyHeight, long variant) { return COM.VtblCall(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant); } public int accNavigate(int navDir, long variant, long pvarEndUpAt) { - return OS.VtblCall(23, address, navDir, variant, pvarEndUpAt); + return COM.VtblCall(23, address, navDir, variant, pvarEndUpAt); } public int accHitTest(int xLeft, int yTop, long pvarChild) { return COM.VtblCall(24, address, xLeft, yTop, pvarChild); } public int accDoDefaultAction(long variant) { - return OS.VtblCall(25, address, variant); + return COM.VtblCall(25, address, variant); } public int put_accName(long variant, long szName) { - return OS.VtblCall(26, address, variant, szName); + return COM.VtblCall(26, address, variant, szName); } public int put_accValue(long variant, long szValue) { - return OS.VtblCall(27, address, variant, szValue); + return COM.VtblCall(27, address, variant, szValue); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java index a3fa7fba51..4a98133d94 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IClassFactory2 extends IUnknown { public IClassFactory2(long address) { @@ -27,6 +25,6 @@ public int GetLicInfo(LICINFO licInfo) { return COM.VtblCall(5, address, licInfo); } public int RequestLicKey(int dwReserved, long[] pBstrKey) { - return OS.VtblCall(6, address, dwReserved, pBstrKey); + return COM.VtblCall(6, address, dwReserved, pBstrKey); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java index cac612c195..2ccfb8e485 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java @@ -13,17 +13,15 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IConnectionPoint extends IUnknown { public IConnectionPoint(long address) { super(address); } public int Advise(long pUnk, int[] pdwCookie) { - return OS.VtblCall(5, address, pUnk, pdwCookie); + return COM.VtblCall(5, address, pUnk, pdwCookie); } public int Unadvise(int dwCookie) { - return OS.VtblCall(6, address, dwCookie); + return COM.VtblCall(6, address, dwCookie); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ICustomDestinationList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ICustomDestinationList.java index da7d4f0d2a..c5f09a8eb4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ICustomDestinationList.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ICustomDestinationList.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class ICustomDestinationList extends IUnknown { public ICustomDestinationList(long address) { @@ -22,7 +20,7 @@ public ICustomDestinationList(long address) { } public int SetAppID(char[] pszAppID) { - return OS.VtblCall(3, address, pszAppID); + return COM.VtblCall(3, address, pszAppID); } public int BeginList(int[] pcMinSlots, GUID riid, long[] ppv) { @@ -30,19 +28,19 @@ public int BeginList(int[] pcMinSlots, GUID riid, long[] ppv) { } public int AppendCategory(char[] pszCategory, IObjectArray poa) { - return OS.VtblCall(5, address, pszCategory, poa.address); + return COM.VtblCall(5, address, pszCategory, poa.address); } public int AddUserTasks(IUnknown poa) { - return OS.VtblCall(7, address, poa.address); + return COM.VtblCall(7, address, poa.address); } public int CommitList() { - return OS.VtblCall(8, address); + return COM.VtblCall(8, address); } public int DeleteList(char[] pszAppID) { - return OS.VtblCall(10, address, pszAppID); + return COM.VtblCall(10, address, pszAppID); } } 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 c0984a1d02..0abdb3f9c2 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 @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IDataObject extends IUnknown { public IDataObject(long address) { super(address); } public int EnumFormatEtc(int dwDirection, long[] ppenumFormatetc) { - return OS.VtblCall(8, address, dwDirection, ppenumFormatetc); + return COM.VtblCall(8, address, dwDirection, ppenumFormatetc); } public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) { //Called by a data consumer to obtain data from a source data object. 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 733e2ad75d..7c03aa8d58 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 @@ -62,7 +62,7 @@ public int GetTypeInfo(int iTInfo, int lcid, long[] ppTInfo ){ return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo); } public int GetTypeInfoCount(int [] pctinfo ){ - return OS.VtblCall(3, address, 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 89f3fe0a46..32f4d1ff26 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 @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IDispatchEx extends IDispatch { public IDispatchEx (long address) { @@ -30,11 +28,11 @@ public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long pvarRes, } public int DeleteMemberByName (long bstrName, int grfdex) { - return OS.VtblCall (9, address, bstrName, grfdex); + return COM.VtblCall (9, address, bstrName, grfdex); } public int DeleteMemberByDispID (int id) { - return OS.VtblCall (10, address, id); + return COM.VtblCall (10, address, id); } public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) { @@ -42,7 +40,7 @@ public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) { } public int GetMemberName (int id, long[] pbstrName) { - return OS.VtblCall (12, address, id, pbstrName); + return COM.VtblCall (12, address, id, pbstrName); } public int GetNextDispID (int grfdex, int id, int[] pid) { @@ -50,6 +48,6 @@ public int GetNextDispID (int grfdex, int id, int[] pid) { } public int GetNameSpaceParent (long[] ppunk) { - return OS.VtblCall (14, address, ppunk); + return COM.VtblCall (14, address, ppunk); } } 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 index e1c6844d04..24b506f90c 100644 --- 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 @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IDragSourceHelper2 extends IDragSourceHelper { public IDragSourceHelper2(long address) { super(address); } public int SetFlags(int dwFlags) { - return OS.VtblCall(5, address, 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 index 2e707e340f..3450405a27 100644 --- 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 @@ -23,7 +23,7 @@ public int DragEnter(long hwndTarget, long pDataObject, POINT ppt, int dwEffect) return COM.VtblCall(3, address, hwndTarget, pDataObject, ppt, dwEffect); } public int DragLeave() { - return OS.VtblCall(4, address); + return COM.VtblCall(4, address); } public int DragOver(POINT ppt, int dwEffect) { return COM.VtblCall(5, address, ppt, dwEffect); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java index eb35c971d7..793703ea49 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java @@ -13,23 +13,21 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IEnum extends IUnknown { public IEnum(long address) { super(address); } public int Clone( long[] ppenum ){ - return OS.VtblCall(6, address, ppenum); + return COM.VtblCall(6, address, ppenum); } public int Next(int celt, long rgelt, int[] pceltFetched ){ return COM.VtblCall(3, address, celt, rgelt, pceltFetched); } public int Reset() { - return OS.VtblCall(5, address); + return COM.VtblCall(5, address); } public int Skip(int celt){ - return OS.VtblCall(4, address, celt); + return COM.VtblCall(4, address, celt); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumTfDisplayAttributeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumTfDisplayAttributeInfo.java index 5d56fe7503..f8365b664c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumTfDisplayAttributeInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumTfDisplayAttributeInfo.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IEnumTfDisplayAttributeInfo extends IUnknown { public IEnumTfDisplayAttributeInfo(long address) { @@ -22,7 +20,7 @@ public IEnumTfDisplayAttributeInfo(long address) { } public int Next(int celt, long[] rgelt, int[] pceltFetched) { - return OS.VtblCall(4, address, celt, rgelt, pceltFetched); + return COM.VtblCall(4, address, celt, rgelt, pceltFetched); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFileDialog.java index 28f2709b7a..cb21697966 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFileDialog.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IFileDialog extends IUnknown { public IFileDialog(long address) { @@ -24,37 +22,37 @@ public IFileDialog(long address) { // IModalWindow public int Show(long hwndOwner) { - return OS.VtblCall(3, address, hwndOwner); + return COM.VtblCall(3, address, hwndOwner); } // IFileDialog public int SetOptions(int fos) { - return OS.VtblCall(9, address, fos); + return COM.VtblCall(9, address, fos); } public int GetOptions(int[] pfos) { - return OS.VtblCall(10, address, pfos); + return COM.VtblCall(10, address, pfos); } public int SetDefaultFolder(IShellItem psi) { - return OS.VtblCall(11, address, psi.address); + return COM.VtblCall(11, address, psi.address); } public int SetFolder(IShellItem psi) { - return OS.VtblCall(12, address, psi.address); + return COM.VtblCall(12, address, psi.address); } public int SetTitle(char[] pszTitle) { - return OS.VtblCall(17, address, pszTitle); + return COM.VtblCall(17, address, pszTitle); } public int GetResult(long[] ppsi) { - return OS.VtblCall(20, address, ppsi); + return COM.VtblCall(20, address, ppsi); } public int ClearClientData() { - return OS.VtblCall(25, address); + return COM.VtblCall(25, 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 index bd388a22fd..b09a1e958d 100644 --- 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 @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IFont extends IUnknown { public IFont(long address) { super(address); } public int get_hFont(long[] phfont){ - return OS.VtblCall(3, address, phfont); + return COM.VtblCall(3, address, phfont); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMLangFontLink2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMLangFontLink2.java index 1c139fec1b..9f6f4fc6db 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMLangFontLink2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMLangFontLink2.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IMLangFontLink2 extends IUnknown { public IMLangFontLink2(long address) { @@ -24,17 +22,17 @@ public IMLangFontLink2(long address) { // IMLangCodePages public int GetStrCodePages(char[] pszSrc, int cchSrc, int dwPriorityCodePages, int[] pdwCodePages, int[] pcchCodePages) { - return OS.VtblCall(4, address, pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); + return COM.VtblCall(4, address, pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); } // IMLangFontLink2 public int ReleaseFont(long hFont) { - return OS.VtblCall(8, address, hFont); + return COM.VtblCall(8, address, hFont); } public int MapFont(long hDC, int dwCodePages, char chSrc, long[] phDestFont) { - return OS.VtblCall(10, address, hDC, dwCodePages, chSrc, phDestFont); + return COM.VtblCall(10, address, hDC, dwCodePages, chSrc, phDestFont); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectArray.java index 84b893deed..a9883ce666 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectArray.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectArray.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IObjectArray extends IUnknown { public IObjectArray(long address) { @@ -22,7 +20,7 @@ public IObjectArray(long address) { } public int GetCount(int[] count) { - return OS.VtblCall(3, address, count); + return COM.VtblCall(3, address, count); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectCollection.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectCollection.java index f76a7b7f76..55844f7c52 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectCollection.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IObjectCollection.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IObjectCollection extends IObjectArray { public IObjectCollection(long address) { @@ -22,7 +20,7 @@ public IObjectCollection(long address) { } public int AddObject(IUnknown punk) { - return OS.VtblCall(5, address, punk.address); + return COM.VtblCall(5, address, punk.address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java index a248d0e717..fca3f3098c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IOleDocument extends IUnknown { public IOleDocument(long address) { super(address); } public int CreateView(long pIPSite,long pstm, int dwReserved, long[] ppView) { - return OS.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView); + return COM.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java index c5cf7f0b55..ffe055d7f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java @@ -22,15 +22,15 @@ public IOleDocumentView(long address) { super(address); } public int SetInPlaceSite(long pIPSite) { - return OS.VtblCall(3, address, pIPSite); + return COM.VtblCall(3, address, pIPSite); } public int SetRect(RECT prcView) { return COM.VtblCall(6, address, prcView); } public int Show(int fShow) { - return OS.VtblCall(9, address, fShow); + return COM.VtblCall(9, address, fShow); } public int UIActivate(int fUIActivate) { - return OS.VtblCall(10, address, fUIActivate); + return COM.VtblCall(10, address, fUIActivate); } } 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 6f877756c4..18c60d9ca1 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 @@ -21,15 +21,15 @@ public IOleInPlaceObject(long address) { super(address); } public int InPlaceDeactivate() { - return OS.VtblCall(5, address); + return COM.VtblCall(5, address); } public int UIDeactivate() { - return OS.VtblCall(6, address); + return COM.VtblCall(6, address); } public int SetObjectRects(RECT lprcPosRect, RECT lprcClipRect) { return COM.VtblCall(7, address, lprcPosRect, lprcClipRect); } public int ReactivateAndUndo() { - return OS.VtblCall(8, address); + return COM.VtblCall(8, address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java index 6299bbb621..7b364ae603 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java @@ -13,17 +13,15 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IOleLink extends IUnknown { public IOleLink(long address) { super(address); } public int BindIfRunning() { - return OS.VtblCall(10, address); + return COM.VtblCall(10, address); } public int GetSourceMoniker(long[] ppmk) { - return OS.VtblCall(6, address, ppmk); + return COM.VtblCall(6, address, ppmk); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java index ea55399671..ca4abce317 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java @@ -21,22 +21,22 @@ public IOleObject(long address) { super(address); } public int Advise(long pAdvSink, int[] pdwConnection) { - return OS.VtblCall(19, address, pAdvSink, pdwConnection); + return COM.VtblCall(19, address, pAdvSink, pdwConnection); } public int Close(int dwSaveOption) { - return OS.VtblCall(6, address, dwSaveOption); + return COM.VtblCall(6, address, dwSaveOption); } public int DoVerb(int iVerb, MSG lpmsg, long pActiveSite, int lindex, long hwndParent, RECT lprcPosRect) { return COM.VtblCall(11, address, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); } public int GetClientSite(long[] ppvClientSite) { - return OS.VtblCall(4, address, ppvClientSite); + return COM.VtblCall(4, address, ppvClientSite); } public int GetExtent(int dwDrawAspect, SIZE pSizel) { return COM.VtblCall(18, address, dwDrawAspect, pSizel); } public int SetClientSite(long pClientSite) { - return OS.VtblCall(3, address, pClientSite); + return COM.VtblCall(3, address, pClientSite); } public int SetExtent(int dwDrawAspect, SIZE pSizel) { return COM.VtblCall(17, address, dwDrawAspect, pSizel); @@ -61,9 +61,9 @@ public int SetHostNames(String szContainerApp, String szContainerObj) { return COM.VtblCall(5, address, buffer1, buffer2); } public int Unadvise(int token) { - return OS.VtblCall(20, address, token); + return COM.VtblCall(20, address, token); } public int Update() { - return OS.VtblCall(13, address); + return COM.VtblCall(13, address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java index 4a93d80e8f..7a9c254b3f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IOleWindow extends IUnknown { public IOleWindow(long address) { super(address); } public int GetWindow(long[] phwnd) { - return OS.VtblCall(3, address, phwnd); + return COM.VtblCall(3, address, phwnd); } } 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 b8f80c110a..a05a66539c 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 @@ -13,26 +13,24 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IPersistFile extends IPersist { public IPersistFile(long address) { super(address); } public int IsDirty() { - return OS.VtblCall(4, address); + return COM.VtblCall(4, address); } public int Load(long pszFileName, int dwMode) { - return OS.VtblCall(5, address, pszFileName, 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 OS.VtblCall(7, address, pszFileName); + return COM.VtblCall(7, address, pszFileName); } public int GetCurFile(long [] ppszFileName){ - return OS.VtblCall(8, address, 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 638cda9838..15fff3daac 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 @@ -13,29 +13,27 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IPersistStorage extends IPersist { public IPersistStorage(long address) { super(address); } public int IsDirty() { - return OS.VtblCall(4, address); + return COM.VtblCall(4, address); } public int InitNew(long pStg) { - return OS.VtblCall(5, address, pStg); + return COM.VtblCall(5, address, pStg); } public int Load(long pStg) { - return OS.VtblCall(6, address, pStg); + return COM.VtblCall(6, address, pStg); } public int Save(long pStgSave, boolean fSameAsLoad) { return COM.VtblCall(7, address, pStgSave, fSameAsLoad); } public int SaveCompleted(long pStgNew) { - return OS.VtblCall(8, address, pStgNew); + return COM.VtblCall(8, address, pStgNew); } public int HandsOffStorage(){ - return OS.VtblCall(9, address); + return COM.VtblCall(9, address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java index 0cf1b7a7f1..4253622fa9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IPersistStreamInit extends IPersist { public IPersistStreamInit(long address) { @@ -22,10 +20,10 @@ public IPersistStreamInit(long address) { } public int Load(long pStm) { - return OS.VtblCall(5, address, pStm); + return COM.VtblCall(5, address, pStm); } public int InitNew() { - return OS.VtblCall(8, address); + return COM.VtblCall(8, address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyStore.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyStore.java index 6e0e896154..c946313f5f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyStore.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyStore.java @@ -22,11 +22,11 @@ public IPropertyStore(long address) { } public int SetValue(PROPERTYKEY key, long propvar) { - return OS.VtblCall(6, address, key, propvar); + return COM.VtblCall(6, address, key, propvar); } public int Commit() { - return OS.VtblCall(7, address); + return COM.VtblCall(7, address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java index 26dc566496..b08d77ca96 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IProvideClassInfo extends IUnknown { public IProvideClassInfo(long address) { super(address); } public int GetClassInfo(long[] ppTI) { - return OS.VtblCall(3, address, ppTI); + return COM.VtblCall(3, address, ppTI); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellItem.java index a6c0c40abd..a0f77de869 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellItem.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IShellItem extends IUnknown { public IShellItem(long address) { @@ -22,7 +20,7 @@ public IShellItem(long address) { } public int GetDisplayName(int sigdnName, long[] ppszName) { - return OS.VtblCall(5, address, sigdnName, ppszName); + return COM.VtblCall(5, address, sigdnName, ppszName); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellLink.java index ee3be08df9..d487c438bb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellLink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IShellLink.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IShellLink extends IUnknown { public IShellLink(long address) { @@ -22,19 +20,19 @@ public IShellLink(long address) { } public int SetDescription(char[] pszName) { - return OS.VtblCall(7, address, pszName); + return COM.VtblCall(7, address, pszName); } public int SetArguments(char[] pszArgs) { - return OS.VtblCall(11, address, pszArgs); + return COM.VtblCall(11, address, pszArgs); } public int SetIconLocation(char[] pszIconPath, int iIcon) { - return OS.VtblCall(17, address, pszIconPath, iIcon); + return COM.VtblCall(17, address, pszIconPath, iIcon); } public int SetPath(char[] pszFile) { - return OS.VtblCall(20, address, pszFile); + return COM.VtblCall(20, address, pszFile); } } 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 046a56e7f8..054c76def7 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 @@ -13,15 +13,13 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IStorage extends IUnknown { public IStorage(long address) { super(address); } public int Commit(int grfCommitFlag) { - return OS.VtblCall(9, address, grfCommitFlag); + return COM.VtblCall(9, address, grfCommitFlag); } public int CopyTo( int ciidExclude, //Number of elements in rgiidExclude @@ -74,7 +72,7 @@ public int DestroyElement(String pwcsName) { if (pwcsName != null) { buffer = (pwcsName+"\0").toCharArray(); } - return OS.VtblCall(12, address, buffer); + return COM.VtblCall(12, address, buffer); } public int EnumElements( int reserved1, //Reserved; must be zero @@ -83,7 +81,7 @@ public int EnumElements( long[] ppenum //Pointer to output variable that // receives the IEnumSTATSTG interface ){ - return OS.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum); + return COM.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum); } public int OpenStorage( String pwcsName, //Pointer to the name of the @@ -144,7 +142,7 @@ public int RenameElement( return COM.VtblCall(13, address, buffer1, buffer2); } public int Revert() { - return OS.VtblCall(10, address); + return COM.VtblCall(10, address); } public int SetClass( GUID clsid //CLSID to be assigned to the storage object 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 18e73508cc..bd2735ec8d 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 @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IStream extends IUnknown { public IStream(long address) { super(address); @@ -22,17 +20,17 @@ public IStream(long address) { public int Clone( long[] ppstm //Pointer to location for pointer to the new stream object ){ - return OS.VtblCall(13, address, ppstm); + return COM.VtblCall(13, address, ppstm); } public int Commit( int grfCommitFlags //Specifies how changes are committed ){ - return OS.VtblCall(8, address, grfCommitFlags); + return COM.VtblCall(8, address, grfCommitFlags); } public int Read(long pv, int cb, int[] pcbWritten) { return COM.VtblCall(3, address, pv, cb, pcbWritten); } public int Revert(){ - return OS.VtblCall(9, address); + 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/ITaskbarList3.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITaskbarList3.java index 70e2864119..222857be7c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITaskbarList3.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITaskbarList3.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class ITaskbarList3 extends IUnknown { public ITaskbarList3(long address) { @@ -22,15 +20,15 @@ public ITaskbarList3(long address) { } public int SetProgressValue(long hwnd, long ullCompleted, long ullTotal) { - return OS.VtblCall(9, address, hwnd, ullCompleted, ullTotal); + return COM.VtblCall(9, address, hwnd, ullCompleted, ullTotal); } public int SetProgressState(long hwnd, int tbpFlags) { - return OS.VtblCall(10, address, hwnd, tbpFlags); + return COM.VtblCall(10, address, hwnd, tbpFlags); } public int SetOverlayIcon(long hwnd, long hIcon, long pszDescription) { - return OS.VtblCall(18, address, hwnd, hIcon, pszDescription); + return COM.VtblCall(18, address, hwnd, hIcon, pszDescription); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeInfo.java index d3c20eeb2c..a21658bcb3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeInfo.java @@ -22,7 +22,7 @@ public ITfDisplayAttributeInfo(long address) { } public int GetAttributeInfo(TF_DISPLAYATTRIBUTE pda) { - return OS.VtblCall(5, address, pda); + return COM.VtblCall(5, address, pda); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeProvider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeProvider.java index 3926f67fe4..3f8f9851ed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeProvider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITfDisplayAttributeProvider.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class ITfDisplayAttributeProvider extends IUnknown { public ITfDisplayAttributeProvider(long address) { @@ -22,7 +20,7 @@ public ITfDisplayAttributeProvider(long address) { } public int EnumDisplayAttributeInfo(long [] ppEnum) { - return OS.VtblCall(3, address, ppEnum); + return COM.VtblCall(3, address, ppEnum); } } 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 6f9e415857..ee68c8d0d4 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 @@ -73,7 +73,7 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[] return rc; } public int GetFuncDesc(int index, long[] ppFuncDesc) { - return OS.VtblCall(5, address, index, ppFuncDesc); + return COM.VtblCall(5, address, index, ppFuncDesc); } public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { @@ -114,7 +114,7 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { } public int GetImplTypeFlags(int index, int[] pImplTypeFlags) { - return OS.VtblCall(9, address, index, pImplTypeFlags); + return COM.VtblCall(9, address, index, pImplTypeFlags); } public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ @@ -141,24 +141,24 @@ public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ return rc; } public int GetRefTypeInfo(int hRefType, long[] ppTInfo) { - return OS.VtblCall(14, address, hRefType, ppTInfo); + return COM.VtblCall(14, address, hRefType, ppTInfo); } public int GetRefTypeOfImplType(int index, int[] pRefType) { - return OS.VtblCall(8, address, index, pRefType); + return COM.VtblCall(8, address, index, pRefType); } public int GetTypeAttr(long[] ppTypeAttr) { - return OS.VtblCall(3, address, ppTypeAttr); + return COM.VtblCall(3, address, ppTypeAttr); } public int GetVarDesc(int index, long[] ppVarDesc ) { - return OS.VtblCall(6, address, index, ppVarDesc); + return COM.VtblCall(6, address, index, ppVarDesc); } public int ReleaseFuncDesc(long pFuncDesc ) { - return OS.VtblCall(20, address, pFuncDesc); + return COM.VtblCall(20, address, pFuncDesc); } public int ReleaseTypeAttr(long pTypeAttr) { - return OS.VtblCall(19, address, pTypeAttr); + return COM.VtblCall(19, address, pTypeAttr); } public int ReleaseVarDesc(long pVarDesc ) { - return OS.VtblCall(21, address, pVarDesc); + return COM.VtblCall(21, address, pVarDesc); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java index 3524caade8..613713a828 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.swt.internal.ole.win32; -import org.eclipse.swt.internal.win32.*; - public class IUnknown { long address; @@ -22,7 +20,7 @@ public IUnknown(long address) { this.address = address; } public int AddRef() { - return OS.VtblCall(1, address); + return COM.VtblCall(1, address); } public long getAddress() { return address; @@ -31,6 +29,6 @@ public int QueryInterface(GUID riid, long[] ppvObject) { return COM.VtblCall(0, address, riid, ppvObject); } public int Release() { - return OS.VtblCall(2, address); + return COM.VtblCall(2, address); } } 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 2ba2550243..559e50bb43 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 @@ -4567,50 +4567,6 @@ public static final native boolean ValidateRect (long hWnd, RECT lpRect); /** @param ch cast=(WCHAR) */ public static final native short VkKeyScan (short ch); -/** @method flags=trycatch */ -public static final native int VtblCall (int fnNumber, long ppVtbl); - -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0); - -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int[] arg3); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int[] arg3); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, long arg1, int arg2, long[] arg3); -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long arg1, int arg2, long[] arg3); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, long[] arg3); - -public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); -public static final native int VtblCall (int fnNumber, long ppVtbl, short arg0, byte[] arg1, byte[] arg2, byte[] arg3); -public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0); -public static final native int VtblCall (int fnNumber, long ppVtbl, long[] arg0); -public static final native int VtblCall (int fnNumber, long ppVtbl, byte[] arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, byte[] arg0, long[] arg1); -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, long arg0, long[] arg1, long[] arg2); -public static final native int VtblCall (int fnNumber, long ppVtbl, TF_DISPLAYATTRIBUTE arg0); - -public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long 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, int arg1, int arg2); - -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, long arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0, byte[] arg1, int[] arg2); -public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0, byte[] arg1, long[] arg2); -public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0); -public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, int arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, long arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, PROPERTYKEY arg0, int arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, PROPERTYKEY arg0, long arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, char[] arg2, char[] arg3, long arg4); -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long[] arg1); - public static final native boolean WaitMessage (); /** * @param lpWideCharStr cast=(LPCWSTR),flags=no_out critical diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java index 3f61ab39e6..ea7ed4263b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebCookieManager extends IUnknown { @@ -24,7 +23,7 @@ public IWebCookieManager (long address) { } public int cookieStorage (long[] storage) { - return OS.VtblCall (3, getAddress (), storage); + return COM.VtblCall (3, getAddress (), storage); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java index 180bf8192e..2d54239fad 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDataSource extends IUnknown { @@ -24,19 +23,19 @@ public IWebDataSource (long address) { } public int representation (long[] rep) { - return OS.VtblCall (5, getAddress (), rep); + return COM.VtblCall (5, getAddress (), rep); } public int webFrame (long[] frame) { - return OS.VtblCall (6, getAddress (), frame); + return COM.VtblCall (6, getAddress (), frame); } public int request (long[] request) { - return OS.VtblCall (8, getAddress (), request); + return COM.VtblCall (8, getAddress (), request); } public int pageTitle (long[] title) { - return OS.VtblCall (12, getAddress (), title); + return COM.VtblCall (12, getAddress (), title); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java index da31f88e59..e18eda855d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDocumentRepresentation extends IUnknown { @@ -24,7 +23,7 @@ public IWebDocumentRepresentation (long address) { } public int documentSource (long[] source) { - return OS.VtblCall (8, getAddress (), source); + return COM.VtblCall (8, getAddress (), source); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java index 832a74088f..610252bb9d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDownload extends IUnknown { @@ -24,15 +23,15 @@ public IWebDownload (long address) { } public int cancel () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } public int setDeletesFileUponFailure (int deletesFileUponFailure) { - return OS.VtblCall (12, getAddress (), deletesFileUponFailure); + return COM.VtblCall (12, getAddress (), deletesFileUponFailure); } public int setDestination (long path, int allowOverwrite) { - return OS.VtblCall (13, getAddress(), path, allowOverwrite); + return COM.VtblCall (13, getAddress(), path, allowOverwrite); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java index 1917d78f03..c8ac6b99c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebError extends IUnknown { @@ -24,7 +23,7 @@ public IWebError (long address) { } public int code (int[] result) { - return OS.VtblCall (4, getAddress (), result); + return COM.VtblCall (4, getAddress (), result); } //public int domain (long[] result) { @@ -32,7 +31,7 @@ public int code (int[] result) { //} public int localizedDescription (long[] result) { - return OS.VtblCall (6, getAddress (), result); + return COM.VtblCall (6, getAddress (), result); } //public int localizedFailureReason (long[] result) { @@ -44,7 +43,7 @@ public int localizedDescription (long[] result) { //} public int failingURL (long[] result) { - return OS.VtblCall (12, getAddress (), result); + return COM.VtblCall (12, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java index 0666b4bbdd..deec3f5502 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebErrorPrivate extends IUnknown { @@ -24,7 +23,7 @@ public IWebErrorPrivate (long address) { } public int sslPeerCertificate (long[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java index 750b457ed3..5ca43a6e60 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebFrame extends IUnknown { @@ -24,19 +23,19 @@ public IWebFrame (long address) { } public int loadRequest (long request) { - return OS.VtblCall (8, getAddress (), request); + return COM.VtblCall (8, getAddress (), request); } public int loadHTMLString (long string, long baseURL) { - return OS.VtblCall (10, getAddress (), string, baseURL); + return COM.VtblCall (10, getAddress (), string, baseURL); } public int dataSource (long[] source) { - return OS.VtblCall (13, getAddress (), source); + return COM.VtblCall (13, getAddress (), source); } public long globalContext () { - return OS.VtblCall (23, getAddress ()); + return COM.VtblCall (23, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java index 4e60f157fb..9873a903c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebFramePrivate extends IUnknown { @@ -24,15 +23,15 @@ public IWebFramePrivate (long address) { } public int setInPrintingMode (int value, long printDC) { - return OS.VtblCall (8, getAddress (), value, printDC); + return COM.VtblCall (8, getAddress (), value, printDC); } public int getPrintedPageCount (long printDC, int[] pageCount) { - return OS.VtblCall (9, getAddress (), printDC, pageCount); + return COM.VtblCall (9, getAddress (), printDC, pageCount); } public int spoolPages (long printDC, int startPage, int endPage, long[] ctx) { - return OS.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); + return COM.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java index 0117c86c61..dd5e1eafe7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebIBActions extends IUnknown { @@ -24,19 +23,19 @@ public IWebIBActions (long address) { } public int stopLoading (long sender) { - return OS.VtblCall (4, getAddress (), sender); + return COM.VtblCall (4, getAddress (), sender); } public int reload (long sender) { - return OS.VtblCall (5, getAddress (), sender); + return COM.VtblCall (5, getAddress (), sender); } public int canGoBack (long sender, int[] result) { - return OS.VtblCall (6, getAddress (), sender, result); + return COM.VtblCall (6, getAddress (), sender, result); } public int canGoForward (long sender, int[] result) { - return OS.VtblCall (8, getAddress (), sender, result); + return COM.VtblCall (8, getAddress (), sender, result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java index 0d83f033be..a0729172d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java @@ -14,7 +14,7 @@ package org.eclipse.swt.internal.webkit; -import org.eclipse.swt.internal.win32.*; +import org.eclipse.swt.internal.ole.win32.*; public class IWebMutableURLRequest extends IWebURLRequest { @@ -31,19 +31,19 @@ public IWebMutableURLRequest (long address) { //} public int setHTTPMethod (int post) { - return OS.VtblCall (23, getAddress (), post); + return COM.VtblCall (23, getAddress (), post); } public int setURL (long theUrl) { - return OS.VtblCall (27, getAddress (), theUrl); + return COM.VtblCall (27, getAddress (), theUrl); } public int setValue (long value, long field) { - return OS.VtblCall (28, getAddress (), value, field); + return COM.VtblCall (28, getAddress (), value, field); } public int setAllowsAnyHTTPSCertificate () { - return OS.VtblCall (29, getAddress ()); + return COM.VtblCall (29, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java index ef531a2c57..fb8046ab15 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebMutableURLRequestPrivate extends IUnknown { @@ -28,7 +27,7 @@ public IWebMutableURLRequestPrivate (long address) { //} public int cfRequest () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java index 5f3aef2a10..0e2ae45513 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java @@ -14,7 +14,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebOpenPanelResultListener extends IUnknown { @@ -23,11 +22,11 @@ public IWebOpenPanelResultListener (long address) { } public int chooseFilename (long fileName) { - return OS.VtblCall (3, getAddress (), fileName); + return COM.VtblCall (3, getAddress (), fileName); } public int cancel () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java index 74520ba60a..97b505e074 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebPolicyDecisionListener extends IUnknown{ @@ -24,15 +23,15 @@ public IWebPolicyDecisionListener (long address) { } public int use () { - return OS.VtblCall (3, getAddress ()); + return COM.VtblCall (3, getAddress ()); } public int download () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } public int ignore () { - return OS.VtblCall (5, getAddress ()); + return COM.VtblCall (5, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java index fdf79a49d4..36c9b0d328 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebPreferences extends IUnknown { @@ -28,23 +27,23 @@ public int initWithIdentifier (long identifier, long[] preferences) { } public int setJavaEnabled (int enabled) { - return OS.VtblCall (33, getAddress (), enabled); + return COM.VtblCall (33, getAddress (), enabled); } public int setJavaScriptEnabled (int enabled) { - return OS.VtblCall (35, getAddress (), enabled); + return COM.VtblCall (35, getAddress (), enabled); } public int setJavaScriptCanOpenWindowsAutomatically (int enabled) { - return OS.VtblCall (37, getAddress (), enabled); + return COM.VtblCall (37, getAddress (), enabled); } public int setTabsToLinks (int enabled) { - return OS.VtblCall (52, getAddress (), enabled); + return COM.VtblCall (52, getAddress (), enabled); } public int setFontSmoothing (int smoothingType) { - return OS.VtblCall (63, getAddress (), smoothingType); + return COM.VtblCall (63, getAddress (), smoothingType); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java index 17b3b9b07d..886c372329 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallenge extends IUnknown { @@ -24,19 +23,19 @@ public IWebURLAuthenticationChallenge (long address) { } public int previousFailureCount (int[] result) { - return OS.VtblCall (7, getAddress (), result); + return COM.VtblCall (7, getAddress (), result); } public int proposedCredential (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int protectionSpace (long[] result) { - return OS.VtblCall (9, getAddress (), result); + return COM.VtblCall (9, getAddress (), result); } public int sender (long[] sender) { - return OS.VtblCall (10, getAddress (), sender); + return COM.VtblCall (10, getAddress (), sender); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java index 7bbac4d91a..bd4b66bb1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallengeSender extends IUnknown { @@ -24,11 +23,11 @@ public IWebURLAuthenticationChallengeSender (long address) { } public int cancelAuthenticationChallenge (long challenge) { - return OS.VtblCall (3, getAddress (), challenge); + return COM.VtblCall (3, getAddress (), challenge); } public int useCredential (long credential, long challenge) { - return OS.VtblCall (5, getAddress (), credential, challenge); + return COM.VtblCall (5, getAddress (), credential, challenge); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java index 7f50e2187c..0fe000b9c8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLCredential extends IUnknown { @@ -24,19 +23,19 @@ public IWebURLCredential (long address) { } public int hasPassword (int[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } public int initWithUser (long user, long password, long persistence) { - return OS.VtblCall (4, getAddress (), user, password, persistence); + return COM.VtblCall (4, getAddress (), user, password, persistence); } public int password (long[] password) { - return OS.VtblCall (5, getAddress (), password); + return COM.VtblCall (5, getAddress (), password); } public int user (long[] result) { - return OS.VtblCall (7, getAddress (), result); + return COM.VtblCall (7, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java index 93c4b36ab5..4766a2748e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLProtectionSpace extends IUnknown { @@ -24,15 +23,15 @@ public IWebURLProtectionSpace(long address) { } public int host (long[] result) { - return OS.VtblCall (4, getAddress (), result); + return COM.VtblCall (4, getAddress (), result); } public int port (int[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int realm (long[] result) { - return OS.VtblCall (11, getAddress (), result); + return COM.VtblCall (11, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java index a0b5b538ba..b426d905d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLRequest extends IUnknown { @@ -28,15 +27,15 @@ public IWebURLRequest (long address) { //} public int HTTPMethod (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int URL (long[] result) { - return OS.VtblCall (13, getAddress (), result); + return COM.VtblCall (13, getAddress (), result); } public int mutableCopy (long[] result) { - return OS.VtblCall (16, getAddress (), result); + return COM.VtblCall (16, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java index 8a87223998..a157911320 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLResponse extends IUnknown { @@ -24,11 +23,11 @@ public IWebURLResponse (long address) { } public int expectedContentLength (long[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } public int URL (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java index 99b8735956..f5f89048ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java @@ -24,7 +24,7 @@ public IWebView (long address) { } public int canShowMIMEType (long mimeType, int[] canShow) { - return OS.VtblCall (3, getAddress (), mimeType, canShow); + return COM.VtblCall (3, getAddress (), mimeType, canShow); } public int initWithFrame (RECT frame, long frameName, long groupName) { @@ -32,59 +32,59 @@ public int initWithFrame (RECT frame, long frameName, long groupName) { } public int setUIDelegate (long delegate) { - return OS.VtblCall (10, getAddress (), delegate); + return COM.VtblCall (10, getAddress (), delegate); } public int setResourceLoadDelegate (long delegate) { - return OS.VtblCall (12, getAddress (), delegate); + return COM.VtblCall (12, getAddress (), delegate); } public int setDownloadDelegate (long delegate) { - return OS.VtblCall (14, getAddress (), delegate); + return COM.VtblCall (14, getAddress (), delegate); } public int setFrameLoadDelegate (long delegate) { - return OS.VtblCall (16, getAddress (), delegate); + return COM.VtblCall (16, getAddress (), delegate); } public int setPolicyDelegate (long delegate) { - return OS.VtblCall (18, getAddress (), delegate); + return COM.VtblCall (18, getAddress (), delegate); } public int mainFrame (long[] frame) { - return OS.VtblCall (20, getAddress (), frame); + return COM.VtblCall (20, getAddress (), frame); } public int goBack (int[] succeeded) { - return OS.VtblCall (24, getAddress(), succeeded); + return COM.VtblCall (24, getAddress(), succeeded); } public int goForward (int[] succeeded) { - return OS.VtblCall (25, getAddress(), succeeded); + return COM.VtblCall (25, getAddress(), succeeded); } public int setCustomUserAgent (long valueString) { - return OS.VtblCall (31, getAddress (), valueString); + return COM.VtblCall (31, getAddress (), valueString); } public int setPreferences (long prefs) { - return OS.VtblCall (41, getAddress (), prefs); + return COM.VtblCall (41, getAddress (), prefs); } public int preferences (long[] prefs) { - return OS.VtblCall (42, getAddress (), prefs); + return COM.VtblCall (42, getAddress (), prefs); } public int setHostWindow (long window) { - return OS.VtblCall (45, getAddress (), window); + return COM.VtblCall (45, getAddress (), window); } public int hostWindow (long[] window) { - return OS.VtblCall (46, getAddress (), window); + return COM.VtblCall (46, getAddress (), window); } public int estimatedProgress (long estimatedProgress) { - return OS.VtblCall (51, getAddress (), estimatedProgress); + return COM.VtblCall (51, getAddress (), estimatedProgress); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java index a620bd5e2b..e067052242 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebViewPrivate extends IUnknown { @@ -24,15 +23,15 @@ public IWebViewPrivate (long address) { } public int viewWindow (long[] window) { - return OS.VtblCall (5, getAddress (), window); + return COM.VtblCall (5, getAddress (), window); } public int setInitialFocus (int forwardEnabled) { - return OS.VtblCall (28, getAddress (), forwardEnabled); + return COM.VtblCall (28, getAddress (), forwardEnabled); } public int shouldClose (int[] result) { - return OS.VtblCall (33, getAddress (), result); + return COM.VtblCall (33, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java index faef4b639c..882c88fe09 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java @@ -253,7 +253,7 @@ private String openCommonFileDialog () { long [] ppMalloc = new long [1]; if (OS.SHGetMalloc (ppMalloc) == OS.S_OK) { /* void Free (struct IMalloc *this, void *pv); */ - OS.VtblCall (5, ppMalloc [0], lpItemIdList); + COM.VtblCall (5, ppMalloc [0], lpItemIdList); } /* |