fix vtbl for 64-bit

11 files changed, 30 insertions, 31 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
index 60f748c09e..8877d39b7e 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
@@ -687,11 +687,6 @@ COM_VtblCall__II_3C_3C_1=
 COM_VtblCall__II_3C_3C_2=
 COM_VtblCall__II_3C_3C_3=
 
-COM_VtblCall__II_3J=
-COM_VtblCall__II_3J_0=
-COM_VtblCall__II_3J_1=
-COM_VtblCall__II_3J_2=
-
 COM_VtblCall__IJIIIIJ=
 COM_VtblCall__IJIIIIJ_0=
 COM_VtblCall__IJIIIIJ_1=
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index 6ca1415f73..65f1e25b72 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -4869,6 +4869,11 @@ OS_VtblCall__II_3I_0=
 OS_VtblCall__II_3I_1=
 OS_VtblCall__II_3I_2=
 
+OS_VtblCall__II_3J=
+OS_VtblCall__II_3J_0=
+OS_VtblCall__II_3J_1=
+OS_VtblCall__II_3J_2=
+
 OS_WINDOWPLACEMENT_sizeof=
 
 OS_WINDOWPOS_sizeof=
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 a1c1b9e385..6791ade1d4 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
@@ -2008,22 +2008,6 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
-{
-	jlong *lparg2=NULL;
-	jint rc = 0;
-	COM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-	COM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_VtblCall__IJIIIIJ
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIJ)
 	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6)
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 8a10cb5318..7e1d941a40 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
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int COM_nativeFunctionCount = 153;
-int COM_nativeFunctionCallCount[153];
+int COM_nativeFunctionCount = 152;
+int COM_nativeFunctionCallCount[152];
 char * COM_nativeFunctionNames[] = {
 	"AccessibleObjectFromWindow",
 	"CAUUID_1sizeof",
@@ -144,7 +144,6 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__II_3CIII_3J",
 	"VtblCall__II_3CJII_3J",
 	"VtblCall__II_3C_3C",
-	"VtblCall__II_3J",
 	"VtblCall__IJIIIIJ",
 	"VtblCall__IJJIIIII",
 	"VtblCall_1IVARIANT",
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 d8aa1be33a..469a8dac78 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
@@ -152,7 +152,6 @@ typedef enum {
 	VtblCall__II_3CIII_3J_FUNC,
 	VtblCall__II_3CJII_3J_FUNC,
 	VtblCall__II_3C_3C_FUNC,
-	VtblCall__II_3J_FUNC,
 	VtblCall__IJIIIIJ_FUNC,
 	VtblCall__IJJIIIII_FUNC,
 	VtblCall_1IVARIANT_FUNC,
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 905ff0ff3d..c148735f18 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
@@ -14415,6 +14415,22 @@ fail:
 }
 #endif
 
+#ifndef NO_VtblCall__II_3J
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
+{
+	jlong *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, VtblCall__II_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 f96bc4298d..98c31f60f5 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 = 907;
-int OS_nativeFunctionCallCount[907];
+int OS_nativeFunctionCount = 908;
+int OS_nativeFunctionCallCount[908];
 char * OS_nativeFunctionNames[] = {
 	"ACCEL_1sizeof",
 	"ACTCTX_1sizeof",
@@ -915,6 +915,7 @@ char * OS_nativeFunctionNames[] = {
 	"VtblCall__IIS_3B_3B_3B",
 	"VtblCall__II_3CII_3I_3I",
 	"VtblCall__II_3I",
+	"VtblCall__II_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 78c6e772ba..11e723145b 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
@@ -923,6 +923,7 @@ typedef enum {
 	VtblCall__IIS_3B_3B_3B_FUNC,
 	VtblCall__II_3CII_3I_3I_FUNC,
 	VtblCall__II_3I_FUNC,
+	VtblCall__II_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 4e70efaf2e..496d89ea32 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
@@ -469,8 +469,6 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[
 
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int /*long*/ arg1, int arg2, int arg3, int arg4, int /*long*/[] arg5);
 
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
-
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1);
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 a49e7e89a6..871234f929 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
@@ -57,7 +57,7 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
 public int GetTypeInfo(int iTInfo, int lcid, int /*long*/[] ppTInfo ){
 	return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo);
 }
-public int GetTypeInfoCount(int[] pctinfo ){
+public int GetTypeInfoCount(int /*long*/[] pctinfo ){
 	return COM.VtblCall(3, address, pctinfo);
 }
 public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int /*long*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) {
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 6aab9749c6..970648478a 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
@@ -3944,7 +3944,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 /*long*/[] arg0);
+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, int arg0, int /*long*/[] arg1, int[] arg2);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, TF_DISPLAYATTRIBUTE arg0);