diff options
author | Felipe Heidrich <fheidric> | 2007-08-24 19:16:44 +0000 |
---|---|---|
committer | Felipe Heidrich <fheidric> | 2007-08-24 19:16:44 +0000 |
commit | 48e187525dbdddb19c5ae73327fdafa3851247d0 (patch) | |
tree | 748336b2c762c358a2f414d31bf3b0181315aeb0 | |
parent | 896883de807d4eb64d2f5290888639fc0d1fdd35 (diff) | |
download | eclipse.platform.swt-48e187525dbdddb19c5ae73327fdafa3851247d0.tar.gz eclipse.platform.swt-48e187525dbdddb19c5ae73327fdafa3851247d0.tar.xz eclipse.platform.swt-48e187525dbdddb19c5ae73327fdafa3851247d0.zip |
*** empty log message ***
4 files changed, 25 insertions, 3 deletions
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 c148735f18..479c29b971 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 @@ -14377,6 +14377,25 @@ fail: } #endif +#ifndef NO_VtblCall__II_3B_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3B_3I) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3) +{ + jbyte *lparg2=NULL; + jint *lparg3=NULL; + jint rc = 0; + OS_NATIVE_ENTER(env, that, VtblCall__II_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 *)(jint, jbyte *, jint *))(*(jint **)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__II_3B_3I_FUNC); + return rc; +} +#endif + #ifndef NO_VtblCall__II_3CII_3I_3I JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CII_3I_3I) (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) 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 98c31f60f5..c8f65b2ba5 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 @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 908; -int OS_nativeFunctionCallCount[908]; +int OS_nativeFunctionCount = 909; +int OS_nativeFunctionCallCount[909]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -913,6 +913,7 @@ char * OS_nativeFunctionNames[] = { "VtblCall__IIJJI_3J", "VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", "VtblCall__IIS_3B_3B_3B", + "VtblCall__II_3B_3I", "VtblCall__II_3CII_3I_3I", "VtblCall__II_3I", "VtblCall__II_3J", 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 11e723145b..9502cb9eb5 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 @@ -921,6 +921,7 @@ typedef enum { VtblCall__IIJJI_3J_FUNC, VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC, VtblCall__IIS_3B_3B_3B_FUNC, + VtblCall__II_3B_3I_FUNC, VtblCall__II_3CII_3I_3I_FUNC, VtblCall__II_3I_FUNC, VtblCall__II_3J_FUNC, 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 970648478a..223c42a49b 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 @@ -3945,7 +3945,8 @@ public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, short arg0, byte[] arg1, byte[] arg2, byte[] arg3); public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int[] arg0); -public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long [] arg0); +public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long[] arg0); +public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int /*long*/[] arg1); public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/[] arg1, int[] arg2); public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, TF_DISPLAYATTRIBUTE arg0); |