Mac generator and building 64 bit enabled C code

17 files changed, 9052 insertions, 4071 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index 2f2286e3f1..e93e3c4863 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -37,7 +37,7 @@ IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Microsoft Platform SDK for Win
 call %MSSDK%\setenv /X64 /RETAIL
 IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk50-x86_64
-set CFLAGS=-DSWT_PTR_SIZE_64
+set CFLAGS=-DJNI64
 shift
 GOTO MAKE
 
@@ -47,7 +47,7 @@ IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Microsoft Platform SDK for Win
 call %MSSDK%\setenv /SRV64 /RETAIL
 IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.ia64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk142-ia64
-set CFLAGS=-DSWT_PTR_SIZE_64
+set CFLAGS=-DJNI64
 shift
 GOTO MAKE
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
index 8b91f4381e..cb8d4355ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
@@ -78,6 +78,10 @@
 	<antcall target="build_win32_dll"/>
 	<antcall target="clean"/>
 	<antcall target="build_wince_dll"/>
+	<antcall target="clean"/>
+	<antcall target="build_win32_x86_64_dll"/>
+	<antcall target="clean"/>
+	<antcall target="build_win32_ia64_dll"/>
 </target>
 
 <target name="clean">
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 03067ca4b3..e32dd7d4a3 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
@@ -17,33 +17,25 @@
 
 #ifndef NO_AccessibleObjectFromWindow
 JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3)
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, AccessibleObjectFromWindow_FUNC);
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AccessibleObjectFromWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AccessibleObjectFromWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AccessibleObjectFromWindow)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWORD, GUID *, LPVOID *))fp)((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	COM_NATIVE_EXIT(env, that, AccessibleObjectFromWindow_FUNC);
 	return rc;
@@ -126,19 +118,19 @@ JNIEXPORT jint JNICALL COM_NATIVE(COSERVERINFO_1sizeof)
 
 #ifndef NO_CoCreateInstance
 JNIEXPORT jint JNICALL COM_NATIVE(CoCreateInstance)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jobject arg3, jintLongArray arg4)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoCreateInstance_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == 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;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoCreateInstance(lparg0, (LPUNKNOWN)arg1, arg2, lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, CoCreateInstance_FUNC);
@@ -158,19 +150,19 @@ JNIEXPORT void JNICALL COM_NATIVE(CoFreeUnusedLibraries)
 
 #ifndef NO_CoGetClassObject
 JNIEXPORT jint JNICALL COM_NATIVE(CoGetClassObject)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoGetClassObject_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == 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;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoGetClassObject(lparg0, arg1, (COSERVERINFO *)arg2, lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, CoGetClassObject_FUNC);
@@ -180,7 +172,7 @@ fail:
 
 #ifndef NO_CoLockObjectExternal
 JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoLockObjectExternal_FUNC);
@@ -191,12 +183,12 @@ JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal)
 #endif
 
 #ifndef NO_CoTaskMemAlloc
-JNIEXPORT jint JNICALL COM_NATIVE(CoTaskMemAlloc)
+JNIEXPORT jintLong JNICALL COM_NATIVE(CoTaskMemAlloc)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, CoTaskMemAlloc_FUNC);
-	rc = (jint)CoTaskMemAlloc((ULONG)arg0);
+	rc = (jintLong)CoTaskMemAlloc((ULONG)arg0);
 	COM_NATIVE_EXIT(env, that, CoTaskMemAlloc_FUNC);
 	return rc;
 }
@@ -204,7 +196,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CoTaskMemAlloc)
 
 #ifndef NO_CoTaskMemFree
 JNIEXPORT void JNICALL COM_NATIVE(CoTaskMemFree)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, CoTaskMemFree_FUNC);
 	CoTaskMemFree((LPVOID)arg0);
@@ -214,33 +206,25 @@ JNIEXPORT void JNICALL COM_NATIVE(CoTaskMemFree)
 
 #ifndef NO_CreateStdAccessibleObject
 JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3)
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CreateStdAccessibleObject_FUNC);
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateStdAccessibleObject_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateStdAccessibleObject");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateStdAccessibleObject)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, jint, GUID *, LPVOID *))fp)((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	COM_NATIVE_EXIT(env, that, CreateStdAccessibleObject_FUNC);
 	return rc;
@@ -273,7 +257,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(DVTARGETDEVICE_1sizeof)
 
 #ifndef NO_DoDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(DoDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
@@ -417,28 +401,20 @@ JNIEXPORT jint JNICALL COM_NATIVE(LICINFO_1sizeof)
 #endif
 
 #ifndef NO_LresultFromObject
-JNIEXPORT jint JNICALL COM_NATIVE(LresultFromObject)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL COM_NATIVE(LresultFromObject)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, LresultFromObject_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2);
+	rc = (jintLong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(LresultFromObject_LIB);
-			if (hm) fp = GetProcAddress(hm, "LresultFromObject");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, LresultFromObject)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, (LPUNKNOWN)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GUID *, jintLong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2);
 		}
 	}
 fail:
@@ -448,208 +424,373 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	FORMATETC _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getFORMATETCFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GUID _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	OLEINPLACEFRAMEINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getOLEINPLACEFRAMEINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	STATSTG _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSTATSTGFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	STGMEDIUM _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSTGMEDIUMFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DISPPARAMS _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDISPPARAMSFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	FORMATETC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setFORMATETCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	FUNCDESC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setFUNCDESCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	GUID _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	STATSTG _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSTATSTGFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	STGMEDIUM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSTGMEDIUMFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	TYPEATTR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setTYPEATTRFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	VARDESC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setVARDESCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	VARIANT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setVARIANTFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	RECT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC);
+#endif
 }
 #endif
 
@@ -679,21 +820,21 @@ JNIEXPORT jint JNICALL COM_NATIVE(OLEINPLACEFRAMEINFO_1sizeof)
 
 #ifndef NO_OleCreate
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreate)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5, jintLongArray arg6)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg1, *lparg1=NULL;
 	FORMATETC _arg3, *lparg3=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreate_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreate(lparg0, lparg1, arg2, lparg3, (IOleClientSite *)arg4, (IStorage *)arg5, (void **)lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
@@ -704,23 +845,23 @@ fail:
 
 #ifndef NO_OleCreateFromFile
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreateFromFile)
-	(JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jintLong arg5, jintLong arg6, jintLongArray arg7)
 {
 	GUID _arg0, *lparg0=NULL;
 	jchar *lparg1=NULL;
 	GUID _arg2, *lparg2=NULL;
 	FORMATETC _arg4, *lparg4=NULL;
-	jint *lparg7=NULL;
+	jintLong *lparg7=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreateFromFile_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getFORMATETCFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreateFromFile(lparg0, (LPCOLESTR)lparg1, lparg2, arg3, lparg4, (LPOLECLIENTSITE)arg5, (LPSTORAGE)arg6, (LPVOID *)lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
 	if (arg4 && lparg4) setFORMATETCFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
@@ -732,17 +873,17 @@ fail:
 
 #ifndef NO_OleCreatePropertyFrame
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreatePropertyFrame)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jintArray arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jintLongArray arg5, jint arg6, jintLong arg7, jint arg8, jint arg9, jintLong arg10)
 {
 	jchar *lparg3=NULL;
-	jint *lparg5=NULL;
+	jintLong *lparg5=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreatePropertyFrame_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreatePropertyFrame((HWND)arg0, arg1, arg2, (LPCOLESTR)lparg3, arg4, (LPUNKNOWN FAR*)lparg5, arg6, (LPCLSID)arg7, (LCID)arg8, arg9, (LPVOID)arg10);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	COM_NATIVE_EXIT(env, that, OleCreatePropertyFrame_FUNC);
 	return rc;
@@ -751,7 +892,7 @@ fail:
 
 #ifndef NO_OleDraw
 JNIEXPORT jint JNICALL COM_NATIVE(OleDraw)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleDraw_FUNC);
@@ -775,15 +916,15 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleFlushClipboard)
 
 #ifndef NO_OleGetClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleGetClipboard)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jintLongArray arg0)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleGetClipboard_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jint)OleGetClipboard((IDataObject **)lparg0);
 fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, OleGetClipboard_FUNC);
 	return rc;
 }
@@ -791,7 +932,7 @@ fail:
 
 #ifndef NO_OleIsCurrentClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleIsCurrentClipboard_FUNC);
@@ -803,7 +944,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard)
 
 #ifndef NO_OleIsRunning
 JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	COM_NATIVE_ENTER(env, that, OleIsRunning_FUNC);
@@ -815,17 +956,17 @@ JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning)
 
 #ifndef NO_OleLoad
 JNIEXPORT jint JNICALL COM_NATIVE(OleLoad)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLongArray arg3)
 {
 	GUID _arg1, *lparg1=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleLoad_FUNC);
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)OleLoad((IStorage *)arg0, lparg1, (IOleClientSite *)arg2, (LPVOID *)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1);
 	COM_NATIVE_EXIT(env, that, OleLoad_FUNC);
 	return rc;
@@ -834,7 +975,7 @@ fail:
 
 #ifndef NO_OleRun
 JNIEXPORT jint JNICALL COM_NATIVE(OleRun)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleRun_FUNC);
@@ -846,7 +987,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleRun)
 
 #ifndef NO_OleSave
 JNIEXPORT jint JNICALL COM_NATIVE(OleSave)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSave_FUNC);
@@ -858,7 +999,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSave)
 
 #ifndef NO_OleSetClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetClipboard_FUNC);
@@ -870,7 +1011,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard)
 
 #ifndef NO_OleSetContainedObject
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetContainedObject_FUNC);
@@ -882,7 +1023,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject)
 
 #ifndef NO_OleSetMenuDescriptor
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetMenuDescriptor_FUNC);
@@ -894,7 +1035,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor)
 
 #ifndef NO_OleTranslateColor
 JNIEXPORT jint JNICALL COM_NATIVE(OleTranslateColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -910,17 +1051,17 @@ fail:
 
 #ifndef NO_ProgIDFromCLSID
 JNIEXPORT jint JNICALL COM_NATIVE(ProgIDFromCLSID)
-	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, ProgIDFromCLSID_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)ProgIDFromCLSID(lparg0, (LPOLESTR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, ProgIDFromCLSID_FUNC);
 	return rc;
@@ -929,7 +1070,7 @@ fail:
 
 #ifndef NO_RegisterDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, RegisterDragDrop_FUNC);
@@ -941,7 +1082,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop)
 
 #ifndef NO_ReleaseStgMedium
 JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, ReleaseStgMedium_FUNC);
 	ReleaseStgMedium((STGMEDIUM *)arg0);
@@ -951,7 +1092,7 @@ JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium)
 
 #ifndef NO_RevokeDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, RevokeDragDrop_FUNC);
@@ -963,7 +1104,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop)
 
 #ifndef NO_SHDoDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(SHDoDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -1003,17 +1144,17 @@ JNIEXPORT jint JNICALL COM_NATIVE(STGMEDIUM_1sizeof)
 
 #ifndef NO_StgCreateDocfile
 JNIEXPORT jint JNICALL COM_NATIVE(StgCreateDocfile)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintLongArray arg3)
 {
 	jchar *lparg0=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StgCreateDocfile_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)StgCreateDocfile(lparg0, arg1, arg2, (IStorage **)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, StgCreateDocfile_FUNC);
 	return rc;
@@ -1038,17 +1179,17 @@ fail:
 
 #ifndef NO_StgOpenStorage
 JNIEXPORT jint JNICALL COM_NATIVE(StgOpenStorage)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5)
 {
 	jchar *lparg0=NULL;
-	jint *lparg5=NULL;
+	jintLong *lparg5=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StgOpenStorage_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)StgOpenStorage((const WCHAR *)lparg0, (IStorage *)arg1, arg2, (SNB)arg3, arg4, (IStorage **)lparg5);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, StgOpenStorage_FUNC);
 	return rc;
@@ -1057,17 +1198,17 @@ fail:
 
 #ifndef NO_StringFromCLSID
 JNIEXPORT jint JNICALL COM_NATIVE(StringFromCLSID)
-	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StringFromCLSID_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)StringFromCLSID(lparg0, (LPOLESTR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, StringFromCLSID_FUNC);
 	return rc;
@@ -1075,14 +1216,14 @@ fail:
 #endif
 
 #ifndef NO_SysAllocString
-JNIEXPORT jint JNICALL COM_NATIVE(SysAllocString)
+JNIEXPORT jintLong JNICALL COM_NATIVE(SysAllocString)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, SysAllocString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)SysAllocString((OLECHAR *)lparg0);
+	rc = (jintLong)SysAllocString((OLECHAR *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, SysAllocString_FUNC);
@@ -1092,7 +1233,7 @@ fail:
 
 #ifndef NO_SysFreeString
 JNIEXPORT void JNICALL COM_NATIVE(SysFreeString)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, SysFreeString_FUNC);
 	SysFreeString((BSTR)arg0);
@@ -1102,7 +1243,7 @@ JNIEXPORT void JNICALL COM_NATIVE(SysFreeString)
 
 #ifndef NO_SysStringByteLen
 JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, SysStringByteLen_FUNC);
@@ -1162,7 +1303,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VARIANT_1sizeof)
 
 #ifndef NO_VariantChangeType
 JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jshort arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshort arg2, jshort arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VariantChangeType_FUNC);
@@ -1174,7 +1315,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType)
 
 #ifndef NO_VariantClear
 JNIEXPORT jint JNICALL COM_NATIVE(VariantClear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VariantClear_FUNC);
@@ -1186,7 +1327,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantClear)
 
 #ifndef NO_VariantInit
 JNIEXPORT void JNICALL COM_NATIVE(VariantInit)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, VariantInit_FUNC);
 	VariantInit((VARIANTARG FAR* )arg0);
@@ -1194,896 +1335,1479 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit)
 }
 #endif
 
-#ifndef NO_VtblCall__IIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_VtblCall__IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#if (!defined(NO_VtblCall__IIIIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#else
+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, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#endif
 {
 	DVTARGETDEVICE _arg4, *lparg4=NULL;
 	SIZE _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getDVTARGETDEVICEFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getSIZEFields(env, arg5, &_arg5)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) setSIZEFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setDVTARGETDEVICEFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLongArray arg6)
+#endif
 {
 	GUID _arg4, *lparg4=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC);
+#endif
 	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 *)(jint, jint, jint, GUID *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6);
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, GUID *, jintLong, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg4 && lparg4) setGUIDFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jint arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jint arg5)
+#endif
 {
 	POINT _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getPOINTFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
 fail:
 	if (arg4 && lparg4) setPOINTFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#endif
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIJ_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIJ_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIJ_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIJ_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	FORMATETC _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC);
+#endif
 	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 *)(jint, jint, FORMATETC *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, FORMATETC *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, GUID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, GUID *, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_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__IIILorg_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, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && !defined(JNI64)) || (!defined(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) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_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, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jintLong arg7, jobject arg8, jintArray arg9)
+#else
+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, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jintLong arg7, jobject arg8, jintArray arg9)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	DISPPARAMS _arg6, *lparg6=NULL;
 	EXCEPINFO _arg8, *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, 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);
+#endif
 	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 *)(jint, jint, GUID *, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jint, jint, DISPPARAMS *, jintLong, EXCEPINFO *, jint *))(*(jintLong **)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);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, 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);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	STATSTG _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC);
+#endif
 	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 *)(jint, jint, STATSTG *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, STATSTG *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jint arg5, jintLong arg6, jobject arg7)
+#else
+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, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jint arg5, jintLong arg6, jobject arg7)
+#endif
 {
 	MSG _arg3, *lparg3=NULL;
 	RECT _arg7, *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	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 *)(jint, jint, MSG *, jint, jint, jint, RECT *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, MSG *, jintLong, jint, jintLong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) setRECTFields(env, arg7, lparg7);
 	if (arg3 && lparg3) setMSGFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	POINT _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, POINT *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
 {
 	SIZE _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, SIZE *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+#if (!defined(NO_VtblCall__IIIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJZ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3II_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3II_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__III_3II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3JI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jint arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3JI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jint arg4, jintArray arg5)
+#endif
 {
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3II_3I_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3JI_3I_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3II_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3JI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I_3I_3I_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J_3J_3I_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintLongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3J_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintLongArray arg6)
+#endif
 {
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
 	jint *lparg5=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_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;
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3J_3I_3J_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(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 *)(jint, jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jintLong *, jint *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(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);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3J_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__III_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
+#endif
 {
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIJI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIJI_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJI_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIJI_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	CAUUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getCAUUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, CAUUID *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CAUUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setCAUUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	CONTROLINFO _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getCONTROLINFOFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, CONTROLINFO *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CONTROLINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setCONTROLINFOFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	STGMEDIUM _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *, STGMEDIUM *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jboolean arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	STGMEDIUM _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *, STGMEDIUM *, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, jint, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC);
+#endif
 	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 *)(jint, GUID *, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jintLong, jint, jint, jint *))(*(jintLong **)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);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	OLECMD _arg4, *lparg4=NULL;
 	OLECMDTEXT _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getOLECMDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getOLECMDTEXTFields(env, arg5, &_arg5)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) setOLECMDTEXTFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setOLECMDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintLongArray arg4)
+#else
+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, jintLong arg1, jobject arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	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 *)(jint, GUID *, GUID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, GUID *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLongArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLongArray arg3)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	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 *)(jint, GUID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	LICINFO _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getLICINFOFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, LICINFO *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, LICINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLICINFOFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	MSG _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getMSGFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, MSG *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, MSG *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setMSGFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	POINT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jboolean arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	RECT _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *, RECT *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#endif
 {
 	SHDRAGIMAGE _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getSHDRAGIMAGEFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, SHDRAGIMAGE *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, SHDRAGIMAGE *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+#if (!defined(NO_VtblCall__IIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJZ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
+#if (!defined(NO_VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CI
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+#if (!defined(NO_VtblCall__II_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CI_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CI_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__II_3CIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJIII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLongArray arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLongArray arg7)
+#endif
 {
 	jchar *lparg2=NULL;
-	jint *lparg7=NULL;
+	jintLong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJIII_3J_FUNC);
+#endif
 	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 *)(jint, jchar *, jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7);
+	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jintLong, jint, jint, jint, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJIII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__II_3CIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3I_FUNC);
+#endif
 	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 *)(jint, jchar *, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#if (!defined(NO_VtblCall__II_3CIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jlong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CJII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#if (!defined(NO_VtblCall__II_3CJII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jlong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CJII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CJII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C_3C
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
+#if (!defined(NO_VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -2100,21 +2824,32 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIJ)
 }
 #endif
 
-#ifndef NO_VtblCall__IJJIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IJJIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIIJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jintLong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_WriteClassStg
 JNIEXPORT jint JNICALL COM_NATIVE(WriteClassStg)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GUID _arg1, *lparg1=NULL;
 	jint rc = 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
index fdb39114af..9baabd7acb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
@@ -16,236 +16,236 @@
 #define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func
 
 #ifndef NO_get_1accChild_1CALLBACK
-static SWT_PTR get_accChild_CALLBACK;
+static jintLong get_accChild_CALLBACK;
 static HRESULT CALLBACK get_accChild(void* ppVTable, VARIANT varChildID, IDispatch** ppdispChild)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, IDispatch**))get_accChild_CALLBACK)(ppVTable, &varChildID, ppdispChild);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accChild_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accChild_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accChild_CALLBACK = func;
-	return (SWT_PTR)get_accChild;
+	return (jintLong)get_accChild;
 }
 #endif
 
 #ifndef NO_get_1accName_1CALLBACK
-static SWT_PTR get_accName_CALLBACK;
+static jintLong get_accName_CALLBACK;
 static HRESULT CALLBACK get_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accName_CALLBACK)(ppVTable, &varID, pszName);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accName_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accName_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accName_CALLBACK = func;
-	return (SWT_PTR)get_accName;
+	return (jintLong)get_accName;
 }
 #endif
 
 #ifndef NO_get_1accValue_1CALLBACK
-static SWT_PTR get_accValue_CALLBACK;
+static jintLong get_accValue_CALLBACK;
 static HRESULT CALLBACK get_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accValue_CALLBACK)(ppVTable, &varID, pszValue);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accValue_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accValue_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accValue_CALLBACK = func;
-	return (SWT_PTR)get_accValue;
+	return (jintLong)get_accValue;
 }
 #endif
 
 #ifndef NO_get_1accDescription_1CALLBACK
-static SWT_PTR get_accDescription_CALLBACK;
+static jintLong get_accDescription_CALLBACK;
 static HRESULT CALLBACK get_accDescription( void* ppVTable, VARIANT varID, BSTR* pszDescription)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDescription_CALLBACK)(ppVTable, &varID, pszDescription);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accDescription_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDescription_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accDescription_CALLBACK = func;
-	return (SWT_PTR)get_accDescription;
+	return (jintLong)get_accDescription;
 }
 #endif
 
 #ifndef NO_get_1accRole_1CALLBACK
-static SWT_PTR get_accRole_CALLBACK;
+static jintLong get_accRole_CALLBACK;
 static HRESULT CALLBACK get_accRole(void* ppVTable, VARIANT varID, VARIANT* pvarRole)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accRole_CALLBACK)(ppVTable, &varID, pvarRole);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accRole_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accRole_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accRole_CALLBACK = func;
-	return (SWT_PTR)get_accRole;
+	return (jintLong)get_accRole;
 }
 #endif
 
 #ifndef NO_get_1accState_1CALLBACK
-static SWT_PTR get_accState_CALLBACK;
+static jintLong get_accState_CALLBACK;
 static HRESULT CALLBACK get_accState(void* ppVTable, VARIANT varID, VARIANT* pvarState)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accState_CALLBACK)(ppVTable, &varID, pvarState);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accState_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accState_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accState_CALLBACK = func;
-	return (SWT_PTR)get_accState;
+	return (jintLong)get_accState;
 }
 #endif
 
 #ifndef NO_get_1accHelp_1CALLBACK
-static SWT_PTR get_accHelp_CALLBACK;
+static jintLong get_accHelp_CALLBACK;
 static HRESULT CALLBACK get_accHelp(void* ppVTable, VARIANT varID, BSTR* pszHelp)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accHelp_CALLBACK)(ppVTable, &varID, pszHelp);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accHelp_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelp_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accHelp_CALLBACK = func;
-	return (SWT_PTR)get_accHelp;
+	return (jintLong)get_accHelp;
 }
 #endif
 
 #ifndef NO_get_1accHelpTopic_1CALLBACK
-static SWT_PTR get_accHelpTopic_CALLBACK;
+static jintLong get_accHelpTopic_CALLBACK;
 static HRESULT CALLBACK get_accHelpTopic(void* ppVTable, BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {
 	return ((HRESULT (CALLBACK *)(void*, BSTR*, VARIANT*, long*))get_accHelpTopic_CALLBACK)(ppVTable, pszHelpFile, &varChild, pidTopic);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accHelpTopic_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelpTopic_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accHelpTopic_CALLBACK = func;
-	return (SWT_PTR)get_accHelpTopic;
+	return (jintLong)get_accHelpTopic;
 }
 #endif
 
 #ifndef NO_get_1accKeyboardShortcut_1CALLBACK
-static SWT_PTR get_accKeyboardShortcut_CALLBACK;
+static jintLong get_accKeyboardShortcut_CALLBACK;
 static HRESULT CALLBACK get_accKeyboardShortcut(void* ppVTable, VARIANT varID, BSTR* pszKeyboardShortcut)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accKeyboardShortcut_CALLBACK)(ppVTable, &varID, pszKeyboardShortcut);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accKeyboardShortcut_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accKeyboardShortcut_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accKeyboardShortcut_CALLBACK = func;
-	return (SWT_PTR)get_accKeyboardShortcut;
+	return (jintLong)get_accKeyboardShortcut;
 }
 #endif
 
 #ifndef NO_get_1accDefaultAction_1CALLBACK
-static SWT_PTR get_accDefaultAction_CALLBACK;
+static jintLong get_accDefaultAction_CALLBACK;
 static HRESULT CALLBACK get_accDefaultAction(void* ppVTable, VARIANT varID, BSTR* pszDefaultAction)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDefaultAction_CALLBACK)(ppVTable, &varID, pszDefaultAction);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accDefaultAction_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDefaultAction_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accDefaultAction_CALLBACK = func;
-	return (SWT_PTR)get_accDefaultAction;
+	return (jintLong)get_accDefaultAction;
 }
 #endif
 
 #ifndef NO_accSelect_1CALLBACK
-static SWT_PTR accSelect_CALLBACK;
+static jintLong accSelect_CALLBACK;
 static HRESULT CALLBACK accSelect(void* ppVTable, long flagsSelect, VARIANT varID)
 {
 	return ((HRESULT (CALLBACK *)(void*, long, VARIANT*))accSelect_CALLBACK)(ppVTable, flagsSelect, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accSelect_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accSelect_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accSelect_CALLBACK = func;
-	return (SWT_PTR)accSelect;
+	return (jintLong)accSelect;
 }
 #endif
 
 #ifndef NO_accLocation_1CALLBACK
-static SWT_PTR accLocation_CALLBACK;
+static jintLong accLocation_CALLBACK;
 static HRESULT CALLBACK accLocation(void* ppVTable, long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID) 
 {
 	return ((HRESULT (CALLBACK *)(void*, long*, long*, long*, long*, VARIANT*))accLocation_CALLBACK)(ppVTable, pxLeft, pyTop, pcxWidth, pcyHeight, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accLocation_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accLocation_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accLocation_CALLBACK = func;
-	return (SWT_PTR)accLocation;
+	return (jintLong)accLocation;
 }
 #endif
 
 #ifndef NO_accNavigate_1CALLBACK
-static SWT_PTR accNavigate_CALLBACK;
+static jintLong accNavigate_CALLBACK;
 static HRESULT CALLBACK accNavigate(void* ppVTable, long navDir, VARIANT varStart, VARIANT* pvarEnd)
 {
 	return ((HRESULT (CALLBACK *)(void*, long, VARIANT*, VARIANT*))accNavigate_CALLBACK)(ppVTable, navDir, &varStart, pvarEnd);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accNavigate_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accNavigate_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accNavigate_CALLBACK = func;
-	return (SWT_PTR)accNavigate;
+	return (jintLong)accNavigate;
 }
 #endif
 
 #ifndef NO_accDoDefaultAction_1CALLBACK
-static SWT_PTR accDoDefaultAction_CALLBACK;
+static jintLong accDoDefaultAction_CALLBACK;
 static HRESULT CALLBACK accDoDefaultAction(void* ppVTable, VARIANT varID)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*))accDoDefaultAction_CALLBACK)(ppVTable, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accDoDefaultAction_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accDoDefaultAction_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accDoDefaultAction_CALLBACK = func;
-	return (SWT_PTR)accDoDefaultAction;
+	return (jintLong)accDoDefaultAction;
 }
 #endif
 
 #ifndef NO_put_1accName_1CALLBACK
-static SWT_PTR put_accName_CALLBACK;
+static jintLong put_accName_CALLBACK;
 static HRESULT CALLBACK put_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accName_CALLBACK)(ppVTable, &varID, pszName);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(put_1accName_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accName_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	put_accName_CALLBACK = func;
-	return (SWT_PTR)put_accName;
+	return (jintLong)put_accName;
 }
 #endif
 
 #ifndef NO_put_1accValue_1CALLBACK
-static SWT_PTR put_accValue_CALLBACK;
+static jintLong put_accValue_CALLBACK;
 static HRESULT CALLBACK put_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accValue_CALLBACK)(ppVTable, &varID, pszValue);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(put_1accValue_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accValue_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	put_accValue_CALLBACK = func;
-	return (SWT_PTR)put_accValue;
+	return (jintLong)put_accValue;
 }
 #endif
 
 #ifndef NO_VtblCall_1PPPPVARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PPPPVARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3, SWT_PTR arg4, SWT_PTR arg5, SWT_PTR arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1PPPPVARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, SWT_PTR, SWT_PTR, SWT_PTR, SWT_PTR, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, *(VARIANT *)arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, *(VARIANT *)arg6);
 	COM_NATIVE_EXIT(env, that, VtblCall_1PPPPVARIANT_FUNC);
 	return rc;
 }
@@ -253,11 +253,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PPPPVARIANT)
 
 #ifndef NO_VtblCall_1IVARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, jint, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3);
 	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANT_FUNC);
 	return rc;
 }
@@ -265,11 +265,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANT)
 
 #ifndef NO_VtblCall_1PVARIANTP
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PVARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3, SWT_PTR arg4)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1PVARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, SWT_PTR, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
 	COM_NATIVE_EXIT(env, that, VtblCall_1PVARIANTP_FUNC);
 	return rc;
 }
@@ -277,11 +277,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PVARIANTP)
 
 #ifndef NO_VtblCall_1IVARIANTP
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3, SWT_PTR arg4)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, jint, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
 	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANTP_FUNC);
 	return rc;
 }
@@ -289,11 +289,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANTP)
 
 #ifndef NO_VtblCall_1VARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1VARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, *(VARIANT *)arg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2);
 	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANT_FUNC);
 	return rc;
 }
@@ -301,11 +301,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
 
 #ifndef NO_VtblCall_1VARIANTI
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1VARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, *(VARIANT *)arg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2, arg3);
 	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANTP_FUNC);
 	return rc;
 }
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 3e98a9babf..23766d834c 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
@@ -43,21 +43,81 @@ char * COM_nativeFunctionNames[] = {
 	"IsEqualGUID",
 	"LICINFO_1sizeof",
 	"LresultFromObject",
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI",
+#endif
 	"OLECMD_1sizeof",
 	"OLEINPLACEFRAMEINFO_1sizeof",
 	"OleCreate",
@@ -96,61 +156,277 @@ char * COM_nativeFunctionNames[] = {
 	"VariantChangeType",
 	"VariantClear",
 	"VariantInit",
+#ifndef JNI64
 	"VtblCall__IIII",
+#else
+	"VtblCall__IJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII",
+#else
+	"VtblCall__IJIIJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII",
+#else
+	"VtblCall__IJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIII",
+#else
+	"VtblCall__IJIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIII",
+#else
+	"VtblCall__IJIIIIIJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIIIII",
+#else
+	"VtblCall__IJJJJJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I",
+#else
+	"VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3I",
+#else
+	"VtblCall__IJII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3J",
+#else
+	"VtblCall__IJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIJ_3I",
+#else
+	"VtblCall__IJIJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIZ",
+#else
+	"VtblCall__IJJZ",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I",
+#else
+	"VtblCall__IJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3II_3I",
+#else
+	"VtblCall__IJI_3JI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I_3I_3I_3I",
+#else
+	"VtblCall__IJI_3J_3J_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3J",
+#else
+	"VtblCall__IJI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJI_3I",
+#else
+	"VtblCall__IJJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3I",
+#else
+	"VtblCall__IJJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIZ",
+#else
+	"VtblCall__IJZ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C",
+#else
+	"VtblCall__IJ_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CI",
+#else
+	"VtblCall__IJ_3CJ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIIII_3I",
+#else
+	"VtblCall__IJ_3CJIII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIII_3I",
+#else
+	"VtblCall__IJ_3CIII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIII_3J",
+#else
+	"VtblCall__IJ_3CIII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CJII_3J",
+#else
+	"VtblCall__IJ_3CJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C_3C",
+#else
+	"VtblCall__IJ_3C_3C",
+#endif
 	"VtblCall__IJIIIIJ",
+#ifndef JNI64
 	"VtblCall__IJJIIIII",
+#else
+	"VtblCall__IJJIIIIJ",
+#endif
 	"VtblCall_1IVARIANT",
 	"VtblCall_1IVARIANTP",
 	"VtblCall_1PPPPVARIANT",
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 a6db98fdf8..5aca2992f2 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
@@ -51,21 +51,81 @@ typedef enum {
 	IsEqualGUID_FUNC,
 	LICINFO_1sizeof_FUNC,
 	LresultFromObject_FUNC,
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC,
+#endif
 	OLECMD_1sizeof_FUNC,
 	OLEINPLACEFRAMEINFO_1sizeof_FUNC,
 	OleCreate_FUNC,
@@ -104,61 +164,277 @@ typedef enum {
 	VariantChangeType_FUNC,
 	VariantClear_FUNC,
 	VariantInit_FUNC,
+#ifndef JNI64
 	VtblCall__IIII_FUNC,
+#else
+	VtblCall__IJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_FUNC,
+#else
+	VtblCall__IJIIJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_FUNC,
+#else
+	VtblCall__IJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIII_FUNC,
+#else
+	VtblCall__IJIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIII_FUNC,
+#else
+	VtblCall__IJIIIIIJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIIIII_FUNC,
+#else
+	VtblCall__IJJJJJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC,
+#else
+	VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3I_FUNC,
+#else
+	VtblCall__IJII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3J_FUNC,
+#else
+	VtblCall__IJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIJ_3I_FUNC,
+#else
+	VtblCall__IJIJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC,
+#else
+	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,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIZ_FUNC,
+#else
+	VtblCall__IJJZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_FUNC,
+#else
+	VtblCall__IJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3II_3I_FUNC,
+#else
+	VtblCall__IJI_3JI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3J_3J_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3J_FUNC,
+#else
+	VtblCall__IJI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJI_3I_FUNC,
+#else
+	VtblCall__IJJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3I_FUNC,
+#else
+	VtblCall__IJJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIZ_FUNC,
+#else
+	VtblCall__IJZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_FUNC,
+#else
+	VtblCall__IJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CI_FUNC,
+#else
+	VtblCall__IJ_3CJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIIII_3I_FUNC,
+#else
+	VtblCall__IJ_3CJIII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIII_3I_FUNC,
+#else
+	VtblCall__IJ_3CIII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIII_3J_FUNC,
+#else
+	VtblCall__IJ_3CIII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CJII_3J_FUNC,
+#else
+	VtblCall__IJ_3CJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_3C_FUNC,
+#else
+	VtblCall__IJ_3C_3C_FUNC,
+#endif
 	VtblCall__IJIIIIJ_FUNC,
+#ifndef JNI64
 	VtblCall__IJJIIIII_FUNC,
+#else
+	VtblCall__IJJIIIIJ_FUNC,
+#endif
 	VtblCall_1IVARIANT_FUNC,
 	VtblCall_1IVARIANTP_FUNC,
 	VtblCall_1PPPPVARIANT_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
index 700e21c89c..7f6dab7ff3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
@@ -26,7 +26,7 @@ void cacheCAUUIDFields(JNIEnv *env, jobject lpObject)
 	if (CAUUIDFc.cached) return;
 	CAUUIDFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CAUUIDFc.cElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "cElems", "I");
-	CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", "I");
+	CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", I_J);
 	CAUUIDFc.cached = 1;
 }
 
@@ -34,7 +34,7 @@ CAUUID *getCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct)
 {
 	if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject);
 	lpStruct->cElems = (*env)->GetIntField(env, lpObject, CAUUIDFc.cElems);
-	lpStruct->pElems = (GUID FAR *)(*env)->GetIntField(env, lpObject, CAUUIDFc.pElems);
+	lpStruct->pElems = (GUID FAR *)(*env)->GetIntLongField(env, lpObject, CAUUIDFc.pElems);
 	return lpStruct;
 }
 
@@ -42,7 +42,7 @@ void setCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct)
 {
 	if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CAUUIDFc.cElems, (jint)lpStruct->cElems);
-	(*env)->SetIntField(env, lpObject, CAUUIDFc.pElems, (jint)lpStruct->pElems);
+	(*env)->SetIntLongField(env, lpObject, CAUUIDFc.pElems, (jintLong)lpStruct->pElems);
 }
 #endif
 
@@ -60,7 +60,7 @@ void cacheCONTROLINFOFields(JNIEnv *env, jobject lpObject)
 	if (CONTROLINFOFc.cached) return;
 	CONTROLINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CONTROLINFOFc.cb = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cb", "I");
-	CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", "I");
+	CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", I_J);
 	CONTROLINFOFc.cAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cAccel", "S");
 	CONTROLINFOFc.dwFlags = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "dwFlags", "I");
 	CONTROLINFOFc.cached = 1;
@@ -70,7 +70,7 @@ CONTROLINFO *getCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lp
 {
 	if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.cb);
-	lpStruct->hAccel = (HACCEL)(*env)->GetIntField(env, lpObject, CONTROLINFOFc.hAccel);
+	lpStruct->hAccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, CONTROLINFOFc.hAccel);
 	lpStruct->cAccel = (*env)->GetShortField(env, lpObject, CONTROLINFOFc.cAccel);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.dwFlags);
 	return lpStruct;
@@ -80,7 +80,7 @@ void setCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lpStruct)
 {
 	if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.cb, (jint)lpStruct->cb);
-	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.hAccel, (jint)lpStruct->hAccel);
+	(*env)->SetIntLongField(env, lpObject, CONTROLINFOFc.hAccel, (jintLong)lpStruct->hAccel);
 	(*env)->SetShortField(env, lpObject, CONTROLINFOFc.cAccel, (jshort)lpStruct->cAccel);
 	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.dwFlags, (jint)lpStruct->dwFlags);
 }
@@ -100,8 +100,8 @@ void cacheCOSERVERINFOFields(JNIEnv *env, jobject lpObject)
 	if (COSERVERINFOFc.cached) return;
 	COSERVERINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	COSERVERINFOFc.dwReserved1 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved1", "I");
-	COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", "I");
-	COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", "I");
+	COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", I_J);
+	COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", I_J);
 	COSERVERINFOFc.dwReserved2 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved2", "I");
 	COSERVERINFOFc.cached = 1;
 }
@@ -110,8 +110,8 @@ COSERVERINFO *getCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO
 {
 	if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject);
 	lpStruct->dwReserved1 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved1);
-	lpStruct->pwszName = (LPWSTR)(*env)->GetIntField(env, lpObject, COSERVERINFOFc.pwszName);
-	lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetIntField(env, lpObject, COSERVERINFOFc.pAuthInfo);
+	lpStruct->pwszName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pwszName);
+	lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo);
 	lpStruct->dwReserved2 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved2);
 	return lpStruct;
 }
@@ -120,8 +120,8 @@ void setCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct
 {
 	if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved1, (jint)lpStruct->dwReserved1);
-	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.pwszName, (jint)lpStruct->pwszName);
-	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jint)lpStruct->pAuthInfo);
+	(*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pwszName, (jintLong)lpStruct->pwszName);
+	(*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jintLong)lpStruct->pAuthInfo);
 	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved2, (jint)lpStruct->dwReserved2);
 }
 #endif
@@ -139,8 +139,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject)
 {
 	if (DISPPARAMSFc.cached) return;
 	DISPPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", "I");
-	DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", "I");
+	DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", I_J);
+	DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", I_J);
 	DISPPARAMSFc.cArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cArgs", "I");
 	DISPPARAMSFc.cNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cNamedArgs", "I");
 	DISPPARAMSFc.cached = 1;
@@ -149,8 +149,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject)
 DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct)
 {
 	if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject);
-	lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetIntField(env, lpObject, DISPPARAMSFc.rgvarg);
-	lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetIntField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs);
+	lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg);
+	lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs);
 	lpStruct->cArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cArgs);
 	lpStruct->cNamedArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs);
 	return lpStruct;
@@ -159,8 +159,8 @@ DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStr
 void setDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct)
 {
 	if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.rgvarg, (jint)lpStruct->rgvarg);
-	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jint)lpStruct->rgdispidNamedArgs);
+	(*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg, (jintLong)lpStruct->rgvarg);
+	(*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jintLong)lpStruct->rgdispidNamedArgs);
 	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.cArgs, (jint)lpStruct->cArgs);
 	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs, (jint)lpStruct->cNamedArgs);
 }
@@ -233,12 +233,12 @@ void cacheEXCEPINFOFields(JNIEnv *env, jobject lpObject)
 	EXCEPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	EXCEPINFOFc.wCode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wCode", "S");
 	EXCEPINFOFc.wReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wReserved", "S");
-	EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", "I");
-	EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", "I");
-	EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", "I");
+	EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", I_J);
+	EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", I_J);
+	EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", I_J);
 	EXCEPINFOFc.dwHelpContext = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "dwHelpContext", "I");
-	EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", "I");
-	EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", "I");
+	EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", I_J);
+	EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", I_J);
 	EXCEPINFOFc.scode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "scode", "I");
 	EXCEPINFOFc.cached = 1;
 }
@@ -248,12 +248,12 @@ EXCEPINFO *getEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct
 	if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject);
 	lpStruct->wCode = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wCode);
 	lpStruct->wReserved = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wReserved);
-	lpStruct->bstrSource = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrSource);
-	lpStruct->bstrDescription = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrDescription);
-	lpStruct->bstrHelpFile = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrHelpFile);
+	lpStruct->bstrSource = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource);
+	lpStruct->bstrDescription = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription);
+	lpStruct->bstrHelpFile = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile);
 	lpStruct->dwHelpContext = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext);
-	lpStruct->pvReserved = (void FAR *)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.pvReserved);
-	lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetIntField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn);
+	lpStruct->pvReserved = (void FAR *)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved);
+	lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn);
 	lpStruct->scode = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.scode);
 	return lpStruct;
 }
@@ -263,12 +263,12 @@ void setEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct)
 	if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject);
 	(*env)->SetShortField(env, lpObject, EXCEPINFOFc.wCode, (jshort)lpStruct->wCode);
 	(*env)->SetShortField(env, lpObject, EXCEPINFOFc.wReserved, (jshort)lpStruct->wReserved);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrSource, (jint)lpStruct->bstrSource);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrDescription, (jint)lpStruct->bstrDescription);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jint)lpStruct->bstrHelpFile);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource, (jintLong)lpStruct->bstrSource);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription, (jintLong)lpStruct->bstrDescription);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jintLong)lpStruct->bstrHelpFile);
 	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext, (jint)lpStruct->dwHelpContext);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.pvReserved, (jint)lpStruct->pvReserved);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jint)lpStruct->pfnDeferredFillIn);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved, (jintLong)lpStruct->pvReserved);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jintLong)lpStruct->pfnDeferredFillIn);
 	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.scode, (jint)lpStruct->scode);
 }
 #endif
@@ -287,7 +287,7 @@ void cacheFORMATETCFields(JNIEnv *env, jobject lpObject)
 	if (FORMATETCFc.cached) return;
 	FORMATETCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	FORMATETCFc.cfFormat = (*env)->GetFieldID(env, FORMATETCFc.clazz, "cfFormat", "I");
-	FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", "I");
+	FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", I_J);
 	FORMATETCFc.dwAspect = (*env)->GetFieldID(env, FORMATETCFc.clazz, "dwAspect", "I");
 	FORMATETCFc.lindex = (*env)->GetFieldID(env, FORMATETCFc.clazz, "lindex", "I");
 	FORMATETCFc.tymed = (*env)->GetFieldID(env, FORMATETCFc.clazz, "tymed", "I");
@@ -298,7 +298,7 @@ FORMATETC *getFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct
 {
 	if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject);
 	lpStruct->cfFormat = (CLIPFORMAT)(*env)->GetIntField(env, lpObject, FORMATETCFc.cfFormat);
-	lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetIntField(env, lpObject, FORMATETCFc.ptd);
+	lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetIntLongField(env, lpObject, FORMATETCFc.ptd);
 	lpStruct->dwAspect = (*env)->GetIntField(env, lpObject, FORMATETCFc.dwAspect);
 	lpStruct->lindex = (*env)->GetIntField(env, lpObject, FORMATETCFc.lindex);
 	lpStruct->tymed = (*env)->GetIntField(env, lpObject, FORMATETCFc.tymed);
@@ -309,7 +309,7 @@ void setFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct)
 {
 	if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.cfFormat, (jint)lpStruct->cfFormat);
-	(*env)->SetIntField(env, lpObject, FORMATETCFc.ptd, (jint)lpStruct->ptd);
+	(*env)->SetIntLongField(env, lpObject, FORMATETCFc.ptd, (jintLong)lpStruct->ptd);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.dwAspect, (jint)lpStruct->dwAspect);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.lindex, (jint)lpStruct->lindex);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.tymed, (jint)lpStruct->tymed);
@@ -330,8 +330,8 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject)
 	if (FUNCDESCFc.cached) return;
 	FUNCDESCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	FUNCDESCFc.memid = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "memid", "I");
-	FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", "I");
-	FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", "I");
+	FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", I_J);
+	FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", I_J);
 	FUNCDESCFc.funckind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "funckind", "I");
 	FUNCDESCFc.invkind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "invkind", "I");
 	FUNCDESCFc.callconv = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "callconv", "I");
@@ -339,9 +339,9 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject)
 	FUNCDESCFc.cParamsOpt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cParamsOpt", "S");
 	FUNCDESCFc.oVft = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "oVft", "S");
 	FUNCDESCFc.cScodes = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cScodes", "S");
-	FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", "I");
+	FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", I_J);
 	FUNCDESCFc.elemdescFunc_tdesc_vt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_vt", "S");
-	FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", "I");
+	FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", I_J);
 	FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_wParamFlags", "S");
 	FUNCDESCFc.wFuncFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "wFuncFlags", "S");
 	FUNCDESCFc.cached = 1;
@@ -351,8 +351,8 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 {
 	if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject);
 	lpStruct->memid = (MEMBERID)(*env)->GetIntField(env, lpObject, FUNCDESCFc.memid);
-	lpStruct->lprgscode = (SCODE FAR *)(*env)->GetIntField(env, lpObject, FUNCDESCFc.lprgscode);
-	lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetIntField(env, lpObject, FUNCDESCFc.lprgelemdescParam);
+	lpStruct->lprgscode = (SCODE FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgscode);
+	lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam);
 	lpStruct->funckind = (FUNCKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.funckind);
 	lpStruct->invkind = (INVOKEKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.invkind);
 	lpStruct->callconv = (CALLCONV)(*env)->GetIntField(env, lpObject, FUNCDESCFc.callconv);
@@ -360,9 +360,9 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 	lpStruct->cParamsOpt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cParamsOpt);
 	lpStruct->oVft = (*env)->GetShortField(env, lpObject, FUNCDESCFc.oVft);
 	lpStruct->cScodes = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cScodes);
-	lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union);
+	lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union);
 	lpStruct->elemdescFunc.tdesc.vt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt);
-	lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex);
+	lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex);
 	lpStruct->elemdescFunc.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags);
 	lpStruct->wFuncFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.wFuncFlags);
 	return lpStruct;
@@ -372,8 +372,8 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 {
 	if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.memid, (jint)lpStruct->memid);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.lprgscode, (jint)lpStruct->lprgscode);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jint)lpStruct->lprgelemdescParam);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgscode, (jintLong)lpStruct->lprgscode);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jintLong)lpStruct->lprgelemdescParam);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.funckind, (jint)lpStruct->funckind);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.invkind, (jint)lpStruct->invkind);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.callconv, (jint)lpStruct->callconv);
@@ -381,9 +381,9 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.cParamsOpt, (jshort)lpStruct->cParamsOpt);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.oVft, (jshort)lpStruct->oVft);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.cScodes, (jshort)lpStruct->cScodes);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jint)lpStruct->elemdescFunc.tdesc.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jintLong)lpStruct->elemdescFunc.tdesc.lptdesc);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt, (jshort)lpStruct->elemdescFunc.tdesc.vt);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jint)lpStruct->elemdescFunc.paramdesc.pparamdescex);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescFunc.paramdesc.pparamdescex);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags, (jshort)lpStruct->elemdescFunc.paramdesc.wParamFlags);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.wFuncFlags, (jshort)lpStruct->wFuncFlags);
 }
@@ -534,7 +534,7 @@ OLECMDTEXT *getOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStr
 	lpStruct->cwBuf = (*env)->GetIntField(env, lpObject, OLECMDTEXTFc.cwBuf);
 	{
 	jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz);
-	(*env)->GetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / 2, (jshort *)lpStruct->rgwz);
+	(*env)->GetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz);
 	}
 	return lpStruct;
 }
@@ -547,7 +547,7 @@ void setOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct)
 	(*env)->SetIntField(env, lpObject, OLECMDTEXTFc.cwBuf, (jint)lpStruct->cwBuf);
 	{
 	jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz);
-	(*env)->SetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / 2, (jshort *)lpStruct->rgwz);
+	(*env)->SetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz);
 	}
 }
 #endif
@@ -567,8 +567,8 @@ void cacheOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject)
 	OLEINPLACEFRAMEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	OLEINPLACEFRAMEINFOFc.cb = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cb", "I");
 	OLEINPLACEFRAMEINFOFc.fMDIApp = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "fMDIApp", "I");
-	OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", "I");
-	OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", "I");
+	OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", I_J);
+	OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", I_J);
 	OLEINPLACEFRAMEINFOFc.cAccelEntries = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cAccelEntries", "I");
 	OLEINPLACEFRAMEINFOFc.cached = 1;
 }
@@ -578,8 +578,8 @@ OLEINPLACEFRAMEINFO *getOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject,
 	if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb);
 	lpStruct->fMDIApp = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp);
-	lpStruct->hwndFrame = (HWND)(*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame);
-	lpStruct->haccel = (HACCEL)(*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel);
+	lpStruct->hwndFrame = (HWND)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame);
+	lpStruct->haccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel);
 	lpStruct->cAccelEntries = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries);
 	return lpStruct;
 }
@@ -589,8 +589,8 @@ void setOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAME
 	if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb, (jint)lpStruct->cb);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp, (jint)lpStruct->fMDIApp);
-	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jint)lpStruct->hwndFrame);
-	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jint)lpStruct->haccel);
+	(*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jintLong)lpStruct->hwndFrame);
+	(*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jintLong)lpStruct->haccel);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries, (jint)lpStruct->cAccelEntries);
 }
 #endif
@@ -608,7 +608,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject)
 {
 	if (STATSTGFc.cached) return;
 	STATSTGFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", "I");
+	STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", I_J);
 	STATSTGFc.type = (*env)->GetFieldID(env, STATSTGFc.clazz, "type", "I");
 	STATSTGFc.cbSize = (*env)->GetFieldID(env, STATSTGFc.clazz, "cbSize", "J");
 	STATSTGFc.mtime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "mtime_dwLowDateTime", "I");
@@ -631,7 +631,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject)
 STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 {
 	if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject);
-	lpStruct->pwcsName = (LPWSTR)(*env)->GetIntField(env, lpObject, STATSTGFc.pwcsName);
+	lpStruct->pwcsName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STATSTGFc.pwcsName);
 	lpStruct->type = (*env)->GetIntField(env, lpObject, STATSTGFc.type);
 	lpStruct->cbSize.QuadPart = (*env)->GetLongField(env, lpObject, STATSTGFc.cbSize);
 	lpStruct->mtime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime);
@@ -657,7 +657,7 @@ STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 void setSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 {
 	if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, STATSTGFc.pwcsName, (jint)lpStruct->pwcsName);
+	(*env)->SetIntLongField(env, lpObject, STATSTGFc.pwcsName, (jintLong)lpStruct->pwcsName);
 	(*env)->SetIntField(env, lpObject, STATSTGFc.type, (jint)lpStruct->type);
 	(*env)->SetLongField(env, lpObject, STATSTGFc.cbSize, (jlong)lpStruct->cbSize.QuadPart);
 	(*env)->SetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime, (jint)lpStruct->mtime.dwLowDateTime);
@@ -694,8 +694,8 @@ void cacheSTGMEDIUMFields(JNIEnv *env, jobject lpObject)
 	if (STGMEDIUMFc.cached) return;
 	STGMEDIUMFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	STGMEDIUMFc.tymed = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "tymed", "I");
-	STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", "I");
-	STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", "I");
+	STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", I_J);
+	STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", I_J);
 	STGMEDIUMFc.cached = 1;
 }
 
@@ -703,8 +703,8 @@ STGMEDIUM *getSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct
 {
 	if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject);
 	lpStruct->tymed = (*env)->GetIntField(env, lpObject, STGMEDIUMFc.tymed);
-	lpStruct->hGlobal = (HGLOBAL)(*env)->GetIntField(env, lpObject, STGMEDIUMFc.unionField);
-	lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetIntField(env, lpObject, STGMEDIUMFc.pUnkForRelease);
+	lpStruct->hGlobal = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.unionField);
+	lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease);
 	return lpStruct;
 }
 
@@ -712,8 +712,8 @@ void setSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct)
 {
 	if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.tymed, (jint)lpStruct->tymed);
-	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.unionField, (jint)lpStruct->hGlobal);
-	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jint)lpStruct->pUnkForRelease);
+	(*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.unionField, (jintLong)lpStruct->hGlobal);
+	(*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jintLong)lpStruct->pUnkForRelease);
 }
 #endif
 
@@ -738,7 +738,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject)
 	TYPEATTRFc.dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "dwReserved", "I");
 	TYPEATTRFc.memidConstructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidConstructor", "I");
 	TYPEATTRFc.memidDestructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidDestructor", "I");
-	TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", "I");
+	TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", I_J);
 	TYPEATTRFc.cbSizeInstance = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cbSizeInstance", "I");
 	TYPEATTRFc.typekind = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "typekind", "I");
 	TYPEATTRFc.cFuncs = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cFuncs", "S");
@@ -749,7 +749,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject)
 	TYPEATTRFc.wTypeFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wTypeFlags", "S");
 	TYPEATTRFc.wMajorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMajorVerNum", "S");
 	TYPEATTRFc.wMinorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMinorVerNum", "S");
-	TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", "I");
+	TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", I_J);
 	TYPEATTRFc.tdescAlias_vt = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_vt", "S");
 	TYPEATTRFc.idldescType_dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_dwReserved", "I");
 	TYPEATTRFc.idldescType_wIDLFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_wIDLFlags", "S");
@@ -770,7 +770,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.dwReserved);
 	lpStruct->memidConstructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidConstructor);
 	lpStruct->memidDestructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidDestructor);
-	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntField(env, lpObject, TYPEATTRFc.lpstrSchema);
+	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema);
 	lpStruct->cbSizeInstance = (*env)->GetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance);
 	lpStruct->typekind = (*env)->GetIntField(env, lpObject, TYPEATTRFc.typekind);
 	lpStruct->cFuncs = (*env)->GetShortField(env, lpObject, TYPEATTRFc.cFuncs);
@@ -781,7 +781,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	lpStruct->wTypeFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wTypeFlags);
 	lpStruct->wMajorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum);
 	lpStruct->wMinorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum);
-	lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntField(env, lpObject, TYPEATTRFc.tdescAlias_unionField);
+	lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField);
 	lpStruct->tdescAlias.vt = (*env)->GetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt);
 	lpStruct->idldescType.dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved);
 	lpStruct->idldescType.wIDLFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags);
@@ -802,7 +802,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.dwReserved, (jint)lpStruct->dwReserved);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.memidConstructor, (jint)lpStruct->memidConstructor);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.memidDestructor, (jint)lpStruct->memidDestructor);
-	(*env)->SetIntField(env, lpObject, TYPEATTRFc.lpstrSchema, (jint)lpStruct->lpstrSchema);
+	(*env)->SetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance, (jint)lpStruct->cbSizeInstance);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.typekind, (jint)lpStruct->typekind);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.cFuncs, (jshort)lpStruct->cFuncs);
@@ -813,7 +813,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wTypeFlags, (jshort)lpStruct->wTypeFlags);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum, (jshort)lpStruct->wMajorVerNum);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum, (jshort)lpStruct->wMinorVerNum);
-	(*env)->SetIntField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jint)lpStruct->tdescAlias.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jintLong)lpStruct->tdescAlias.lptdesc);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt, (jshort)lpStruct->tdescAlias.vt);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved, (jint)lpStruct->idldescType.dwReserved);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags, (jshort)lpStruct->idldescType.wIDLFlags);
@@ -834,11 +834,11 @@ void cacheVARDESCFields(JNIEnv *env, jobject lpObject)
 	if (VARDESCFc.cached) return;
 	VARDESCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	VARDESCFc.memid = (*env)->GetFieldID(env, VARDESCFc.clazz, "memid", "I");
-	VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", "I");
+	VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", I_J);
 	VARDESCFc.oInst = (*env)->GetFieldID(env, VARDESCFc.clazz, "oInst", "I");
-	VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", "I");
+	VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", I_J);
 	VARDESCFc.elemdescVar_tdesc_vt = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_vt", "S");
-	VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", "I");
+	VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", I_J);
 	VARDESCFc.elemdescVar_paramdesc_wParamFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_wParamFlags", "S");
 	VARDESCFc.wVarFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "wVarFlags", "S");
 	VARDESCFc.varkind = (*env)->GetFieldID(env, VARDESCFc.clazz, "varkind", "I");
@@ -849,11 +849,11 @@ VARDESC *getVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct)
 {
 	if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject);
 	lpStruct->memid = (*env)->GetIntField(env, lpObject, VARDESCFc.memid);
-	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntField(env, lpObject, VARDESCFc.lpstrSchema);
+	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.lpstrSchema);
 	lpStruct->oInst = (*env)->GetIntField(env, lpObject, VARDESCFc.oInst);
-	lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union);
+	lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union);
 	lpStruct->elemdescVar.tdesc.vt = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt);
-	lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex);
+	lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex);
 	lpStruct->elemdescVar.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags);
 	lpStruct->wVarFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.wVarFlags);
 	lpStruct->varkind = (*env)->GetIntField(env, lpObject, VARDESCFc.varkind);
@@ -864,11 +864,11 @@ void setVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct)
 {
 	if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.memid, (jint)lpStruct->memid);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.lpstrSchema, (jint)lpStruct->lpstrSchema);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.oInst, (jint)lpStruct->oInst);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jint)lpStruct->elemdescVar.tdesc.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jintLong)lpStruct->elemdescVar.tdesc.lptdesc);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt, (jshort)lpStruct->elemdescVar.tdesc.vt);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jint)lpStruct->elemdescVar.paramdesc.pparamdescex);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescVar.paramdesc.pparamdescex);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags, (jshort)lpStruct->elemdescVar.paramdesc.wParamFlags);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.wVarFlags, (jshort)lpStruct->wVarFlags);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.varkind, (jint)lpStruct->varkind);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
index 31f320b41d..4b69e95389 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
@@ -16,9 +16,9 @@
 #define Gdip_NATIVE(func) Java_org_eclipse_swt_internal_gdip_Gdip_##func
 
 #ifndef NO_BitmapData_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, BitmapData_1delete_FUNC);
 	delete (BitmapData *)arg0;
@@ -27,56 +27,56 @@ JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)
 #endif
 
 #ifndef NO_BitmapData_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(BitmapData_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, BitmapData_1new_FUNC);
-	rc = (jint)new BitmapData();
+	rc = (jintLong)new BitmapData();
 	Gdip_NATIVE_EXIT(env, that, BitmapData_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1GetHBITMAP
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHBITMAP_FUNC);
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((Bitmap*)arg0)->GetHBITMAP(*(Color*)arg1, (HBITMAP*)lparg2);
 fail:
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+	if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHBITMAP_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1GetHICON
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jint arg0, jintArray arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHICON_FUNC);
-	if (arg1) if ((lparg1 = env->GetIntArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	rc = (jint)((Bitmap*)arg0)->GetHICON((HICON*)lparg1);
 fail:
-	if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHICON_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1LockBits
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1LockBits_FUNC);
@@ -87,9 +87,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)
 #endif
 
 #ifndef NO_Bitmap_1UnlockBits
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1UnlockBits_FUNC);
@@ -100,9 +100,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)
 #endif
 
 #ifndef NO_Bitmap_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1delete_FUNC);
 	delete (Bitmap *)arg0;
@@ -110,55 +110,91 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)
 }
 #endif
 
-#ifndef NO_Bitmap_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_Bitmap_1new__I) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__I_FUNC);
-	rc = (jint)new Bitmap((HICON)arg0);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__J_FUNC);
+#endif
+	rc = (jintLong)new Bitmap((HICON)arg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Bitmap_1new__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Bitmap_1new__II) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__II_FUNC);
-	rc = (jint)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__JJ_FUNC);
+#endif
+	rc = (jintLong)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Bitmap_1new__IIIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_Bitmap_1new__IIIII) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__IIIIJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIII_FUNC);
-	rc = (jint)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIIJ_FUNC);
+#endif
+	rc = (jintLong)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1new___3CZ
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)
 	(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new___3CZ_FUNC);
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new Bitmap((WCHAR*)lparg0, arg1);
+	rc = (jintLong)new Bitmap((WCHAR*)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new___3CZ_FUNC);
@@ -167,22 +203,22 @@ fail:
 #endif
 
 #ifndef NO_Brush_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Brush_1Clone_FUNC);
-	rc = (jint)((Brush *)arg0)->Clone();
+	rc = (jintLong)((Brush *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, Brush_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Brush_1GetType
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Brush_1GetType_FUNC);
@@ -206,9 +242,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ColorPalette_1sizeof)
 #endif
 
 #ifndef NO_Color_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Color_1delete_FUNC);
 	delete (Color *)arg0;
@@ -217,22 +253,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)
 #endif
 
 #ifndef NO_Color_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Color_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Color_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Color_1new)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Color_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Color_1new_FUNC);
-	rc = (jint)new Color((ARGB)arg0);
+	rc = (jintLong)new Color((ARGB)arg0);
 	Gdip_NATIVE_EXIT(env, that, Color_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_FontFamily_1GetFamilyName
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jchar arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jchar arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -247,9 +283,9 @@ fail:
 #endif
 
 #ifndef NO_FontFamily_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, FontFamily_1delete_FUNC);
 	delete (FontFamily *)arg0;
@@ -258,22 +294,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)
 #endif
 
 #ifndef NO_FontFamily_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, FontFamily_1new_FUNC);
-	rc = (jint)new FontFamily();
+	rc = (jintLong)new FontFamily();
 	Gdip_NATIVE_EXIT(env, that, FontFamily_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Font_1GetFamily
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetFamily_FUNC);
@@ -284,9 +320,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)
 #endif
 
 #ifndef NO_Font_1GetSize
-extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jfloat rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetSize_FUNC);
@@ -297,9 +333,9 @@ JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)
 #endif
 
 #ifndef NO_Font_1GetStyle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetStyle_FUNC);
@@ -310,9 +346,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)
 #endif
 
 #ifndef NO_Font_1IsAvailable
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1IsAvailable_FUNC);
@@ -323,9 +359,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)
 #endif
 
 #ifndef NO_Font_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Font_1delete_FUNC);
 	delete (Font *)arg0;
@@ -333,40 +369,64 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)
 }
 #endif
 
-#ifndef NO_Font_1new__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Font_1new__II) && !defined(JNI64)) || (!defined(NO_Font_1new__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Font_1new__II_FUNC);
-	rc = (jint)new Font((HDC)arg0, (HFONT)arg1);
+#else
+	Gdip_NATIVE_ENTER(env, that, Font_1new__JJ_FUNC);
+#endif
+	rc = (jintLong)new Font((HDC)arg0, (HFONT)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Font_1new__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Font_1new__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Font_1new___3CFIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new___3CFIII)
-	(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_Font_1new___3CFIII) && !defined(JNI64)) || (!defined(NO_Font_1new___3CFIIJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIIJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4);
+	rc = (jintLong)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_GdiplusShutdown
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, GdiplusShutdown_FUNC);
 	GdiplusShutdown((ULONG_PTR)arg0);
@@ -375,20 +435,20 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)
 #endif
 
 #ifndef NO_GdiplusStartup
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jintArray arg0, jobject arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)
-	(JNIEnv *env, jclass that, jintArray arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	GdiplusStartupInput _arg1, *lparg1=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GdiplusStartup_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getGdiplusStartupInputFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)GdiplusStartup((ULONG_PTR *)lparg0, (const GdiplusStartupInput *)lparg1, (GdiplusStartupOutput *)arg2);
 fail:
 	if (arg1 && lparg1) setGdiplusStartupInputFields(env, arg1, lparg1);
-	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
+	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
 	Gdip_NATIVE_EXIT(env, that, GdiplusStartup_FUNC);
 	return rc;
 }
@@ -408,9 +468,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartupInput_1sizeof)
 #endif
 
 #ifndef NO_GraphicsPath_1AddArc
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddArc_FUNC);
@@ -421,9 +481,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)
 #endif
 
 #ifndef NO_GraphicsPath_1AddBezier
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddBezier_FUNC);
@@ -434,9 +494,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)
 #endif
 
 #ifndef NO_GraphicsPath_1AddLine
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddLine_FUNC);
@@ -447,9 +507,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)
 #endif
 
 #ifndef NO_GraphicsPath_1AddPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddPath_FUNC);
@@ -460,9 +520,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)
 #endif
 
 #ifndef NO_GraphicsPath_1AddRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -477,9 +537,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1AddString
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jfloat arg5, jobject arg6, jint arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jfloat arg5, jobject arg6, jint arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7)
 {
 	jchar *lparg1=NULL;
 	PointF _arg6, *lparg6=NULL;
@@ -497,22 +557,22 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Clone_FUNC);
-	rc = (jint)((GraphicsPath *)arg0)->Clone();
+	rc = (jintLong)((GraphicsPath *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, GraphicsPath_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GraphicsPath_1CloseFigure
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1CloseFigure_FUNC);
@@ -523,9 +583,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)
 #endif
 
 #ifndef NO_GraphicsPath_1Flatten
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Flatten_FUNC);
@@ -536,9 +596,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)
 #endif
 
 #ifndef NO_GraphicsPath_1GetBounds
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3)
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -553,9 +613,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetLastPoint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -570,9 +630,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetPathTypes
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -587,9 +647,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetPointCount
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1GetPointCount_FUNC);
@@ -600,9 +660,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)
 #endif
 
 #ifndef NO_GraphicsPath_1IsOutlineVisible
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3, jint arg4);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsOutlineVisible_FUNC);
@@ -613,9 +673,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)
 #endif
 
 #ifndef NO_GraphicsPath_1IsVisible
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsVisible_FUNC);
@@ -626,9 +686,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)
 #endif
 
 #ifndef NO_GraphicsPath_1SetFillMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1SetFillMode_FUNC);
@@ -639,9 +699,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)
 #endif
 
 #ifndef NO_GraphicsPath_1StartFigure
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1StartFigure_FUNC);
@@ -652,9 +712,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)
 #endif
 
 #ifndef NO_GraphicsPath_1Transform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Transform_FUNC);
@@ -665,9 +725,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)
 #endif
 
 #ifndef NO_GraphicsPath_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1delete_FUNC);
 	delete (GraphicsPath *)arg0;
@@ -676,22 +736,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)
 #endif
 
 #ifndef NO_GraphicsPath_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new__I)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new__I_FUNC);
-	rc = (jint)new GraphicsPath((FillMode)arg0);
+	rc = (jintLong)new GraphicsPath((FillMode)arg0);
 	Gdip_NATIVE_EXIT(env, that, GraphicsPath_1new__I_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawArc
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawArc_FUNC);
@@ -701,27 +761,39 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7)
+#if (!defined(NO_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7)
+#endif
 {
 	PointF _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC);
+#endif
 	if (arg5) if ((lparg5 = getPointFFields(env, arg5, &_arg5)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawDriverString((const UINT16 *)arg1, arg2, (const Font *)arg3, (const Brush *)arg4, (const PointF *)lparg5, arg6, (const Matrix *)arg7);
 fail:
 	if (arg5 && lparg5) setPointFFields(env, arg5, lparg5);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawEllipse
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawEllipse_FUNC);
@@ -731,40 +803,64 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawImage__IIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_Graphics_1DrawImage__IIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJII_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, (INT)arg2, (INT)arg3);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+#if (!defined(NO_Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10)
+#endif
 {
 	Rect _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, *(const Rect *)lparg2, (INT)arg3, (INT)arg4, (INT)arg5, (INT)arg6, (Unit)arg7, (ImageAttributes *)arg8, (DrawImageAbort)arg9, (VOID *)arg10);
 fail:
 	if (arg2 && lparg2) setRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawLine
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawLine_FUNC);
@@ -775,9 +871,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)
 #endif
 
 #ifndef NO_Graphics_1DrawPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawPath_FUNC);
@@ -788,9 +884,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)
 #endif
 
 #ifndef NO_Graphics_1DrawRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawRectangle_FUNC);
@@ -800,50 +896,74 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (Brush *)arg5);
 fail:
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6)
+#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (StringFormat *)arg5, (Brush *)arg6);
 fail:
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1FillEllipse
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillEllipse_FUNC);
@@ -854,9 +974,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)
 #endif
 
 #ifndef NO_Graphics_1FillPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillPath_FUNC);
@@ -867,9 +987,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)
 #endif
 
 #ifndef NO_Graphics_1FillPie
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillPie_FUNC);
@@ -880,9 +1000,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)
 #endif
 
 #ifndef NO_Graphics_1FillRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillRectangle_FUNC);
@@ -893,9 +1013,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)
 #endif
 
 #ifndef NO_Graphics_1Flush
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Flush_FUNC);
 	((Graphics *)arg0)->Flush((FlushIntention)arg1);
@@ -904,9 +1024,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)
 #endif
 
 #ifndef NO_Graphics_1GetClip
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClip_FUNC);
@@ -916,57 +1036,81 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)
 }
 #endif
 
-#ifndef NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1);
 fail:
 	if (arg1 && lparg1) setRectFFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1);
 fail:
 	if (arg1 && lparg1) setRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1GetHDC
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetHDC)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetHDC_FUNC);
-	rc = (jint)((Graphics *)arg0)->GetHDC();
+	rc = (jintLong)((Graphics *)arg0)->GetHDC();
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetHDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1GetInterpolationMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetInterpolationMode_FUNC);
@@ -977,9 +1121,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)
 #endif
 
 #ifndef NO_Graphics_1GetSmoothingMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetSmoothingMode_FUNC);
@@ -990,9 +1134,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)
 #endif
 
 #ifndef NO_Graphics_1GetTextRenderingHint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetTextRenderingHint_FUNC);
@@ -1003,9 +1147,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)
 #endif
 
 #ifndef NO_Graphics_1GetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetTransform_FUNC);
@@ -1016,9 +1160,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)
 #endif
 
 #ifndef NO_Graphics_1GetVisibleClipBounds
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -1032,16 +1176,24 @@ fail:
 }
 #endif
 
-#ifndef NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
+#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	RectF _arg6, *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = getRectFFields(env, arg6, &_arg6)) == NULL) goto fail;
@@ -1050,21 +1202,33 @@ fail:
 	if (arg6 && lparg6) setRectFFields(env, arg6, lparg6);
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jobject arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	RectF _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getRectFFields(env, arg5, &_arg5)) == NULL) goto fail;
@@ -1073,15 +1237,19 @@ fail:
 	if (arg5 && lparg5) setRectFFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1ReleaseHDC
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ReleaseHDC_FUNC);
 	((Graphics *)arg0)->ReleaseHDC((HDC)arg1);
@@ -1090,9 +1258,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)
 #endif
 
 #ifndef NO_Graphics_1ResetClip
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ResetClip_FUNC);
@@ -1103,9 +1271,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)
 #endif
 
 #ifndef NO_Graphics_1Restore
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Restore_FUNC);
@@ -1116,9 +1284,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)
 #endif
 
 #ifndef NO_Graphics_1Save
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Save_FUNC);
@@ -1129,9 +1297,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)
 #endif
 
 #ifndef NO_Graphics_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ScaleTransform_FUNC);
@@ -1141,66 +1309,114 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)
 }
 #endif
 
-#ifndef NO_Graphics_1SetClip__III
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClip__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__III_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JJI_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((Region *)arg1, (CombineMode)arg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__III_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->SetClip(*(Rect *)lparg1, (CombineMode)arg2);
 fail:
 	if (arg1 && lparg1) setRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClipPath__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Graphics_1SetClipPath__II) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJ_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClipPath__III
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClipPath__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJI_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1SetCompositingQuality
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetCompositingQuality_FUNC);
@@ -1211,9 +1427,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)
 #endif
 
 #ifndef NO_Graphics_1SetInterpolationMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetInterpolationMode_FUNC);
@@ -1224,9 +1440,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)
 #endif
 
 #ifndef NO_Graphics_1SetPageUnit
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetPageUnit_FUNC);
@@ -1237,9 +1453,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)
 #endif
 
 #ifndef NO_Graphics_1SetPixelOffsetMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetPixelOffsetMode_FUNC);
@@ -1250,9 +1466,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)
 #endif
 
 #ifndef NO_Graphics_1SetSmoothingMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetSmoothingMode_FUNC);
@@ -1263,9 +1479,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)
 #endif
 
 #ifndef NO_Graphics_1SetTextRenderingHint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetTextRenderingHint_FUNC);
@@ -1276,9 +1492,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)
 #endif
 
 #ifndef NO_Graphics_1SetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetTransform_FUNC);
@@ -1289,9 +1505,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)
 #endif
 
 #ifndef NO_Graphics_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1TranslateTransform_FUNC);
@@ -1302,9 +1518,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)
 #endif
 
 #ifndef NO_Graphics_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1delete_FUNC);
 	delete (Graphics *)arg0;
@@ -1313,22 +1529,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)
 #endif
 
 #ifndef NO_Graphics_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1new_FUNC);
-	rc = (jint)new Graphics((HDC)arg0);
+	rc = (jintLong)new Graphics((HDC)arg0);
 	Gdip_NATIVE_EXIT(env, that, Graphics_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_HatchBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, HatchBrush_1delete_FUNC);
 	delete (HatchBrush *)arg0;
@@ -1337,22 +1553,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)
 #endif
 
 #ifndef NO_HatchBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(HatchBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, HatchBrush_1new_FUNC);
-	rc = (jint)new HatchBrush((HatchStyle)arg0, *(Color *)arg1, *(Color *)arg2);
+	rc = (jintLong)new HatchBrush((HatchStyle)arg0, *(Color *)arg1, *(Color *)arg2);
 	Gdip_NATIVE_EXIT(env, that, HatchBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ImageAttributes_1SetColorMatrix
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1367,9 +1583,9 @@ fail:
 #endif
 
 #ifndef NO_ImageAttributes_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1SetWrapMode_FUNC);
@@ -1380,9 +1596,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)
 #endif
 
 #ifndef NO_ImageAttributes_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1delete_FUNC);
 	delete (ImageAttributes *)arg0;
@@ -1391,22 +1607,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)
 #endif
 
 #ifndef NO_ImageAttributes_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1new_FUNC);
-	rc = (jint)new ImageAttributes();
+	rc = (jintLong)new ImageAttributes();
 	Gdip_NATIVE_EXIT(env, that, ImageAttributes_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Image_1GetHeight
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetHeight_FUNC);
@@ -1417,9 +1633,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)
 #endif
 
 #ifndef NO_Image_1GetLastStatus
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetLastStatus_FUNC);
@@ -1430,9 +1646,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)
 #endif
 
 #ifndef NO_Image_1GetPalette
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPalette_FUNC);
@@ -1443,9 +1659,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)
 #endif
 
 #ifndef NO_Image_1GetPaletteSize
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPaletteSize_FUNC);
@@ -1456,9 +1672,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)
 #endif
 
 #ifndef NO_Image_1GetPixelFormat
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPixelFormat_FUNC);
@@ -1469,9 +1685,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)
 #endif
 
 #ifndef NO_Image_1GetWidth
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetWidth_FUNC);
@@ -1482,9 +1698,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)
 #endif
 
 #ifndef NO_LinearGradientBrush_1ResetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ResetTransform_FUNC);
@@ -1495,9 +1711,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ScaleTransform_FUNC);
@@ -1508,9 +1724,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetWrapMode_FUNC);
@@ -1521,9 +1737,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
 #endif
 
 #ifndef NO_LinearGradientBrush_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1TranslateTransform_FUNC);
@@ -1534,9 +1750,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1delete_FUNC);
 	delete (LinearGradientBrush *)arg0;
@@ -1545,17 +1761,17 @@ JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)
 #endif
 
 #ifndef NO_LinearGradientBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1new)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3)
 {
 	PointF _arg0, *lparg0=NULL;
 	PointF _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1new_FUNC);
 	if (arg0) if ((lparg0 = getPointFFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)new LinearGradientBrush(*lparg0, *lparg1, *(Color *)arg2, *(Color *)arg3);
+	rc = (jintLong)new LinearGradientBrush(*lparg0, *lparg1, *(Color *)arg2, *(Color *)arg3);
 fail:
 	if (arg1 && lparg1) setPointFFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setPointFFields(env, arg0, lparg0);
@@ -1565,9 +1781,9 @@ fail:
 #endif
 
 #ifndef NO_Matrix_1GetElements
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1582,9 +1798,9 @@ fail:
 #endif
 
 #ifndef NO_Matrix_1Invert
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Invert_FUNC);
@@ -1595,9 +1811,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)
 #endif
 
 #ifndef NO_Matrix_1IsIdentity
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1IsIdentity_FUNC);
@@ -1608,9 +1824,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)
 #endif
 
 #ifndef NO_Matrix_1Multiply
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Multiply_FUNC);
@@ -1621,9 +1837,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)
 #endif
 
 #ifndef NO_Matrix_1Rotate
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Rotate_FUNC);
@@ -1634,9 +1850,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)
 #endif
 
 #ifndef NO_Matrix_1Scale
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Scale_FUNC);
@@ -1647,9 +1863,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)
 #endif
 
 #ifndef NO_Matrix_1SetElements
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1SetElements_FUNC);
@@ -1660,9 +1876,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)
 #endif
 
 #ifndef NO_Matrix_1Shear
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Shear_FUNC);
@@ -1672,27 +1888,39 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)
 }
 #endif
 
-#ifndef NO_Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Matrix *)arg0)->TransformPoints(lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setPointFFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Matrix_1Translate
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Translate_FUNC);
@@ -1703,9 +1931,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)
 #endif
 
 #ifndef NO_Matrix_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Matrix_1delete_FUNC);
 	delete (Matrix *)arg0;
@@ -1714,48 +1942,72 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)
 #endif
 
 #ifndef NO_Matrix_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new)
 	(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1new_FUNC);
-	rc = (jint)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5);
+	rc = (jintLong)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5);
 	Gdip_NATIVE_EXIT(env, that, Matrix_1new_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jint arg1);
-JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC);
+#endif
 	if (arg0) setBitmapDataFields(env, arg0, (BitmapData *)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2);
-JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	ColorPalette _arg0, *lparg0=NULL;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getColorPaletteFields(env, arg0, &_arg0)) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID*)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setColorPaletteFields(env, arg0, lparg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_PathGradientBrush_1SetCenterColor
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetCenterColor_FUNC);
@@ -1766,9 +2018,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)
 #endif
 
 #ifndef NO_PathGradientBrush_1SetCenterPoint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -1783,9 +2035,9 @@ fail:
 #endif
 
 #ifndef NO_PathGradientBrush_1SetGraphicsPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetGraphicsPath_FUNC);
@@ -1796,9 +2048,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)
 #endif
 
 #ifndef NO_PathGradientBrush_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetWrapMode_FUNC);
@@ -1809,9 +2061,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)
 #endif
 
 #ifndef NO_PathGradientBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1delete_FUNC);
 	delete (PathGradientBrush *)arg0;
@@ -1820,35 +2072,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)
 #endif
 
 #ifndef NO_PathGradientBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1new_FUNC);
-	rc = (jint)new PathGradientBrush((GraphicsPath *)arg0);
+	rc = (jintLong)new PathGradientBrush((GraphicsPath *)arg0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Pen_1GetBrush
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1GetBrush)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1GetBrush_FUNC);
-	rc = (jint)((Pen *)arg0)->GetBrush();
+	rc = (jintLong)((Pen *)arg0)->GetBrush();
 	Gdip_NATIVE_EXIT(env, that, Pen_1GetBrush_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Pen_1SetBrush
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetBrush_FUNC);
@@ -1859,9 +2111,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)
 #endif
 
 #ifndef NO_Pen_1SetDashOffset
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetDashOffset_FUNC);
@@ -1872,9 +2124,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)
 #endif
 
 #ifndef NO_Pen_1SetDashPattern
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1889,9 +2141,9 @@ fail:
 #endif
 
 #ifndef NO_Pen_1SetDashStyle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetDashStyle_FUNC);
@@ -1902,9 +2154,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)
 #endif
 
 #ifndef NO_Pen_1SetLineCap
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetLineCap_FUNC);
@@ -1915,9 +2167,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)
 #endif
 
 #ifndef NO_Pen_1SetLineJoin
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetLineJoin_FUNC);
@@ -1928,9 +2180,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)
 #endif
 
 #ifndef NO_Pen_1SetMiterLimit
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetMiterLimit_FUNC);
@@ -1941,9 +2193,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)
 #endif
 
 #ifndef NO_Pen_1SetWidth
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetWidth_FUNC);
@@ -1954,9 +2206,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)
 #endif
 
 #ifndef NO_Pen_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Pen_1delete_FUNC);
 	delete (Pen *)arg0;
@@ -1965,22 +2217,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)
 #endif
 
 #ifndef NO_Pen_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1new)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1new_FUNC);
-	rc = (jint)new Pen((Brush *)arg0, (REAL)arg1);
+	rc = (jintLong)new Pen((Brush *)arg0, (REAL)arg1);
 	Gdip_NATIVE_EXIT(env, that, Pen_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Point_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Point_1delete_FUNC);
 	delete (Point *)arg0;
@@ -1989,35 +2241,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)
 #endif
 
 #ifndef NO_Point_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Point_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Point_1new_FUNC);
-	rc = (jint)new Point(arg0, arg1);
+	rc = (jintLong)new Point(arg0, arg1);
 	Gdip_NATIVE_EXIT(env, that, Point_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1GetHRGN
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1GetHRGN)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1GetHRGN_FUNC);
-	rc = (jint)((Region *)arg0)->GetHRGN((Graphics *)arg1);
+	rc = (jintLong)((Region *)arg0)->GetHRGN((Graphics *)arg1);
 	Gdip_NATIVE_EXIT(env, that, Region_1GetHRGN_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1IsInfinite
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1IsInfinite_FUNC);
@@ -2028,9 +2280,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)
 #endif
 
 #ifndef NO_Region_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Region_1delete_FUNC);
 	delete (Region *)arg0;
@@ -2039,48 +2291,60 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)
 #endif
 
 #ifndef NO_Region_1new__
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1new___FUNC);
-	rc = (jint)new Region();
+	rc = (jintLong)new Region();
 	Gdip_NATIVE_EXIT(env, that, Region_1new___FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_Region_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_Region_1new__I) && !defined(JNI64)) || (!defined(NO_Region_1new__J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Region_1new__I_FUNC);
-	rc = (jint)new Region((HRGN)arg0);
+#else
+	Gdip_NATIVE_ENTER(env, that, Region_1new__J_FUNC);
+#endif
+	rc = (jintLong)new Region((HRGN)arg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Region_1new__I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Region_1new__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1newGraphicsPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1newGraphicsPath)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1newGraphicsPath_FUNC);
-	rc = (jint)new Region((GraphicsPath*)arg0);
+	rc = (jintLong)new Region((GraphicsPath*)arg0);
 	Gdip_NATIVE_EXIT(env, that, Region_1newGraphicsPath_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SolidBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, SolidBrush_1delete_FUNC);
 	delete (SolidBrush *)arg0;
@@ -2089,61 +2353,61 @@ JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)
 #endif
 
 #ifndef NO_SolidBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(SolidBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, SolidBrush_1new_FUNC);
-	rc = (jint)new SolidBrush(*(Color *)arg0);
+	rc = (jintLong)new SolidBrush(*(Color *)arg0);
 	Gdip_NATIVE_EXIT(env, that, SolidBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1Clone_FUNC);
-	rc = (jint)((StringFormat *)arg0)->Clone();
+	rc = (jintLong)((StringFormat *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GenericDefault
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericDefault_FUNC);
-	rc = (jint)StringFormat::GenericDefault();
+	rc = (jintLong)StringFormat::GenericDefault();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericDefault_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GenericTypographic
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericTypographic_FUNC);
-	rc = (jint)StringFormat::GenericTypographic();
+	rc = (jintLong)StringFormat::GenericTypographic();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericTypographic_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GetFormatFlags
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GetFormatFlags_FUNC);
@@ -2154,9 +2418,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)
 #endif
 
 #ifndef NO_StringFormat_1SetFormatFlags
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1SetFormatFlags_FUNC);
@@ -2167,9 +2431,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)
 #endif
 
 #ifndef NO_StringFormat_1SetHotkeyPrefix
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1SetHotkeyPrefix_FUNC);
@@ -2180,9 +2444,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)
 #endif
 
 #ifndef NO_StringFormat_1SetTabStops
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2, jfloatArray arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2, jfloatArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3)
 {
 	jfloat *lparg3=NULL;
 	jint rc = 0;
@@ -2197,9 +2461,9 @@ fail:
 #endif
 
 #ifndef NO_StringFormat_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1delete_FUNC);
 	delete (StringFormat *)arg0;
@@ -2208,9 +2472,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
 #endif
 
 #ifndef NO_TextureBrush_1ResetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1ResetTransform_FUNC);
@@ -2221,9 +2485,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)
 #endif
 
 #ifndef NO_TextureBrush_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1ScaleTransform_FUNC);
@@ -2234,9 +2498,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)
 #endif
 
 #ifndef NO_TextureBrush_1SetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1SetTransform_FUNC);
@@ -2247,9 +2511,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
 #endif
 
 #ifndef NO_TextureBrush_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1TranslateTransform_FUNC);
@@ -2260,9 +2524,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)
 #endif
 
 #ifndef NO_TextureBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1delete_FUNC);
 	delete (TextureBrush *)arg0;
@@ -2271,13 +2535,13 @@ JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)
 #endif
 
 #ifndef NO_TextureBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1new_FUNC);
-	rc = (jint)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5);
 	Gdip_NATIVE_EXIT(env, that, TextureBrush_1new_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
index cfc2a19d06..8d74873551 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
@@ -19,7 +19,7 @@ extern "C" {
 
 #ifndef NO_Graphics_1DrawLines
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLines)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -45,7 +45,7 @@ fail:
 
 #ifndef NO_Graphics_1DrawPolygon
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPolygon)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -71,7 +71,7 @@ fail:
 
 #ifndef NO_Graphics_1FillPolygon
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPolygon)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3, jint arg4)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -97,7 +97,7 @@ fail:
 
 #ifndef NO_GraphicsPath_1GetPathPoints
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathPoints)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points=NULL;
 	jfloat *lparg1=NULL;
@@ -123,13 +123,13 @@ fail:
 #endif
 
 
-#if (!defined(NO_Matrix_1TransformPoints__I_3FI) && !defined(SWT_PTR_SIZE_64)) || (!defined(NO_Matrix_1TransformPoints__J_3FI) && defined(SWT_PTR_SIZE_64))
-#ifdef SWT_PTR_SIZE_64
+#if (!defined(NO_Matrix_1TransformPoints__I_3FI) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__J_3FI) && defined(JNI64))
+#ifdef JNI64
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI)
 #else
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__I_3FI)
 #endif
-	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points=NULL;
 	jfloat *lparg1=NULL;
@@ -161,14 +161,14 @@ fail:
 
 #ifndef NO_LinearGradientBrush_1SetInterpolationColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jfloatArray arg2, jint arg3)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jfloat *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1) {
 		colors = new Color[arg3];
@@ -182,7 +182,7 @@ fail:
 		delete colors;
 	}
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
 	return rc;
 }
@@ -190,14 +190,14 @@ fail:
 
 #ifndef NO_PathGradientBrush_1SetInterpolationColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jfloatArray arg2, jint arg3)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jfloat *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1) {
 		colors = new Color[arg3];
@@ -211,7 +211,7 @@ fail:
 		delete colors;
 	}
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
 	return rc;
 }
@@ -219,14 +219,14 @@ fail:
 
 #ifndef NO_PathGradientBrush_1SetSurroundColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1 && lparg2) {
 		colors = new Color[lparg2[0]];
@@ -240,20 +240,20 @@ fail:
 		delete colors;
 	}	
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GraphicsPath_1new___3I_3BII
-JNIEXPORT SWT_PTR JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
 	(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	SWT_PTR rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new___3I_3BII_FUNC);
 	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
 	if (lparg0) {
@@ -265,7 +265,7 @@ JNIEXPORT SWT_PTR JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
 		}
 	}
 	if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail;
-	rc = (SWT_PTR)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3);
+	rc = (jintLong)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3);
 fail:
 	if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, 0);
 	if (lparg0 && points) delete points;
@@ -275,15 +275,24 @@ fail:
 }
 #endif
 
-#ifndef NO_Graphics_1DrawDriverString__IIIII_3FII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jfloatArray arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jfloatArray arg5, jint arg6, jint arg7)
+#if (!defined(NO_Graphics_1DrawDriverString__IIIII_3FII) && !defined(JNI64)) || (!defined(Graphics_1DrawDriverString__JJIJJ_3FIJ) && defined(JNI64))
+#ifdef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7)
+#endif
+	
 {
 	PointF *points=NULL;
 	jfloat *lparg5=NULL;
 	jint rc = 0;
+#ifdef JNI64
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC);
+#else
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetFloatArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (lparg5) {
 		points = new PointF[arg2];
@@ -297,15 +306,19 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)
 fail:
 	if (arg5 && lparg5) env->ReleaseFloatArrayElements(arg5, lparg5, 0);
 	if (lparg5 && points) delete points;
+#ifdef JNI64
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC);
+#else
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1MeasureDriverString
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jfloatArray arg4, jint arg5, jint arg6, jobject arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jfloatArray arg4, jint arg5, jint arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7)
 {
 	PointF *points=NULL;
 	jfloat *lparg4=NULL;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
index 07076a6cd2..a976fbe84d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
@@ -24,9 +24,21 @@ char * Gdip_nativeFunctionNames[] = {
 	"Bitmap_1LockBits",
 	"Bitmap_1UnlockBits",
 	"Bitmap_1delete",
+#ifndef JNI64
 	"Bitmap_1new__I",
+#else
+	"Bitmap_1new__J",
+#endif
+#ifndef JNI64
 	"Bitmap_1new__II",
+#else
+	"Bitmap_1new__JJ",
+#endif
+#ifndef JNI64
 	"Bitmap_1new__IIIII",
+#else
+	"Bitmap_1new__IIIIJ",
+#endif
 	"Bitmap_1new___3CZ",
 	"Brush_1Clone",
 	"Brush_1GetType",
@@ -41,8 +53,16 @@ char * Gdip_nativeFunctionNames[] = {
 	"Font_1GetStyle",
 	"Font_1IsAvailable",
 	"Font_1delete",
+#ifndef JNI64
 	"Font_1new__II",
+#else
+	"Font_1new__JJ",
+#endif
+#ifndef JNI64
 	"Font_1new___3CFIII",
+#else
+	"Font_1new___3CFIIJ",
+#endif
 	"GdiplusShutdown",
 	"GdiplusStartup",
 	"GdiplusStartupInput_1sizeof",
@@ -69,18 +89,42 @@ char * Gdip_nativeFunctionNames[] = {
 	"GraphicsPath_1new__I",
 	"GraphicsPath_1new___3I_3BII",
 	"Graphics_1DrawArc",
+#ifndef JNI64
 	"Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II",
+#else
+	"Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawDriverString__IIIII_3FII",
+#else
+	"Graphics_1DrawDriverString__JJIJJ_3FIJ",
+#endif
 	"Graphics_1DrawEllipse",
+#ifndef JNI64
 	"Graphics_1DrawImage__IIII",
+#else
+	"Graphics_1DrawImage__JJII",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII",
+#else
+	"Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ",
+#endif
 	"Graphics_1DrawLine",
 	"Graphics_1DrawLines",
 	"Graphics_1DrawPath",
 	"Graphics_1DrawPolygon",
 	"Graphics_1DrawRectangle",
+#ifndef JNI64
 	"Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I",
+#else
+	"Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II",
+#else
+	"Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ",
+#endif
 	"Graphics_1FillEllipse",
 	"Graphics_1FillPath",
 	"Graphics_1FillPie",
@@ -88,8 +132,16 @@ char * Gdip_nativeFunctionNames[] = {
 	"Graphics_1FillRectangle",
 	"Graphics_1Flush",
 	"Graphics_1GetClip",
+#ifndef JNI64
 	"Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
+#ifndef JNI64
 	"Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2",
+#else
+	"Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2",
+#endif
 	"Graphics_1GetHDC",
 	"Graphics_1GetInterpolationMode",
 	"Graphics_1GetSmoothingMode",
@@ -97,17 +149,41 @@ char * Gdip_nativeFunctionNames[] = {
 	"Graphics_1GetTransform",
 	"Graphics_1GetVisibleClipBounds",
 	"Graphics_1MeasureDriverString",
+#ifndef JNI64
 	"Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
+#ifndef JNI64
 	"Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
 	"Graphics_1ReleaseHDC",
 	"Graphics_1ResetClip",
 	"Graphics_1Restore",
 	"Graphics_1Save",
 	"Graphics_1ScaleTransform",
+#ifndef JNI64
 	"Graphics_1SetClip__III",
+#else
+	"Graphics_1SetClip__JJI",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I",
+#else
+	"Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClipPath__II",
+#else
+	"Graphics_1SetClipPath__JJ",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClipPath__III",
+#else
+	"Graphics_1SetClipPath__JJI",
+#endif
 	"Graphics_1SetCompositingQuality",
 	"Graphics_1SetInterpolationMode",
 	"Graphics_1SetPageUnit",
@@ -145,13 +221,29 @@ char * Gdip_nativeFunctionNames[] = {
 	"Matrix_1Scale",
 	"Matrix_1SetElements",
 	"Matrix_1Shear",
+#ifndef JNI64
 	"Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I",
+#else
+	"Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I",
+#endif
+#ifndef JNI64
 	"Matrix_1TransformPoints__I_3FI",
+#else
+	"Matrix_1TransformPoints__J_3FI",
+#endif
 	"Matrix_1Translate",
 	"Matrix_1delete",
 	"Matrix_1new",
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI",
+#endif
 	"PathGradientBrush_1SetCenterColor",
 	"PathGradientBrush_1SetCenterPoint",
 	"PathGradientBrush_1SetGraphicsPath",
@@ -177,7 +269,11 @@ char * Gdip_nativeFunctionNames[] = {
 	"Region_1IsInfinite",
 	"Region_1delete",
 	"Region_1new__",
+#ifndef JNI64
 	"Region_1new__I",
+#else
+	"Region_1new__J",
+#endif
 	"Region_1newGraphicsPath",
 	"SolidBrush_1delete",
 	"SolidBrush_1new",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
index 959bf09010..1f6f09f086 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
@@ -32,9 +32,21 @@ typedef enum {
 	Bitmap_1LockBits_FUNC,
 	Bitmap_1UnlockBits_FUNC,
 	Bitmap_1delete_FUNC,
+#ifndef JNI64
 	Bitmap_1new__I_FUNC,
+#else
+	Bitmap_1new__J_FUNC,
+#endif
+#ifndef JNI64
 	Bitmap_1new__II_FUNC,
+#else
+	Bitmap_1new__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Bitmap_1new__IIIII_FUNC,
+#else
+	Bitmap_1new__IIIIJ_FUNC,
+#endif
 	Bitmap_1new___3CZ_FUNC,
 	Brush_1Clone_FUNC,
 	Brush_1GetType_FUNC,
@@ -49,8 +61,16 @@ typedef enum {
 	Font_1GetStyle_FUNC,
 	Font_1IsAvailable_FUNC,
 	Font_1delete_FUNC,
+#ifndef JNI64
 	Font_1new__II_FUNC,
+#else
+	Font_1new__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Font_1new___3CFIII_FUNC,
+#else
+	Font_1new___3CFIIJ_FUNC,
+#endif
 	GdiplusShutdown_FUNC,
 	GdiplusStartup_FUNC,
 	GdiplusStartupInput_1sizeof_FUNC,
@@ -77,18 +97,42 @@ typedef enum {
 	GraphicsPath_1new__I_FUNC,
 	GraphicsPath_1new___3I_3BII_FUNC,
 	Graphics_1DrawArc_FUNC,
+#ifndef JNI64
 	Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC,
+#else
+	Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawDriverString__IIIII_3FII_FUNC,
+#else
+	Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC,
+#endif
 	Graphics_1DrawEllipse_FUNC,
+#ifndef JNI64
 	Graphics_1DrawImage__IIII_FUNC,
+#else
+	Graphics_1DrawImage__JJII_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC,
+#else
+	Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC,
+#endif
 	Graphics_1DrawLine_FUNC,
 	Graphics_1DrawLines_FUNC,
 	Graphics_1DrawPath_FUNC,
 	Graphics_1DrawPolygon_FUNC,
 	Graphics_1DrawRectangle_FUNC,
+#ifndef JNI64
 	Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#else
+	Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC,
+#else
+	Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC,
+#endif
 	Graphics_1FillEllipse_FUNC,
 	Graphics_1FillPath_FUNC,
 	Graphics_1FillPie_FUNC,
@@ -96,8 +140,16 @@ typedef enum {
 	Graphics_1FillRectangle_FUNC,
 	Graphics_1Flush_FUNC,
 	Graphics_1GetClip_FUNC,
+#ifndef JNI64
 	Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC,
+#else
+	Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC,
+#endif
 	Graphics_1GetHDC_FUNC,
 	Graphics_1GetInterpolationMode_FUNC,
 	Graphics_1GetSmoothingMode_FUNC,
@@ -105,17 +157,41 @@ typedef enum {
 	Graphics_1GetTransform_FUNC,
 	Graphics_1GetVisibleClipBounds_FUNC,
 	Graphics_1MeasureDriverString_FUNC,
+#ifndef JNI64
 	Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
 	Graphics_1ReleaseHDC_FUNC,
 	Graphics_1ResetClip_FUNC,
 	Graphics_1Restore_FUNC,
 	Graphics_1Save_FUNC,
 	Graphics_1ScaleTransform_FUNC,
+#ifndef JNI64
 	Graphics_1SetClip__III_FUNC,
+#else
+	Graphics_1SetClip__JJI_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC,
+#else
+	Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClipPath__II_FUNC,
+#else
+	Graphics_1SetClipPath__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClipPath__III_FUNC,
+#else
+	Graphics_1SetClipPath__JJI_FUNC,
+#endif
 	Graphics_1SetCompositingQuality_FUNC,
 	Graphics_1SetInterpolationMode_FUNC,
 	Graphics_1SetPageUnit_FUNC,
@@ -153,13 +229,29 @@ typedef enum {
 	Matrix_1Scale_FUNC,
 	Matrix_1SetElements_FUNC,
 	Matrix_1Shear_FUNC,
+#ifndef JNI64
 	Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#else
+	Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#endif
+#ifndef JNI64
 	Matrix_1TransformPoints__I_3FI_FUNC,
+#else
+	Matrix_1TransformPoints__J_3FI_FUNC,
+#endif
 	Matrix_1Translate_FUNC,
 	Matrix_1delete_FUNC,
 	Matrix_1new_FUNC,
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC,
+#endif
 	PathGradientBrush_1SetCenterColor_FUNC,
 	PathGradientBrush_1SetCenterPoint_FUNC,
 	PathGradientBrush_1SetGraphicsPath_FUNC,
@@ -185,7 +277,11 @@ typedef enum {
 	Region_1IsInfinite_FUNC,
 	Region_1delete_FUNC,
 	Region_1new___FUNC,
+#ifndef JNI64
 	Region_1new__I_FUNC,
+#else
+	Region_1new__J_FUNC,
+#endif
 	Region_1newGraphicsPath_FUNC,
 	SolidBrush_1delete_FUNC,
 	SolidBrush_1new_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
index bf74f01eed..5ccd52ac14 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
@@ -29,8 +29,8 @@ void cacheBitmapDataFields(JNIEnv *env, jobject lpObject)
 	BitmapDataFc.Height = env->GetFieldID(BitmapDataFc.clazz, "Height", "I");
 	BitmapDataFc.Stride = env->GetFieldID(BitmapDataFc.clazz, "Stride", "I");
 	BitmapDataFc.PixelFormat = env->GetFieldID(BitmapDataFc.clazz, "PixelFormat", "I");
-	BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", "I");
-	BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", "I");
+	BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", I_J);
+	BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", I_J);
 	BitmapDataFc.cached = 1;
 }
 
@@ -41,8 +41,8 @@ BitmapData *getBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStr
 	lpStruct->Height = env->GetIntField(lpObject, BitmapDataFc.Height);
 	lpStruct->Stride = env->GetIntField(lpObject, BitmapDataFc.Stride);
 	lpStruct->PixelFormat = (PixelFormat)env->GetIntField(lpObject, BitmapDataFc.PixelFormat);
-	lpStruct->Scan0 = (void*)env->GetIntField(lpObject, BitmapDataFc.Scan0);
-	lpStruct->Reserved = (UINT_PTR)env->GetIntField(lpObject, BitmapDataFc.Reserved);
+	lpStruct->Scan0 = (void*)env->GetIntLongField(lpObject, BitmapDataFc.Scan0);
+	lpStruct->Reserved = (UINT_PTR)env->GetIntLongField(lpObject, BitmapDataFc.Reserved);
 	return lpStruct;
 }
 
@@ -53,8 +53,8 @@ void setBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStruct)
 	env->SetIntField(lpObject, BitmapDataFc.Height, (jint)lpStruct->Height);
 	env->SetIntField(lpObject, BitmapDataFc.Stride, (jint)lpStruct->Stride);
 	env->SetIntField(lpObject, BitmapDataFc.PixelFormat, (jint)lpStruct->PixelFormat);
-	env->SetIntField(lpObject, BitmapDataFc.Scan0, (jint)lpStruct->Scan0);
-	env->SetIntField(lpObject, BitmapDataFc.Reserved, (jint)lpStruct->Reserved);
+	env->SetIntLongField(lpObject, BitmapDataFc.Scan0, (jintLong)lpStruct->Scan0);
+	env->SetIntLongField(lpObject, BitmapDataFc.Reserved, (jintLong)lpStruct->Reserved);
 }
 #endif
 
@@ -84,7 +84,7 @@ ColorPalette *getColorPaletteFields(JNIEnv *env, jobject lpObject, ColorPalette
 	lpStruct->Count = env->GetIntField(lpObject, ColorPaletteFc.Count);
 	{
 	jintArray lpObject1 = (jintArray)env->GetObjectField(lpObject, ColorPaletteFc.Entries);
-	env->GetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / 4, (jint *)lpStruct->Entries);
+	env->GetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / sizeof(jint), (jint *)lpStruct->Entries);
 	}
 	return lpStruct;
 }
@@ -96,7 +96,7 @@ void setColorPaletteFields(JNIEnv *env, jobject lpObject, ColorPalette *lpStruct
 	env->SetIntField(lpObject, ColorPaletteFc.Count, (jint)lpStruct->Count);
 	{
 	jintArray lpObject1 = (jintArray)env->GetObjectField(lpObject, ColorPaletteFc.Entries);
-	env->SetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / 4, (jint *)lpStruct->Entries);
+	env->SetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / sizeof(jint), (jint *)lpStruct->Entries);
 	}
 }
 #endif
@@ -115,7 +115,7 @@ void cacheGdiplusStartupInputFields(JNIEnv *env, jobject lpObject)
 	if (GdiplusStartupInputFc.cached) return;
 	GdiplusStartupInputFc.clazz = env->GetObjectClass(lpObject);
 	GdiplusStartupInputFc.GdiplusVersion = env->GetFieldID(GdiplusStartupInputFc.clazz, "GdiplusVersion", "I");
-	GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", "I");
+	GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", I_J);
 	GdiplusStartupInputFc.SuppressBackgroundThread = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressBackgroundThread", "Z");
 	GdiplusStartupInputFc.SuppressExternalCodecs = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressExternalCodecs", "Z");
 	GdiplusStartupInputFc.cached = 1;
@@ -125,7 +125,7 @@ GdiplusStartupInput *getGdiplusStartupInputFields(JNIEnv *env, jobject lpObject,
 {
 	if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject);
 	lpStruct->GdiplusVersion = env->GetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion);
-	lpStruct->DebugEventCallback = (DebugEventProc)env->GetIntField(lpObject, GdiplusStartupInputFc.DebugEventCallback);
+	lpStruct->DebugEventCallback = (DebugEventProc)env->GetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback);
 	lpStruct->SuppressBackgroundThread = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread);
 	lpStruct->SuppressExternalCodecs = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs);
 	return lpStruct;
@@ -135,7 +135,7 @@ void setGdiplusStartupInputFields(JNIEnv *env, jobject lpObject, GdiplusStartupI
 {
 	if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject);
 	env->SetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion, (jint)lpStruct->GdiplusVersion);
-	env->SetIntField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jint)lpStruct->DebugEventCallback);
+	env->SetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jintLong)lpStruct->DebugEventCallback);
 	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread, (jboolean)lpStruct->SuppressBackgroundThread);
 	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs, (jboolean)lpStruct->SuppressExternalCodecs);
 }
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 83f432f218..43d85b6972 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
@@ -41,7 +41,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ACTCTX_1sizeof)
 
 #ifndef NO_AbortDoc
 JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, AbortDoc_FUNC);
@@ -53,43 +53,35 @@ JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc)
 
 #ifndef NO_ActivateActCtx
 JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ActivateActCtx_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)ActivateActCtx(arg0, (ULONG_PTR*)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(ActivateActCtx_LIB);
-			if (hm) fp = GetProcAddress(hm, "ActivateActCtx");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, ActivateActCtx)
 		if (fp) {
-			rc = (jboolean)fp(arg0, (ULONG_PTR*)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, ULONG_PTR*))fp)(arg0, (ULONG_PTR*)lparg1);
 		}
 	}
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, ActivateActCtx_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ActivateKeyboardLayout
-JNIEXPORT jint JNICALL OS_NATIVE(ActivateKeyboardLayout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ActivateKeyboardLayout)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ActivateKeyboardLayout_FUNC);
-	rc = (jint)ActivateKeyboardLayout((HKL)arg0, arg1);
+	rc = (jintLong)ActivateKeyboardLayout((HKL)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, ActivateKeyboardLayout_FUNC);
 	return rc;
 }
@@ -97,7 +89,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ActivateKeyboardLayout)
 
 #ifndef NO_AddFontResourceExA
 JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
@@ -107,17 +99,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA)
 	rc = (jint)AddFontResourceExA(lparg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AddFontResourceExA_LIB);
-			if (hm) fp = GetProcAddress(hm, "AddFontResourceExA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AddFontResourceExA)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jintLong))fp)(lparg0, arg1, arg2);
 		}
 	}
 fail:
@@ -129,7 +113,7 @@ fail:
 
 #ifndef NO_AddFontResourceExW
 JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLong arg2)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
@@ -139,17 +123,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW)
 	rc = (jint)AddFontResourceExW(lparg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AddFontResourceExW_LIB);
-			if (hm) fp = GetProcAddress(hm, "AddFontResourceExW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AddFontResourceExW)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jint, jintLong))fp)(lparg0, arg1, arg2);
 		}
 	}
 fail:
@@ -185,17 +161,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow)
 	rc = (jboolean)AllowSetForegroundWindow(arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AllowSetForegroundWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AllowSetForegroundWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AllowSetForegroundWindow)
 		if (fp) {
-			rc = (jboolean)fp(arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, AllowSetForegroundWindow_FUNC);
@@ -205,7 +173,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow)
 
 #ifndef NO_AlphaBlend
 JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10)
 {
 	BLENDFUNCTION _arg10, *lparg10=NULL;
 	jboolean rc = 0;
@@ -215,17 +183,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend)
 	rc = (jboolean)AlphaBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AlphaBlend_LIB);
-			if (hm) fp = GetProcAddress(hm, "AlphaBlend");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AlphaBlend)
 		if (fp) {
-			rc = (jboolean)fp(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, BLENDFUNCTION))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
 		}
 	}
 fail:
@@ -237,7 +197,7 @@ fail:
 
 #ifndef NO_AnimateWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, AnimateWindow_FUNC);
@@ -245,17 +205,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
 	rc = (jboolean)AnimateWindow((HWND)arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AnimateWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AnimateWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AnimateWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, arg1, arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint))fp)((HWND)arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, AnimateWindow_FUNC);
@@ -265,7 +217,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
 
 #ifndef NO_Arc
 JNIEXPORT jboolean JNICALL OS_NATIVE(Arc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Arc_FUNC);
@@ -293,17 +245,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringA)
 	rc = (jint)AssocQueryStringA(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AssocQueryStringA_LIB);
-			if (hm) fp = GetProcAddress(hm, "AssocQueryStringA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AssocQueryStringA)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -334,17 +278,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW)
 	rc = (jint)AssocQueryStringW(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AssocQueryStringW_LIB);
-			if (hm) fp = GetProcAddress(hm, "AssocQueryStringW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AssocQueryStringW)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jchar *, jchar *, jchar *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -442,36 +378,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(BUTTON_1IMAGELIST_1sizeof)
 #endif
 
 #ifndef NO_BeginBufferedPaint
-JNIEXPORT jint JNICALL OS_NATIVE(BeginBufferedPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jobject arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jobject arg3, jintLongArray arg4)
 {
 	RECT _arg1, *lparg1=NULL;
 	BP_PAINTPARAMS _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginBufferedPaint_FUNC);
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getBP_PAINTPARAMSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
+	rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BeginBufferedPaint_LIB);
-			if (hm) fp = GetProcAddress(hm, "BeginBufferedPaint");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BeginBufferedPaint)
 		if (fp) {
-			rc = (jint)fp((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HDC, RECT *, jint, BP_PAINTPARAMS *, HDC*))fp)((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
 		}
 	}
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setBP_PAINTPARAMSFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setRECTFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, BeginBufferedPaint_FUNC);
@@ -480,26 +408,26 @@ fail:
 #endif
 
 #ifndef NO_BeginDeferWindowPos
-JNIEXPORT jint JNICALL OS_NATIVE(BeginDeferWindowPos)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginDeferWindowPos)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginDeferWindowPos_FUNC);
-	rc = (jint)BeginDeferWindowPos(arg0);
+	rc = (jintLong)BeginDeferWindowPos(arg0);
 	OS_NATIVE_EXIT(env, that, BeginDeferWindowPos_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_BeginPaint
-JNIEXPORT jint JNICALL OS_NATIVE(BeginPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginPaint)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PAINTSTRUCT _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginPaint_FUNC);
 	if (arg1) if ((lparg1 = getPAINTSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)BeginPaint((HWND)arg0, lparg1);
+	rc = (jintLong)BeginPaint((HWND)arg0, lparg1);
 fail:
 	if (arg1 && lparg1) setPAINTSTRUCTFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, BeginPaint_FUNC);
@@ -509,7 +437,7 @@ fail:
 
 #ifndef NO_BeginPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginPath_FUNC);
@@ -521,7 +449,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath)
 
 #ifndef NO_BitBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BitBlt_FUNC);
@@ -533,7 +461,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt)
 
 #ifndef NO_BringWindowToTop
 JNIEXPORT jboolean JNICALL OS_NATIVE(BringWindowToTop)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BringWindowToTop_FUNC);
@@ -553,17 +481,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit)
 	rc = (jint)BufferedPaintInit();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintInit_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintInit");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintInit)
 		if (fp) {
-			rc = (jint)fp();
+			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintInit_FUNC);
@@ -573,7 +493,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit)
 
 #ifndef NO_BufferedPaintSetAlpha
 JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jbyte arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jbyte arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -583,17 +503,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha)
 	rc = (jint)BufferedPaintSetAlpha((HPAINTBUFFER)arg0, lparg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintSetAlpha_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintSetAlpha");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintSetAlpha)
 		if (fp) {
-			rc = (jint)fp((HPAINTBUFFER)arg0, lparg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, RECT *, jbyte))fp)((HPAINTBUFFER)arg0, lparg1, arg2);
 		}
 	}
 fail:
@@ -613,17 +525,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintUnInit)
 	rc = (jint)BufferedPaintUnInit();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintUnInit_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintUnInit");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintUnInit)
 		if (fp) {
-			rc = (jint)fp();
+			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintUnInit_FUNC);
@@ -705,7 +609,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CREATESTRUCT_1sizeof)
 
 #ifndef NO_Call
 JNIEXPORT jint JNICALL OS_NATIVE(Call)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DLLVERSIONINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -720,84 +624,84 @@ fail:
 #endif
 
 #ifndef NO_CallNextHookEx
-JNIEXPORT jint JNICALL OS_NATIVE(CallNextHookEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallNextHookEx)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallNextHookEx_FUNC);
-	rc = (jint)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, CallNextHookEx_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CallWindowProcA
-JNIEXPORT jint JNICALL OS_NATIVE(CallWindowProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallWindowProcA_FUNC);
-	rc = (jint)CallWindowProcA((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
+	rc = (jintLong)CallWindowProcA((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CallWindowProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CallWindowProcW
-JNIEXPORT jint JNICALL OS_NATIVE(CallWindowProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallWindowProcW_FUNC);
-	rc = (jint)CallWindowProcW((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
+	rc = (jintLong)CallWindowProcW((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CallWindowProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharLowerA
-JNIEXPORT jint JNICALL OS_NATIVE(CharLowerA)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerA)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharLowerA_FUNC);
-	rc = (jint)CharLowerA((LPSTR)arg0);
+	rc = (jintLong)CharLowerA((LPSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharLowerA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharLowerW
-JNIEXPORT jint JNICALL OS_NATIVE(CharLowerW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharLowerW_FUNC);
-	rc = (jint)CharLowerW((LPWSTR)arg0);
+	rc = (jintLong)CharLowerW((LPWSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharLowerW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharUpperA
-JNIEXPORT jint JNICALL OS_NATIVE(CharUpperA)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperA)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharUpperA_FUNC);
-	rc = (jint)CharUpperA((LPSTR)arg0);
+	rc = (jintLong)CharUpperA((LPSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharUpperA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharUpperW
-JNIEXPORT jint JNICALL OS_NATIVE(CharUpperW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharUpperW_FUNC);
-	rc = (jint)CharUpperW((LPWSTR)arg0);
+	rc = (jintLong)CharUpperW((LPWSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharUpperW_FUNC);
 	return rc;
 }
@@ -805,7 +709,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CharUpperW)
 
 #ifndef NO_CheckMenuItem
 JNIEXPORT jboolean JNICALL OS_NATIVE(CheckMenuItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CheckMenuItem_FUNC);
@@ -881,7 +785,7 @@ fail:
 
 #ifndef NO_ClientToScreen
 JNIEXPORT jboolean JNICALL OS_NATIVE(ClientToScreen)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -908,12 +812,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseClipboard)
 #endif
 
 #ifndef NO_CloseEnhMetaFile
-JNIEXPORT jint JNICALL OS_NATIVE(CloseEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CloseEnhMetaFile)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseEnhMetaFile_FUNC);
-	rc = (jint)CloseEnhMetaFile((HDC)arg0);
+	rc = (jintLong)CloseEnhMetaFile((HDC)arg0);
 	OS_NATIVE_EXIT(env, that, CloseEnhMetaFile_FUNC);
 	return rc;
 }
@@ -921,7 +825,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseEnhMetaFile)
 
 #ifndef NO_CloseHandle
 JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseHandle_FUNC);
@@ -933,7 +837,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle)
 
 #ifndef NO_CloseThemeData
 JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseThemeData_FUNC);
@@ -941,17 +845,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
 	rc = (jint)CloseThemeData((HTHEME)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CloseThemeData_LIB);
-			if (hm) fp = GetProcAddress(hm, "CloseThemeData");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CloseThemeData)
 		if (fp) {
-			rc = (jint)fp((HTHEME)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME))fp)((HTHEME)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CloseThemeData_FUNC);
@@ -961,19 +857,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
 
 #ifndef NO_CoCreateInstance
 JNIEXPORT jint JNICALL OS_NATIVE(CoCreateInstance)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLongArray arg4)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CoCreateInstance_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, 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;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoCreateInstance((REFCLSID)lparg0, (LPUNKNOWN)arg1, arg2, (REFIID)lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CoCreateInstance_FUNC);
@@ -991,17 +887,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled)
 	rc = (jint)CoInternetIsFeatureEnabled(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CoInternetIsFeatureEnabled_LIB);
-			if (hm) fp = GetProcAddress(hm, "CoInternetIsFeatureEnabled");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CoInternetIsFeatureEnabled_FUNC);
@@ -1019,17 +907,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled)
 	rc = (jint)CoInternetSetFeatureEnabled(arg0, arg1, (BOOL)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CoInternetSetFeatureEnabled_LIB);
-			if (hm) fp = GetProcAddress(hm, "CoInternetSetFeatureEnabled");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, (BOOL)arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, BOOL))fp)(arg0, arg1, (BOOL)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CoInternetSetFeatureEnabled_FUNC);
@@ -1039,7 +919,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled)
 
 #ifndef NO_CombineRgn
 JNIEXPORT jint JNICALL OS_NATIVE(CombineRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CombineRgn_FUNC);
@@ -1063,7 +943,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommDlgExtendedError)
 
 #ifndef NO_CommandBar_1AddAdornments
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1AddAdornments)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1AddAdornments_FUNC);
@@ -1074,12 +954,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1AddAdornments)
 #endif
 
 #ifndef NO_CommandBar_1Create
-JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Create)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CommandBar_1Create)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Create_FUNC);
-	rc = (jint)CommandBar_Create((HINSTANCE)arg0, (HWND)arg1, arg2);
+	rc = (jintLong)CommandBar_Create((HINSTANCE)arg0, (HWND)arg1, arg2);
 	OS_NATIVE_EXIT(env, that, CommandBar_1Create_FUNC);
 	return rc;
 }
@@ -1087,7 +967,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Create)
 
 #ifndef NO_CommandBar_1Destroy
 JNIEXPORT void JNICALL OS_NATIVE(CommandBar_1Destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CommandBar_1Destroy_FUNC);
 	CommandBar_Destroy((HWND)arg0);
@@ -1097,7 +977,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CommandBar_1Destroy)
 
 #ifndef NO_CommandBar_1DrawMenuBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1DrawMenuBar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1DrawMenuBar_FUNC);
@@ -1109,7 +989,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1DrawMenuBar)
 
 #ifndef NO_CommandBar_1Height
 JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Height)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Height_FUNC);
@@ -1121,7 +1001,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Height)
 
 #ifndef NO_CommandBar_1InsertMenubarEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1InsertMenubarEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1InsertMenubarEx_FUNC);
@@ -1133,7 +1013,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1InsertMenubarEx)
 
 #ifndef NO_CommandBar_1Show
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1Show)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Show_FUNC);
@@ -1144,26 +1024,26 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1Show)
 #endif
 
 #ifndef NO_CopyImage
-JNIEXPORT jint JNICALL OS_NATIVE(CopyImage)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CopyImage)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CopyImage_FUNC);
-	rc = (jint)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4);
+	rc = (jintLong)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CopyImage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateAcceleratorTableA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateAcceleratorTableA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreateAcceleratorTableA((LPACCEL)lparg0, arg1);
+	rc = (jintLong)CreateAcceleratorTableA((LPACCEL)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableA_FUNC);
@@ -1172,14 +1052,14 @@ fail:
 #endif
 
 #ifndef NO_CreateAcceleratorTableW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateAcceleratorTableW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableW)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreateAcceleratorTableW((LPACCEL)lparg0, arg1);
+	rc = (jintLong)CreateAcceleratorTableW((LPACCEL)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableW_FUNC);
@@ -1188,28 +1068,20 @@ fail:
 #endif
 
 #ifndef NO_CreateActCtxA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateActCtxA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxA)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ACTCTX _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateActCtxA_FUNC);
 	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)CreateActCtxA(lparg0);
+	rc = (jintLong)CreateActCtxA(lparg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateActCtxA_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateActCtxA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateActCtxA)
 		if (fp) {
-			rc = (jint)fp(lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1219,28 +1091,20 @@ fail:
 #endif
 
 #ifndef NO_CreateActCtxW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateActCtxW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxW)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ACTCTX _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateActCtxW_FUNC);
 	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)CreateActCtxW(lparg0);
+	rc = (jintLong)CreateActCtxW(lparg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateActCtxW_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateActCtxW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateActCtxW)
 		if (fp) {
-			rc = (jint)fp(lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1250,11 +1114,11 @@ fail:
 #endif
 
 #ifndef NO_CreateBitmap
-JNIEXPORT jint JNICALL OS_NATIVE(CreateBitmap)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateBitmap)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateBitmap_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1264,7 +1128,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateBitmap)
 	{
 		if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4);
+	rc = (jintLong)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1281,7 +1145,7 @@ fail:
 
 #ifndef NO_CreateCaret
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCaret_FUNC);
@@ -1292,36 +1156,36 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret)
 #endif
 
 #ifndef NO_CreateCompatibleBitmap
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCompatibleBitmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleBitmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCompatibleBitmap_FUNC);
-	rc = (jint)CreateCompatibleBitmap((HDC)arg0, arg1, arg2);
+	rc = (jintLong)CreateCompatibleBitmap((HDC)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, CreateCompatibleBitmap_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateCompatibleDC
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCompatibleDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCompatibleDC_FUNC);
-	rc = (jint)CreateCompatibleDC((HDC)arg0);
+	rc = (jintLong)CreateCompatibleDC((HDC)arg0);
 	OS_NATIVE_EXIT(env, that, CreateCompatibleDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateCursor
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCursor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCursor)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6)
 {
 	jbyte *lparg5=NULL;
 	jbyte *lparg6=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCursor_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1333,7 +1197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateCursor)
 		if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
 		if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6);
+	rc = (jintLong)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1351,16 +1215,16 @@ fail:
 #endif
 
 #ifndef NO_CreateDCA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDCA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCA)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateDCA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)CreateDCA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)arg2, (CONST DEVMODE *)arg3);
+	rc = (jintLong)CreateDCA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)arg2, (CONST DEVMODE *)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -1370,16 +1234,16 @@ fail:
 #endif
 
 #ifndef NO_CreateDCW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDCW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCW)
+	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateDCW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)CreateDCW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
+	rc = (jintLong)CreateDCW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -1388,22 +1252,29 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateDIBSection__III_3III
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__III_3III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4, jint arg5)
+#if (!defined(NO_CreateDIBSection__III_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__JJI_3JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__III_3III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__JJI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#endif
 {
-	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong *lparg3=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateDIBSection__III_3III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, CreateDIBSection__JJI_3JJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 	} else
 #endif
 	{
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
+	rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1411,21 +1282,32 @@ fail:
 	} else
 #endif
 	{
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateDIBSection__III_3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateDIBSection__JJI_3JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateDIBSection__I_3BI_3III
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3, jint arg4, jint arg5)
+#if (!defined(NO_CreateDIBSection__I_3BI_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__J_3BI_3JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__J_3BI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
-	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong *lparg3=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateDIBSection__I_3BI_3III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, CreateDIBSection__J_3BI_3JJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -1434,9 +1316,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)
 #endif
 	{
 		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
+	rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1445,27 +1327,31 @@ fail:
 	} else
 #endif
 	{
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateDIBSection__I_3BI_3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateDIBSection__J_3BI_3JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateEnhMetaFileA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateEnhMetaFileA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jbyteArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileA)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jbyteArray arg3)
 {
 	jbyte *lparg1=NULL;
 	RECT _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileA_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CreateEnhMetaFileA((HDC)arg0, (LPCSTR)lparg1, lparg2, (LPCSTR)lparg3);
+	rc = (jintLong)CreateEnhMetaFileA((HDC)arg0, (LPCSTR)lparg1, lparg2, (LPCSTR)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
@@ -1476,18 +1362,18 @@ fail:
 #endif
 
 #ifndef NO_CreateEnhMetaFileW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateEnhMetaFileW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jobject arg2, jcharArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileW)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2, jcharArray arg3)
 {
 	jchar *lparg1=NULL;
 	RECT _arg2, *lparg2=NULL;
 	jchar *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileW_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CreateEnhMetaFileW((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
+	rc = (jintLong)CreateEnhMetaFileW((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
@@ -1497,54 +1383,76 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateFontIndirectA__I
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectA__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_CreateFontIndirectA__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectA__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__I_FUNC);
-	rc = (jint)CreateFontIndirectA((LPLOGFONTA)arg0);
+#else
+	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__J_FUNC);
+#endif
+	rc = (jintLong)CreateFontIndirectA((LPLOGFONTA)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	LOGFONTA _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
 	if (arg0) if ((lparg0 = getLOGFONTAFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateFontIndirectA(lparg0);
+	rc = (jintLong)CreateFontIndirectA(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateFontIndirectW__I
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectW__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_CreateFontIndirectW__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectW__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__I_FUNC);
-	rc = (jint)CreateFontIndirectW((LPLOGFONTW)arg0);
+#else
+	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__J_FUNC);
+#endif
+	rc = (jintLong)CreateFontIndirectW((LPLOGFONTW)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	LOGFONTW _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
 	if (arg0) if ((lparg0 = getLOGFONTWFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateFontIndirectW(lparg0);
+	rc = (jintLong)CreateFontIndirectW(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
 	return rc;
@@ -1552,14 +1460,14 @@ fail:
 #endif
 
 #ifndef NO_CreateIconIndirect
-JNIEXPORT jint JNICALL OS_NATIVE(CreateIconIndirect)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateIconIndirect)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ICONINFO _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateIconIndirect_FUNC);
 	if (arg0) if ((lparg0 = getICONINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateIconIndirect(lparg0);
+	rc = (jintLong)CreateIconIndirect(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateIconIndirect_FUNC);
 	return rc;
@@ -1567,23 +1475,23 @@ fail:
 #endif
 
 #ifndef NO_CreateMenu
-JNIEXPORT jint JNICALL OS_NATIVE(CreateMenu)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateMenu)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateMenu_FUNC);
-	rc = (jint)CreateMenu();
+	rc = (jintLong)CreateMenu();
 	OS_NATIVE_EXIT(env, that, CreateMenu_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePalette
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePalette)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePalette)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePalette_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1593,7 +1501,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreatePalette)
 	{
 		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreatePalette((LOGPALETTE *)lparg0);
+	rc = (jintLong)CreatePalette((LOGPALETTE *)lparg0);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1609,38 +1517,38 @@ fail:
 #endif
 
 #ifndef NO_CreatePatternBrush
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePatternBrush)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePatternBrush)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePatternBrush_FUNC);
-	rc = (jint)CreatePatternBrush((HBITMAP)arg0);
+	rc = (jintLong)CreatePatternBrush((HBITMAP)arg0);
 	OS_NATIVE_EXIT(env, that, CreatePatternBrush_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePen
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePen)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePen_FUNC);
-	rc = (jint)CreatePen(arg0, arg1, (COLORREF)arg2);
+	rc = (jintLong)CreatePen(arg0, arg1, (COLORREF)arg2);
 	OS_NATIVE_EXIT(env, that, CreatePen_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePolygonRgn
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePolygonRgn)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePolygonRgn)
 	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
 {
 	jint *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePolygonRgn_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2);
+	rc = (jintLong)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreatePolygonRgn_FUNC);
@@ -1649,12 +1557,12 @@ fail:
 #endif
 
 #ifndef NO_CreatePopupMenu
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePopupMenu)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePopupMenu)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePopupMenu_FUNC);
-	rc = (jint)CreatePopupMenu();
+	rc = (jintLong)CreatePopupMenu();
 	OS_NATIVE_EXIT(env, that, CreatePopupMenu_FUNC);
 	return rc;
 }
@@ -1662,7 +1570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreatePopupMenu)
 
 #ifndef NO_CreateProcessA
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jobject arg8, jobject arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
 {
 	STARTUPINFO _arg8, *lparg8=NULL;
 	PROCESS_INFORMATION _arg9, *lparg9=NULL;
@@ -1681,7 +1589,7 @@ fail:
 
 #ifndef NO_CreateProcessW
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jobject arg8, jobject arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
 {
 	STARTUPINFO _arg8, *lparg8=NULL;
 	PROCESS_INFORMATION _arg9, *lparg9=NULL;
@@ -1699,24 +1607,24 @@ fail:
 #endif
 
 #ifndef NO_CreateRectRgn
-JNIEXPORT jint JNICALL OS_NATIVE(CreateRectRgn)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateRectRgn)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateRectRgn_FUNC);
-	rc = (jint)CreateRectRgn(arg0, arg1, arg2, arg3);
+	rc = (jintLong)CreateRectRgn(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, CreateRectRgn_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateSolidBrush
-JNIEXPORT jint JNICALL OS_NATIVE(CreateSolidBrush)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateSolidBrush)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateSolidBrush_FUNC);
-	rc = (jint)CreateSolidBrush((COLORREF)arg0);
+	rc = (jintLong)CreateSolidBrush((COLORREF)arg0);
 	OS_NATIVE_EXIT(env, that, CreateSolidBrush_FUNC);
 	return rc;
 }
@@ -1724,33 +1632,33 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateSolidBrush)
 
 #ifndef NO_CreateStreamOnHGlobal
 JNIEXPORT jint JNICALL OS_NATIVE(CreateStreamOnHGlobal)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateStreamOnHGlobal_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)CreateStreamOnHGlobal((HGLOBAL)arg0, (BOOL)arg1, (LPSTREAM *)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, CreateStreamOnHGlobal_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateWindowExA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateWindowExA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jobject arg11)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExA)
+	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	CREATESTRUCT _arg11, *lparg11=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateWindowExA_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jint)CreateWindowExA(arg0, (LPSTR)lparg1, lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
+	rc = (jintLong)CreateWindowExA(arg0, (LPSTR)lparg1, lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
 fail:
 	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
@@ -1761,18 +1669,18 @@ fail:
 #endif
 
 #ifndef NO_CreateWindowExW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateWindowExW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jobject arg11)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExW)
+	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
 	CREATESTRUCT _arg11, *lparg11=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateWindowExW_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jint)CreateWindowExW(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
+	rc = (jintLong)CreateWindowExW(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
 fail:
 	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
@@ -1832,7 +1740,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DOCINFO_1sizeof)
 
 #ifndef NO_DPtoLP
 JNIEXPORT jboolean JNICALL OS_NATIVE(DPtoLP)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -1883,84 +1791,84 @@ JNIEXPORT jint JNICALL OS_NATIVE(DWM_1BLURBEHIND_1sizeof)
 #endif
 
 #ifndef NO_DefFrameProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefFrameProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefFrameProcA_FUNC);
-	rc = (jint)DefFrameProcA((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
+	rc = (jintLong)DefFrameProcA((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
 	OS_NATIVE_EXIT(env, that, DefFrameProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefFrameProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefFrameProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefFrameProcW_FUNC);
-	rc = (jint)DefFrameProcW((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
+	rc = (jintLong)DefFrameProcW((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
 	OS_NATIVE_EXIT(env, that, DefFrameProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefMDIChildProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefMDIChildProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefMDIChildProcA_FUNC);
-	rc = (jint)DefMDIChildProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefMDIChildProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefMDIChildProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefMDIChildProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefMDIChildProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefMDIChildProcW_FUNC);
-	rc = (jint)DefMDIChildProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefMDIChildProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefMDIChildProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefWindowProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefWindowProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefWindowProcA_FUNC);
-	rc = (jint)DefWindowProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefWindowProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefWindowProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefWindowProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefWindowProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefWindowProcW_FUNC);
-	rc = (jint)DefWindowProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefWindowProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefWindowProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DeferWindowPos
-JNIEXPORT jint JNICALL OS_NATIVE(DeferWindowPos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DeferWindowPos)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DeferWindowPos_FUNC);
-	rc = (jint)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7);
+	rc = (jintLong)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7);
 	OS_NATIVE_EXIT(env, that, DeferWindowPos_FUNC);
 	return rc;
 }
@@ -1968,7 +1876,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DeferWindowPos)
 
 #ifndef NO_DeleteDC
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteDC_FUNC);
@@ -1980,7 +1888,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC)
 
 #ifndef NO_DeleteEnhMetaFile
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteEnhMetaFile_FUNC);
@@ -1992,7 +1900,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile)
 
 #ifndef NO_DeleteMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteMenu_FUNC);
@@ -2004,7 +1912,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu)
 
 #ifndef NO_DeleteObject
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteObject_FUNC);
@@ -2016,7 +1924,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject)
 
 #ifndef NO_DestroyAcceleratorTable
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyAcceleratorTable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyAcceleratorTable_FUNC);
@@ -2040,7 +1948,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCaret)
 
 #ifndef NO_DestroyCursor
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyCursor_FUNC);
@@ -2052,7 +1960,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor)
 
 #ifndef NO_DestroyIcon
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyIcon_FUNC);
@@ -2064,7 +1972,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon)
 
 #ifndef NO_DestroyMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyMenu_FUNC);
@@ -2076,7 +1984,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu)
 
 #ifndef NO_DestroyWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyWindow_FUNC);
@@ -2087,14 +1995,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow)
 #endif
 
 #ifndef NO_DispatchMessageA
-JNIEXPORT jint JNICALL OS_NATIVE(DispatchMessageA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageA)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	MSG _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DispatchMessageA_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)DispatchMessageA(lparg0);
+	rc = (jintLong)DispatchMessageA(lparg0);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, DispatchMessageA_FUNC);
@@ -2103,14 +2011,14 @@ fail:
 #endif
 
 #ifndef NO_DispatchMessageW
-JNIEXPORT jint JNICALL OS_NATIVE(DispatchMessageW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageW)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	MSG _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DispatchMessageW_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)DispatchMessageW(lparg0);
+	rc = (jintLong)DispatchMessageW(lparg0);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, DispatchMessageW_FUNC);
@@ -2120,7 +2028,7 @@ fail:
 
 #ifndef NO_DragDetect
 JNIEXPORT jboolean JNICALL OS_NATIVE(DragDetect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2136,7 +2044,7 @@ fail:
 
 #ifndef NO_DragFinish
 JNIEXPORT void JNICALL OS_NATIVE(DragFinish)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DragFinish_FUNC);
 	DragFinish((HDROP)arg0);
@@ -2146,7 +2054,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DragFinish)
 
 #ifndef NO_DragQueryFileA
 JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -2162,7 +2070,7 @@ fail:
 
 #ifndef NO_DragQueryFileW
 JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
@@ -2178,7 +2086,7 @@ fail:
 
 #ifndef NO_DrawAnimatedRects
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawAnimatedRects)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jobject arg3)
 {
 	RECT _arg2, *lparg2=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2197,7 +2105,7 @@ fail:
 
 #ifndef NO_DrawEdge
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawEdge)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2213,7 +2121,7 @@ fail:
 
 #ifndef NO_DrawFocusRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFocusRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2229,7 +2137,7 @@ fail:
 
 #ifndef NO_DrawFrameControl
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFrameControl)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2245,7 +2153,7 @@ fail:
 
 #ifndef NO_DrawIconEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLong arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawIconEx_FUNC);
@@ -2257,7 +2165,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx)
 
 #ifndef NO_DrawMenuBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawMenuBar_FUNC);
@@ -2269,7 +2177,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar)
 
 #ifndef NO_DrawStateA
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawStateA_FUNC);
@@ -2281,7 +2189,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateA)
 
 #ifndef NO_DrawStateW
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawStateW_FUNC);
@@ -2293,7 +2201,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateW)
 
 #ifndef NO_DrawTextA
 JNIEXPORT jint JNICALL OS_NATIVE(DrawTextA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jobject arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3, jint arg4)
 {
 	jbyte *lparg1=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2326,7 +2234,7 @@ fail:
 
 #ifndef NO_DrawTextW
 JNIEXPORT jint JNICALL OS_NATIVE(DrawTextW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4)
 {
 	jchar *lparg1=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2359,7 +2267,7 @@ fail:
 
 #ifndef NO_DrawThemeBackground
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -2371,17 +2279,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground)
 	rc = (jint)DrawThemeBackground((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeBackground)
 		if (fp) {
-			rc = (jint)fp((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME, HDC, jint, jint, const RECT *, const RECT *))fp)((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
 		}
 	}
 fail:
@@ -2394,7 +2294,7 @@ fail:
 
 #ifndef NO_DrawThemeEdge
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jobject arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg7, *lparg7=NULL;
@@ -2406,17 +2306,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge)
 	rc = (jint)DrawThemeEdge(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeEdge_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeEdge");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeEdge)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
 		}
 	}
 fail:
@@ -2429,7 +2321,7 @@ fail:
 
 #ifndef NO_DrawThemeIcon
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jint arg6)
 {
 	RECT _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -2439,17 +2331,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon)
 	rc = (jint)DrawThemeIcon(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeIcon_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeIcon");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeIcon)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jintLong, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
 		}
 	}
 fail:
@@ -2461,7 +2345,7 @@ fail:
 
 #ifndef NO_DrawThemeParentBackground
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -2471,17 +2355,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground)
 	rc = (jint)DrawThemeParentBackground(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeParentBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeParentBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeParentBackground)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, RECT *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -2493,7 +2369,7 @@ fail:
 
 #ifndef NO_DrawThemeText
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8)
 {
 	jchar *lparg4=NULL;
 	RECT _arg8, *lparg8=NULL;
@@ -2505,17 +2381,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
 	rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeText_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeText");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeText)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
 		}
 	}
 fail:
@@ -2528,7 +2396,7 @@ fail:
 
 #ifndef NO_DwmEnableBlurBehindWindow
 JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DWM_BLURBEHIND _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2538,17 +2406,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
 	rc = (jint)DwmEnableBlurBehindWindow((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DwmEnableBlurBehindWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "DwmEnableBlurBehindWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, lparg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWM_BLURBEHIND *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -2560,7 +2420,7 @@ fail:
 
 #ifndef NO_DwmExtendFrameIntoClientArea
 JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MARGINS _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2570,17 +2430,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea)
 	rc = (jint)DwmExtendFrameIntoClientArea((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DwmExtendFrameIntoClientArea_LIB);
-			if (hm) fp = GetProcAddress(hm, "DwmExtendFrameIntoClientArea");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, lparg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, MARGINS *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -2640,7 +2492,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EXTLOGPEN_1sizeof)
 
 #ifndef NO_Ellipse
 JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Ellipse_FUNC);
@@ -2652,7 +2504,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
 
 #ifndef NO_EnableMenuItem
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableMenuItem_FUNC);
@@ -2664,7 +2516,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem)
 
 #ifndef NO_EnableScrollBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableScrollBar_FUNC);
@@ -2676,7 +2528,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar)
 
 #ifndef NO_EnableWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableWindow_FUNC);
@@ -2688,7 +2540,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow)
 
 #ifndef NO_EndBufferedPaint
 JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndBufferedPaint_FUNC);
@@ -2696,17 +2548,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
 	rc = (jint)EndBufferedPaint((HPAINTBUFFER)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EndBufferedPaint_LIB);
-			if (hm) fp = GetProcAddress(hm, "EndBufferedPaint");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EndBufferedPaint)
 		if (fp) {
-			rc = (jint)fp((HPAINTBUFFER)arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, jboolean))fp)((HPAINTBUFFER)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EndBufferedPaint_FUNC);
@@ -2716,7 +2560,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
 
 #ifndef NO_EndDeferWindowPos
 JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EndDeferWindowPos_FUNC);
@@ -2728,7 +2572,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos)
 
 #ifndef NO_EndDoc
 JNIEXPORT jint JNICALL OS_NATIVE(EndDoc)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndDoc_FUNC);
@@ -2740,7 +2584,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndDoc)
 
 #ifndef NO_EndPage
 JNIEXPORT jint JNICALL OS_NATIVE(EndPage)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndPage_FUNC);
@@ -2752,7 +2596,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndPage)
 
 #ifndef NO_EndPaint
 JNIEXPORT jint JNICALL OS_NATIVE(EndPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PAINTSTRUCT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2768,7 +2612,7 @@ fail:
 
 #ifndef NO_EndPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(EndPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EndPath_FUNC);
@@ -2780,7 +2624,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EndPath)
 
 #ifndef NO_EnumDisplayMonitors
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2790,17 +2634,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors)
 	rc = (jboolean)EnumDisplayMonitors((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumDisplayMonitors_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumDisplayMonitors");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumDisplayMonitors)
 		if (fp) {
-			rc = (jboolean)fp((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, LPCRECT, MONITORENUMPROC, LPARAM))fp)((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
 		}
 	}
 fail:
@@ -2812,7 +2648,7 @@ fail:
 
 #ifndef NO_EnumEnhMetaFile
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
 {
 	RECT _arg4, *lparg4=NULL;
 	jboolean rc = 0;
@@ -2828,7 +2664,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesA
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -2844,7 +2680,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesExA
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesExA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3, jint arg4)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2860,7 +2696,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesExW
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesExW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3, jint arg4)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2876,7 +2712,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesW
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -2892,7 +2728,7 @@ fail:
 
 #ifndef NO_EnumSystemLanguageGroupsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsA_FUNC);
@@ -2900,17 +2736,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
 	rc = (jboolean)EnumSystemLanguageGroupsA((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumSystemLanguageGroupsA_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumSystemLanguageGroupsA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA)
 		if (fp) {
-			rc = (jboolean)fp((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCA, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsA_FUNC);
@@ -2920,7 +2748,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
 
 #ifndef NO_EnumSystemLanguageGroupsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsW_FUNC);
@@ -2928,17 +2756,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
 	rc = (jboolean)EnumSystemLanguageGroupsW((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumSystemLanguageGroupsW_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumSystemLanguageGroupsW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW)
 		if (fp) {
-			rc = (jboolean)fp((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCW, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsW_FUNC);
@@ -2948,7 +2768,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
 
 #ifndef NO_EnumSystemLocalesA
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLocalesA_FUNC);
@@ -2960,7 +2780,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesA)
 
 #ifndef NO_EnumSystemLocalesW
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLocalesW_FUNC);
@@ -2989,7 +2809,7 @@ fail:
 
 #ifndef NO_EqualRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(EqualRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EqualRgn_FUNC);
@@ -3001,7 +2821,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EqualRgn)
 
 #ifndef NO_ExcludeClipRect
 JNIEXPORT jint JNICALL OS_NATIVE(ExcludeClipRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExcludeClipRect_FUNC);
@@ -3050,16 +2870,16 @@ fail:
 #endif
 
 #ifndef NO_ExtCreatePen
-JNIEXPORT jint JNICALL OS_NATIVE(ExtCreatePen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreatePen)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jintArray arg4)
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtCreatePen_FUNC);
 	if (arg2) if ((lparg2 = getLOGBRUSHFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4);
+	rc = (jintLong)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
@@ -3069,16 +2889,16 @@ fail:
 #endif
 
 #ifndef NO_ExtCreateRegion
-JNIEXPORT jint JNICALL OS_NATIVE(ExtCreateRegion)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreateRegion)
 	(JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jintArray arg2)
 {
 	jfloat *lparg0=NULL;
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtCreateRegion_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2);
+	rc = (jintLong)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
@@ -3089,7 +2909,7 @@ fail:
 
 #ifndef NO_ExtTextOutA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jbyteArray arg5, jint arg6, jintArray arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jbyte *lparg5=NULL;
@@ -3126,7 +2946,7 @@ fail:
 
 #ifndef NO_ExtTextOutW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jchar *lparg5=NULL;
@@ -3163,20 +2983,20 @@ fail:
 
 #ifndef NO_ExtractIconExA
 JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintArray arg2, jintArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
 {
 	jbyte *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtractIconExA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)ExtractIconExA((LPSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ExtractIconExA_FUNC);
 	return rc;
@@ -3185,20 +3005,20 @@ fail:
 
 #ifndef NO_ExtractIconExW
 JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintArray arg2, jintArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtractIconExW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)ExtractIconExW((LPWSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ExtractIconExW_FUNC);
 	return rc;
@@ -3219,7 +3039,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(FILETIME_1sizeof)
 
 #ifndef NO_FillPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(FillPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, FillPath_FUNC);
@@ -3231,7 +3051,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FillPath)
 
 #ifndef NO_FillRect
 JNIEXPORT jint JNICALL OS_NATIVE(FillRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -3245,16 +3065,16 @@ fail:
 #endif
 
 #ifndef NO_FindWindowA
-JNIEXPORT jint JNICALL OS_NATIVE(FindWindowA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindowA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, FindWindowA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)FindWindowA((LPSTR)lparg0, (LPSTR)lparg1);
+	rc = (jintLong)FindWindowA((LPSTR)lparg0, (LPSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -3264,16 +3084,16 @@ fail:
 #endif
 
 #ifndef NO_FindWindowW
-JNIEXPORT jint JNICALL OS_NATIVE(FindWindowW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindowW)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, FindWindowW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)FindWindowW((LPWSTR)lparg0, (LPWSTR)lparg1);
+	rc = (jintLong)FindWindowW((LPWSTR)lparg0, (LPWSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -3284,15 +3104,15 @@ fail:
 
 #ifndef NO_FormatMessageA
 JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
 {
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, FormatMessageA_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)FormatMessageA(arg0, (LPCVOID)arg1, arg2, arg3, (LPSTR)lparg4, arg5, (va_list*)arg6);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, FormatMessageA_FUNC);
 	return rc;
 }
@@ -3300,15 +3120,15 @@ fail:
 
 #ifndef NO_FormatMessageW
 JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
 {
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, FormatMessageW_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)FormatMessageW(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, FormatMessageW_FUNC);
 	return rc;
 }
@@ -3316,7 +3136,7 @@ fail:
 
 #ifndef NO_FreeLibrary
 JNIEXPORT jboolean JNICALL OS_NATIVE(FreeLibrary)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, FreeLibrary_FUNC);
@@ -3340,7 +3160,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GCP_1RESULTS_1sizeof)
 
 #ifndef NO_GET_1WHEEL_1DELTA_1WPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1WHEEL_1DELTA_1WPARAM_FUNC);
@@ -3352,7 +3172,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM)
 
 #ifndef NO_GET_1X_1LPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1X_1LPARAM_FUNC);
@@ -3364,7 +3184,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM)
 
 #ifndef NO_GET_1Y_1LPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1Y_1LPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1Y_1LPARAM_FUNC);
@@ -3423,12 +3243,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetACP)
 #endif
 
 #ifndef NO_GetActiveWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetActiveWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetActiveWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetActiveWindow_FUNC);
-	rc = (jint)GetActiveWindow();
+	rc = (jintLong)GetActiveWindow();
 	OS_NATIVE_EXIT(env, that, GetActiveWindow_FUNC);
 	return rc;
 }
@@ -3448,7 +3268,7 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetAsyncKeyState)
 
 #ifndef NO_GetBkColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetBkColor_FUNC);
@@ -3459,12 +3279,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor)
 #endif
 
 #ifndef NO_GetCapture
-JNIEXPORT jint JNICALL OS_NATIVE(GetCapture)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCapture)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCapture_FUNC);
-	rc = (jint)GetCapture();
+	rc = (jintLong)GetCapture();
 	OS_NATIVE_EXIT(env, that, GetCapture_FUNC);
 	return rc;
 }
@@ -3488,7 +3308,7 @@ fail:
 
 #ifndef NO_GetCharABCWidthsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3518,7 +3338,7 @@ fail:
 
 #ifndef NO_GetCharABCWidthsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3548,7 +3368,7 @@ fail:
 
 #ifndef NO_GetCharWidthA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3578,7 +3398,7 @@ fail:
 
 #ifndef NO_GetCharWidthW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3608,7 +3428,7 @@ fail:
 
 #ifndef NO_GetCharacterPlacementA
 JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
 {
 	jbyte *lparg1=NULL;
 	GCP_RESULTS _arg4, *lparg4=NULL;
@@ -3641,7 +3461,7 @@ fail:
 
 #ifndef NO_GetCharacterPlacementW
 JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
 {
 	jchar *lparg1=NULL;
 	GCP_RESULTS _arg4, *lparg4=NULL;
@@ -3674,7 +3494,7 @@ fail:
 
 #ifndef NO_GetClassInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
 {
 	jbyte *lparg1=NULL;
 	WNDCLASS _arg2, *lparg2=NULL;
@@ -3693,7 +3513,7 @@ fail:
 
 #ifndef NO_GetClassInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2)
 {
 	jchar *lparg1=NULL;
 	WNDCLASS _arg2, *lparg2=NULL;
@@ -3712,7 +3532,7 @@ fail:
 
 #ifndef NO_GetClassNameA
 JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -3728,7 +3548,7 @@ fail:
 
 #ifndef NO_GetClassNameW
 JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -3744,7 +3564,7 @@ fail:
 
 #ifndef NO_GetClientRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClientRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3760,7 +3580,7 @@ fail:
 
 #ifndef NO_GetClipBox
 JNIEXPORT jint JNICALL OS_NATIVE(GetClipBox)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -3776,7 +3596,7 @@ fail:
 
 #ifndef NO_GetClipRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetClipRgn_FUNC);
@@ -3787,12 +3607,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn)
 #endif
 
 #ifndef NO_GetClipboardData
-JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardData)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetClipboardData)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetClipboardData_FUNC);
-	rc = (jint)GetClipboardData(arg0);
+	rc = (jintLong)GetClipboardData(arg0);
 	OS_NATIVE_EXIT(env, that, GetClipboardData_FUNC);
 	return rc;
 }
@@ -3832,7 +3652,7 @@ fail:
 
 #ifndef NO_GetComboBoxInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	COMBOBOXINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3842,17 +3662,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
 	rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetComboBoxInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetComboBoxInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetComboBoxInfo)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, COMBOBOXINFO *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -3863,12 +3675,12 @@ fail:
 #endif
 
 #ifndef NO_GetCurrentObject
-JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentObject)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentObject)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCurrentObject_FUNC);
-	rc = (jint)GetCurrentObject((HDC)arg0, arg1);
+	rc = (jintLong)GetCurrentObject((HDC)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetCurrentObject_FUNC);
 	return rc;
 }
@@ -3899,12 +3711,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentThreadId)
 #endif
 
 #ifndef NO_GetCursor
-JNIEXPORT jint JNICALL OS_NATIVE(GetCursor)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCursor)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCursor_FUNC);
-	rc = (jint)GetCursor();
+	rc = (jintLong)GetCursor();
 	OS_NATIVE_EXIT(env, that, GetCursor_FUNC);
 	return rc;
 }
@@ -3927,24 +3739,24 @@ fail:
 #endif
 
 #ifndef NO_GetDC
-JNIEXPORT jint JNICALL OS_NATIVE(GetDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDC_FUNC);
-	rc = (jint)GetDC((HWND)arg0);
+	rc = (jintLong)GetDC((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetDCEx
-JNIEXPORT jint JNICALL OS_NATIVE(GetDCEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDCEx)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDCEx_FUNC);
-	rc = (jint)GetDCEx((HWND)arg0, (HRGN)arg1, arg2);
+	rc = (jintLong)GetDCEx((HWND)arg0, (HRGN)arg1, arg2);
 	OS_NATIVE_EXIT(env, that, GetDCEx_FUNC);
 	return rc;
 }
@@ -3952,7 +3764,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDCEx)
 
 #ifndef NO_GetDIBColorTable
 JNIEXPORT jint JNICALL OS_NATIVE(GetDIBColorTable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -3982,7 +3794,7 @@ fail:
 
 #ifndef NO_GetDIBits
 JNIEXPORT jint JNICALL OS_NATIVE(GetDIBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jbyteArray arg5, jint arg6)
 {
 	jbyte *lparg5=NULL;
 	jint rc = 0;
@@ -4055,12 +3867,12 @@ fail:
 #endif
 
 #ifndef NO_GetDesktopWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetDesktopWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDesktopWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDesktopWindow_FUNC);
-	rc = (jint)GetDesktopWindow();
+	rc = (jintLong)GetDesktopWindow();
 	OS_NATIVE_EXIT(env, that, GetDesktopWindow_FUNC);
 	return rc;
 }
@@ -4068,7 +3880,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDesktopWindow)
 
 #ifndef NO_GetDeviceCaps
 JNIEXPORT jint JNICALL OS_NATIVE(GetDeviceCaps)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDeviceCaps_FUNC);
@@ -4091,12 +3903,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDialogBaseUnits)
 #endif
 
 #ifndef NO_GetDlgItem
-JNIEXPORT jint JNICALL OS_NATIVE(GetDlgItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDlgItem)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDlgItem_FUNC);
-	rc = (jint)GetDlgItem((HWND)arg0, arg1);
+	rc = (jintLong)GetDlgItem((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetDlgItem_FUNC);
 	return rc;
 }
@@ -4115,12 +3927,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDoubleClickTime)
 #endif
 
 #ifndef NO_GetFocus
-JNIEXPORT jint JNICALL OS_NATIVE(GetFocus)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetFocus)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetFocus_FUNC);
-	rc = (jint)GetFocus();
+	rc = (jintLong)GetFocus();
 	OS_NATIVE_EXIT(env, that, GetFocus_FUNC);
 	return rc;
 }
@@ -4128,7 +3940,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetFocus)
 
 #ifndef NO_GetFontLanguageInfo
 JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetFontLanguageInfo_FUNC);
@@ -4139,12 +3951,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo)
 #endif
 
 #ifndef NO_GetForegroundWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetForegroundWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetForegroundWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetForegroundWindow_FUNC);
-	rc = (jint)GetForegroundWindow();
+	rc = (jintLong)GetForegroundWindow();
 	OS_NATIVE_EXIT(env, that, GetForegroundWindow_FUNC);
 	return rc;
 }
@@ -4168,7 +3980,7 @@ fail:
 
 #ifndef NO_GetIconInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetIconInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	ICONINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4227,12 +4039,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetKeyState)
 #endif
 
 #ifndef NO_GetKeyboardLayout
-JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayout)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetKeyboardLayout)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetKeyboardLayout_FUNC);
-	rc = (jint)GetKeyboardLayout(arg0);
+	rc = (jintLong)GetKeyboardLayout(arg0);
 	OS_NATIVE_EXIT(env, that, GetKeyboardLayout_FUNC);
 	return rc;
 }
@@ -4240,15 +4052,15 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayout)
 
 #ifndef NO_GetKeyboardLayoutList
 JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayoutList)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetKeyboardLayoutList_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)GetKeyboardLayoutList(arg0, (HKL FAR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetKeyboardLayoutList_FUNC);
 	return rc;
 }
@@ -4271,12 +4083,12 @@ fail:
 #endif
 
 #ifndef NO_GetLastActivePopup
-JNIEXPORT jint JNICALL OS_NATIVE(GetLastActivePopup)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetLastActivePopup)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetLastActivePopup_FUNC);
-	rc = (jint)GetLastActivePopup((HWND)arg0);
+	rc = (jintLong)GetLastActivePopup((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetLastActivePopup_FUNC);
 	return rc;
 }
@@ -4296,7 +4108,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLastError)
 
 #ifndef NO_GetLayeredWindowAttributes
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jbyteArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jbyteArray arg2, jintArray arg3)
 {
 	jint *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -4310,17 +4122,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes)
 	rc = (jboolean)GetLayeredWindowAttributes((HWND)arg0, lparg1, lparg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetLayeredWindowAttributes_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetLayeredWindowAttributes");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetLayeredWindowAttributes)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, lparg1, lparg2, lparg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint *, jbyte *, jint *))fp)((HWND)arg0, lparg1, lparg2, lparg3);
 		}
 	}
 fail:
@@ -4334,7 +4138,7 @@ fail:
 
 #ifndef NO_GetLayout
 JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetLayout_FUNC);
@@ -4342,17 +4146,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
 	rc = (jint)GetLayout((HDC)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetLayout_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetLayout");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetLayout)
 		if (fp) {
-			rc = (jint)fp((HDC)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HDC))fp)((HDC)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetLayout_FUNC);
@@ -4394,7 +4190,7 @@ fail:
 
 #ifndef NO_GetMapMode
 JNIEXPORT jint JNICALL OS_NATIVE(GetMapMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMapMode_FUNC);
@@ -4405,12 +4201,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMapMode)
 #endif
 
 #ifndef NO_GetMenu
-JNIEXPORT jint JNICALL OS_NATIVE(GetMenu)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetMenu)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenu_FUNC);
-	rc = (jint)GetMenu((HWND)arg0);
+	rc = (jintLong)GetMenu((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetMenu_FUNC);
 	return rc;
 }
@@ -4418,7 +4214,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenu)
 
 #ifndef NO_GetMenuBarInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	MENUBARINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4428,17 +4224,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo)
 	rc = (jboolean)GetMenuBarInfo(arg0, arg1, arg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMenuBarInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMenuBarInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMenuBarInfo)
 		if (fp) {
-			rc = (jboolean)fp(arg0, arg1, arg2, lparg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, MENUBARINFO *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
@@ -4450,7 +4238,7 @@ fail:
 
 #ifndef NO_GetMenuDefaultItem
 JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuDefaultItem_FUNC);
@@ -4462,7 +4250,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem)
 
 #ifndef NO_GetMenuInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MENUINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4472,17 +4260,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo)
 	rc = (jboolean)GetMenuInfo((HMENU)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMenuInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMenuInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMenuInfo)
 		if (fp) {
-			rc = (jboolean)fp((HMENU)arg0, lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1);
 		}
 	}
 fail:
@@ -4494,7 +4274,7 @@ fail:
 
 #ifndef NO_GetMenuItemCount
 JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuItemCount_FUNC);
@@ -4506,7 +4286,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount)
 
 #ifndef NO_GetMenuItemInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4522,7 +4302,7 @@ fail:
 
 #ifndef NO_GetMenuItemInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4538,7 +4318,7 @@ fail:
 
 #ifndef NO_GetMenuItemRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3)
 {
 	RECT _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4554,7 +4334,7 @@ fail:
 
 #ifndef NO_GetMessageA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageA)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -4594,7 +4374,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMessageTime)
 
 #ifndef NO_GetMessageW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageW)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -4610,7 +4390,7 @@ fail:
 
 #ifndef NO_GetMetaRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMetaRgn_FUNC);
@@ -4622,7 +4402,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
 
 #ifndef NO_GetModuleFileNameA
 JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -4638,7 +4418,7 @@ fail:
 
 #ifndef NO_GetModuleFileNameW
 JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -4653,14 +4433,14 @@ fail:
 #endif
 
 #ifndef NO_GetModuleHandleA
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleHandleA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleA)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetModuleHandleA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleHandleA((LPSTR)lparg0);
+	rc = (jintLong)GetModuleHandleA((LPSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, GetModuleHandleA_FUNC);
@@ -4669,14 +4449,14 @@ fail:
 #endif
 
 #ifndef NO_GetModuleHandleW
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleHandleW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleW)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetModuleHandleW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleHandleW((LPWSTR)lparg0);
+	rc = (jintLong)GetModuleHandleW((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, GetModuleHandleW_FUNC);
@@ -4686,7 +4466,7 @@ fail:
 
 #ifndef NO_GetMonitorInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MONITORINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4696,17 +4476,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA)
 	rc = (jboolean)GetMonitorInfoA((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMonitorInfoA_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMonitorInfoA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMonitorInfoA)
 		if (fp) {
-			rc = (jboolean)fp((HMONITOR)arg0, (LPMONITORINFO)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 		}
 	}
 fail:
@@ -4718,7 +4490,7 @@ fail:
 
 #ifndef NO_GetMonitorInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MONITORINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4728,17 +4500,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW)
 	rc = (jboolean)GetMonitorInfoW((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMonitorInfoW_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMonitorInfoW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMonitorInfoW)
 		if (fp) {
-			rc = (jboolean)fp((HMONITOR)arg0, (LPMONITORINFO)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 		}
 	}
 fail:
@@ -4750,7 +4514,7 @@ fail:
 
 #ifndef NO_GetNearestPaletteIndex
 JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetNearestPaletteIndex_FUNC);
@@ -4760,218 +4524,372 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
 }
 #endif
 
-#ifndef NO_GetObjectA__III
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_GetObjectA__III) && !defined(JNI64)) || (!defined(NO_GetObjectA__JIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JIJ_FUNC);
+#endif
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	BITMAP _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	DIBSECTION _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	EXTLOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setEXTLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGFONTA _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGFONTAFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__III
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_GetObjectW__III) && !defined(JNI64)) || (!defined(NO_GetObjectW__JIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JIJ_FUNC);
+#endif
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	BITMAP _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	DIBSECTION _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	EXTLOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setEXTLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGFONTW _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGFONTWFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -5010,7 +4928,7 @@ fail:
 
 #ifndef NO_GetOutlineTextMetricsA
 JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	OUTLINETEXTMETRICA _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -5026,7 +4944,7 @@ fail:
 
 #ifndef NO_GetOutlineTextMetricsW
 JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	OUTLINETEXTMETRICW _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -5042,7 +4960,7 @@ fail:
 
 #ifndef NO_GetPaletteEntries
 JNIEXPORT jint JNICALL OS_NATIVE(GetPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -5071,12 +4989,12 @@ fail:
 #endif
 
 #ifndef NO_GetParent
-JNIEXPORT jint JNICALL OS_NATIVE(GetParent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetParent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetParent_FUNC);
-	rc = (jint)GetParent((HWND)arg0);
+	rc = (jintLong)GetParent((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetParent_FUNC);
 	return rc;
 }
@@ -5084,7 +5002,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetParent)
 
 #ifndef NO_GetPath
 JNIEXPORT jint JNICALL OS_NATIVE(GetPath)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jbyteArray arg2, jint arg3)
 {
 	jint *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -5103,7 +5021,7 @@ fail:
 
 #ifndef NO_GetPixel
 JNIEXPORT jint JNICALL OS_NATIVE(GetPixel)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPixel_FUNC);
@@ -5115,7 +5033,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPixel)
 
 #ifndef NO_GetPolyFillMode
 JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPolyFillMode_FUNC);
@@ -5126,14 +5044,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode)
 #endif
 
 #ifndef NO_GetProcAddress
-JNIEXPORT jint JNICALL OS_NATIVE(GetProcAddress)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcAddress)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcAddress_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetProcAddress((HMODULE)arg0, (LPCTSTR)lparg1);
+	rc = (jintLong)GetProcAddress((HMODULE)arg0, (LPCTSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetProcAddress_FUNC);
@@ -5142,12 +5060,12 @@ fail:
 #endif
 
 #ifndef NO_GetProcessHeap
-JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeap)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcessHeap)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcessHeap_FUNC);
-	rc = (jint)GetProcessHeap();
+	rc = (jintLong)GetProcessHeap();
 	OS_NATIVE_EXIT(env, that, GetProcessHeap_FUNC);
 	return rc;
 }
@@ -5155,15 +5073,15 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeap)
 
 #ifndef NO_GetProcessHeaps
 JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeaps)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcessHeaps_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)GetProcessHeaps(arg0, (PHANDLE)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetProcessHeaps_FUNC);
 	return rc;
 }
@@ -5220,24 +5138,24 @@ fail:
 #endif
 
 #ifndef NO_GetPropA
-JNIEXPORT jint JNICALL OS_NATIVE(GetPropA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPropA_FUNC);
-	rc = (jint)GetPropA((HWND)arg0, (LPCTSTR)arg1);
+	rc = (jintLong)GetPropA((HWND)arg0, (LPCTSTR)arg1);
 	OS_NATIVE_EXIT(env, that, GetPropA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetPropW
-JNIEXPORT jint JNICALL OS_NATIVE(GetPropW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPropW_FUNC);
-	rc = (jint)GetPropW((HWND)arg0, (LPCWSTR)arg1);
+	rc = (jintLong)GetPropW((HWND)arg0, (LPCWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, GetPropW_FUNC);
 	return rc;
 }
@@ -5245,7 +5163,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPropW)
 
 #ifndef NO_GetROP2
 JNIEXPORT jint JNICALL OS_NATIVE(GetROP2)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetROP2_FUNC);
@@ -5257,7 +5175,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetROP2)
 
 #ifndef NO_GetRandomRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetRandomRgn_FUNC);
@@ -5269,7 +5187,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn)
 
 #ifndef NO_GetRegionData
 JNIEXPORT jint JNICALL OS_NATIVE(GetRegionData)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -5299,7 +5217,7 @@ fail:
 
 #ifndef NO_GetRgnBox
 JNIEXPORT jint JNICALL OS_NATIVE(GetRgnBox)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -5347,7 +5265,7 @@ fail:
 
 #ifndef NO_GetScrollBarInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollBarInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	SCROLLBARINFO _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -5363,7 +5281,7 @@ fail:
 
 #ifndef NO_GetScrollInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	SCROLLINFO _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -5406,12 +5324,12 @@ fail:
 #endif
 
 #ifndef NO_GetStockObject
-JNIEXPORT jint JNICALL OS_NATIVE(GetStockObject)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetStockObject)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetStockObject_FUNC);
-	rc = (jint)GetStockObject(arg0);
+	rc = (jintLong)GetStockObject(arg0);
 	OS_NATIVE_EXIT(env, that, GetStockObject_FUNC);
 	return rc;
 }
@@ -5430,12 +5348,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSysColor)
 #endif
 
 #ifndef NO_GetSysColorBrush
-JNIEXPORT jint JNICALL OS_NATIVE(GetSysColorBrush)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetSysColorBrush)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSysColorBrush_FUNC);
-	rc = (jint)GetSysColorBrush(arg0);
+	rc = (jintLong)GetSysColorBrush(arg0);
 	OS_NATIVE_EXIT(env, that, GetSysColorBrush_FUNC);
 	return rc;
 }
@@ -5451,17 +5369,9 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
 	rc = (jshort)GetSystemDefaultUILanguage();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetSystemDefaultUILanguage_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetSystemDefaultUILanguage");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetSystemDefaultUILanguage)
 		if (fp) {
-			rc = (jshort)fp();
+			rc = (jshort)((jshort (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetSystemDefaultUILanguage_FUNC);
@@ -5470,12 +5380,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
 #endif
 
 #ifndef NO_GetSystemMenu
-JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMenu)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetSystemMenu)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSystemMenu_FUNC);
-	rc = (jint)GetSystemMenu((HWND)arg0, arg1);
+	rc = (jintLong)GetSystemMenu((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetSystemMenu_FUNC);
 	return rc;
 }
@@ -5495,7 +5405,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMetrics)
 
 #ifndef NO_GetSystemPaletteEntries
 JNIEXPORT jint JNICALL OS_NATIVE(GetSystemPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -5525,7 +5435,7 @@ fail:
 
 #ifndef NO_GetTextCharset
 JNIEXPORT jint JNICALL OS_NATIVE(GetTextCharset)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetTextCharset_FUNC);
@@ -5537,7 +5447,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextCharset)
 
 #ifndef NO_GetTextColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetTextColor_FUNC);
@@ -5549,7 +5459,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor)
 
 #ifndef NO_GetTextExtentPoint32A
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32A)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3)
 {
 	jbyte *lparg1=NULL;
 	SIZE _arg3, *lparg3=NULL;
@@ -5582,7 +5492,7 @@ fail:
 
 #ifndef NO_GetTextExtentPoint32W
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32W)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3)
 {
 	jchar *lparg1=NULL;
 	SIZE _arg3, *lparg3=NULL;
@@ -5615,7 +5525,7 @@ fail:
 
 #ifndef NO_GetTextMetricsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	TEXTMETRICA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -5631,7 +5541,7 @@ fail:
 
 #ifndef NO_GetTextMetricsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	TEXTMETRICW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -5647,7 +5557,7 @@ fail:
 
 #ifndef NO_GetThemeBackgroundContentRect
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -5659,17 +5569,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect)
 	rc = (jint)GetThemeBackgroundContentRect(arg0, arg1, arg2, arg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeBackgroundContentRect_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeBackgroundContentRect");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeBackgroundContentRect)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -5682,7 +5584,7 @@ fail:
 
 #ifndef NO_GetThemeBackgroundExtent
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -5694,17 +5596,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent)
 	rc = (jint)GetThemeBackgroundExtent(arg0, arg1, arg2, arg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeBackgroundExtent_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeBackgroundExtent");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeBackgroundExtent)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -5716,7 +5610,7 @@ fail:
 
 #ifndef NO_GetThemeColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -5726,17 +5620,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor)
 	rc = (jint)GetThemeColor(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeColor_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeColor");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeColor)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5748,7 +5634,7 @@ fail:
 
 #ifndef NO_GetThemeInt
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -5758,17 +5644,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt)
 	rc = (jint)GetThemeInt(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeInt_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeInt");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeInt)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5780,7 +5658,7 @@ fail:
 
 #ifndef NO_GetThemeMargins
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
 {
 	RECT _arg5, *lparg5=NULL;
 	MARGINS _arg6, *lparg6=NULL;
@@ -5792,17 +5670,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins)
 	rc = (jint)GetThemeMargins(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeMargins_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeMargins");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeMargins)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, MARGINS *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
 		}
 	}
 fail:
@@ -5815,7 +5685,7 @@ fail:
 
 #ifndef NO_GetThemeMetric
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
@@ -5825,17 +5695,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric)
 	rc = (jint)GetThemeMetric(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeMetric_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeMetric");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeMetric)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
@@ -5847,7 +5709,7 @@ fail:
 
 #ifndef NO_GetThemePartSize
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
 {
 	RECT _arg4, *lparg4=NULL;
 	SIZE _arg6, *lparg6=NULL;
@@ -5859,17 +5721,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize)
 	rc = (jint)GetThemePartSize(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemePartSize_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemePartSize");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemePartSize)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, SIZE *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
 		}
 	}
 fail:
@@ -5882,7 +5736,7 @@ fail:
 
 #ifndef NO_GetThemeRect
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
 {
 	RECT _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -5892,17 +5746,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect)
 	rc = (jint)GetThemeRect(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeRect_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeRect");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeRect)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5914,7 +5760,7 @@ fail:
 
 #ifndef NO_GetThemeSysSize
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetThemeSysSize_FUNC);
@@ -5922,17 +5768,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
 	rc = (jint)GetThemeSysSize(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeSysSize_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeSysSize");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeSysSize)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetThemeSysSize_FUNC);
@@ -5942,7 +5780,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
 
 #ifndef NO_GetThemeTextExtent
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8)
 {
 	jchar *lparg4=NULL;
 	RECT _arg7, *lparg7=NULL;
@@ -5956,17 +5794,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent)
 	rc = (jint)GetThemeTextExtent(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeTextExtent_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeTextExtent");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeTextExtent)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
 		}
 	}
 fail:
@@ -6036,7 +5866,7 @@ fail:
 
 #ifndef NO_GetUpdateRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetUpdateRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6052,7 +5882,7 @@ fail:
 
 #ifndef NO_GetUpdateRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetUpdateRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetUpdateRgn_FUNC);
@@ -6127,24 +5957,24 @@ fail:
 #endif
 
 #ifndef NO_GetWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindow)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindow_FUNC);
-	rc = (jint)GetWindow((HWND)arg0, arg1);
+	rc = (jintLong)GetWindow((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindow_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetWindowDC
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowDC_FUNC);
-	rc = (jint)GetWindowDC((HWND)arg0);
+	rc = (jintLong)GetWindowDC((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetWindowDC_FUNC);
 	return rc;
 }
@@ -6152,7 +5982,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowDC)
 
 #ifndef NO_GetWindowLongA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongA_FUNC);
@@ -6163,24 +5993,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
 #endif
 
 #ifndef NO_GetWindowLongPtrA
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongPtrA_FUNC);
-	rc = (jint)GetWindowLongPtrA((HWND)arg0, arg1);
+	rc = (jintLong)GetWindowLongPtrA((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindowLongPtrA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetWindowLongPtrW
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongPtrW_FUNC);
-	rc = (jint)GetWindowLongPtrW((HWND)arg0, arg1);
+	rc = (jintLong)GetWindowLongPtrW((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindowLongPtrW_FUNC);
 	return rc;
 }
@@ -6188,7 +6018,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrW)
 
 #ifndef NO_GetWindowLongW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongW_FUNC);
@@ -6200,7 +6030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongW)
 
 #ifndef NO_GetWindowOrgEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowOrgEx)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6216,7 +6046,7 @@ fail:
 
 #ifndef NO_GetWindowPlacement
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowPlacement)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	WINDOWPLACEMENT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6232,7 +6062,7 @@ fail:
 
 #ifndef NO_GetWindowRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6248,7 +6078,7 @@ fail:
 
 #ifndef NO_GetWindowRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowRgn_FUNC);
@@ -6260,7 +6090,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn)
 
 #ifndef NO_GetWindowTextA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -6276,7 +6106,7 @@ fail:
 
 #ifndef NO_GetWindowTextLengthA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthA)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTextLengthA_FUNC);
@@ -6288,7 +6118,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthA)
 
 #ifndef NO_GetWindowTextLengthW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthW)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTextLengthW_FUNC);
@@ -6300,7 +6130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthW)
 
 #ifndef NO_GetWindowTextW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -6315,26 +6145,18 @@ fail:
 #endif
 
 #ifndef NO_GetWindowTheme
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTheme)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowTheme)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTheme_FUNC);
 /*
-	rc = (jint)GetWindowTheme((HWND)arg0);
+	rc = (jintLong)GetWindowTheme((HWND)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetWindowTheme_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetWindowTheme");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetWindowTheme)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetWindowTheme_FUNC);
@@ -6344,7 +6166,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTheme)
 
 #ifndef NO_GetWindowThreadProcessId
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowThreadProcessId)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
 	jint rc = 0;
@@ -6360,7 +6182,7 @@ fail:
 
 #ifndef NO_GetWorldTransform
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWorldTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1)
 {
 	jfloat *lparg1=NULL;
 	jboolean rc = 0;
@@ -6407,36 +6229,36 @@ fail:
 #endif
 
 #ifndef NO_GlobalAlloc
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalAlloc)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalAlloc)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalAlloc_FUNC);
-	rc = (jint)GlobalAlloc(arg0, arg1);
+	rc = (jintLong)GlobalAlloc(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GlobalAlloc_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GlobalFree
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalFree)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalFree)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalFree_FUNC);
-	rc = (jint)GlobalFree((HANDLE)arg0);
+	rc = (jintLong)GlobalFree((HANDLE)arg0);
 	OS_NATIVE_EXIT(env, that, GlobalFree_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GlobalLock
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalLock)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalLock)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalLock_FUNC);
-	rc = (jint)GlobalLock((HANDLE)arg0);
+	rc = (jintLong)GlobalLock((HANDLE)arg0);
 	OS_NATIVE_EXIT(env, that, GlobalLock_FUNC);
 	return rc;
 }
@@ -6444,7 +6266,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GlobalLock)
 
 #ifndef NO_GlobalSize
 JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalSize_FUNC);
@@ -6456,7 +6278,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize)
 
 #ifndef NO_GlobalUnlock
 JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalUnlock_FUNC);
@@ -6468,7 +6290,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock)
 
 #ifndef NO_GradientFill
 JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jint arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GradientFill_FUNC);
@@ -6476,17 +6298,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
 	rc = (jboolean)GradientFill((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GradientFill_LIB);
-			if (hm) fp = GetProcAddress(hm, "GradientFill");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GradientFill)
 		if (fp) {
-			rc = (jboolean)fp((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG))fp)((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GradientFill_FUNC);
@@ -6556,7 +6370,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIGHCONTRAST_1sizeof)
 
 #ifndef NO_HIWORD
 JNIEXPORT jint JNICALL OS_NATIVE(HIWORD)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, HIWORD_FUNC);
@@ -6567,12 +6381,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWORD)
 #endif
 
 #ifndef NO_HeapAlloc
-JNIEXPORT jint JNICALL OS_NATIVE(HeapAlloc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(HeapAlloc)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapAlloc_FUNC);
-	rc = (jint)HeapAlloc((HANDLE)arg0, arg1, arg2);
+	rc = (jintLong)HeapAlloc((HANDLE)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, HeapAlloc_FUNC);
 	return rc;
 }
@@ -6580,7 +6394,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HeapAlloc)
 
 #ifndef NO_HeapFree
 JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapFree_FUNC);
@@ -6592,7 +6406,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree)
 
 #ifndef NO_HeapValidate
 JNIEXPORT jboolean JNICALL OS_NATIVE(HeapValidate)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapValidate_FUNC);
@@ -6604,7 +6418,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapValidate)
 
 #ifndef NO_HideCaret
 JNIEXPORT jboolean JNICALL OS_NATIVE(HideCaret)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HideCaret_FUNC);
@@ -6616,7 +6430,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HideCaret)
 
 #ifndef NO_HitTestThemeBackground
 JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jshortArray arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jintLong arg6, jobject arg7, jshortArray arg8)
 {
 	RECT _arg5, *lparg5=NULL;
 	POINT _arg7, *lparg7=NULL;
@@ -6630,17 +6444,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground)
 	rc = (jint)HitTestThemeBackground(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(HitTestThemeBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "HitTestThemeBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, HitTestThemeBackground)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, jintLong, POINT, jshort *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
 		}
 	}
 fail:
@@ -6709,7 +6515,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(INPUT_1sizeof)
 
 #ifndef NO_ImageList_1Add
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Add_FUNC);
@@ -6721,7 +6527,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add)
 
 #ifndef NO_ImageList_1AddMasked
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1AddMasked_FUNC);
@@ -6733,7 +6539,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked)
 
 #ifndef NO_ImageList_1BeginDrag
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1BeginDrag_FUNC);
@@ -6744,12 +6550,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag)
 #endif
 
 #ifndef NO_ImageList_1Create
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Create)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1Create)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Create_FUNC);
-	rc = (jint)ImageList_Create(arg0, arg1, arg2, arg3, arg4);
+	rc = (jintLong)ImageList_Create(arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, ImageList_1Create_FUNC);
 	return rc;
 }
@@ -6757,7 +6563,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Create)
 
 #ifndef NO_ImageList_1Destroy
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Destroy_FUNC);
@@ -6769,7 +6575,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy)
 
 #ifndef NO_ImageList_1DragEnter
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1DragEnter_FUNC);
@@ -6781,7 +6587,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter)
 
 #ifndef NO_ImageList_1DragLeave
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragLeave)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1DragLeave_FUNC);
@@ -6817,7 +6623,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragShowNolock)
 
 #ifndef NO_ImageList_1Draw
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Draw)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4, jint arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Draw_FUNC);
@@ -6838,16 +6644,16 @@ JNIEXPORT void JNICALL OS_NATIVE(ImageList_1EndDrag)
 #endif
 
 #ifndef NO_ImageList_1GetDragImage
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetDragImage)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1GetDragImage)
 	(JNIEnv *env, jclass that, jobject arg0, jobject arg1)
 {
 	POINT _arg0, *lparg0=NULL;
 	POINT _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetDragImage_FUNC);
 	if (arg0) if ((lparg0 = getPOINTFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPOINTFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)ImageList_GetDragImage((POINT *)lparg0, (POINT *)lparg1);
+	rc = (jintLong)ImageList_GetDragImage((POINT *)lparg0, (POINT *)lparg1);
 fail:
 	if (arg1 && lparg1) setPOINTFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0);
@@ -6857,12 +6663,12 @@ fail:
 #endif
 
 #ifndef NO_ImageList_1GetIcon
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1GetIcon)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetIcon_FUNC);
-	rc = (jint)ImageList_GetIcon((HIMAGELIST)arg0, arg1, arg2);
+	rc = (jintLong)ImageList_GetIcon((HIMAGELIST)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, ImageList_1GetIcon_FUNC);
 	return rc;
 }
@@ -6870,7 +6676,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetIcon)
 
 #ifndef NO_ImageList_1GetIconSize
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1GetIconSize)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -6889,7 +6695,7 @@ fail:
 
 #ifndef NO_ImageList_1GetImageCount
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetImageCount_FUNC);
@@ -6901,7 +6707,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount)
 
 #ifndef NO_ImageList_1Remove
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Remove_FUNC);
@@ -6913,7 +6719,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove)
 
 #ifndef NO_ImageList_1Replace
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Replace_FUNC);
@@ -6925,7 +6731,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace)
 
 #ifndef NO_ImageList_1ReplaceIcon
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1ReplaceIcon_FUNC);
@@ -6937,7 +6743,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon)
 
 #ifndef NO_ImageList_1SetIconSize
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1SetIconSize_FUNC);
@@ -6948,24 +6754,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize)
 #endif
 
 #ifndef NO_ImmAssociateContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmAssociateContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmAssociateContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmAssociateContext_FUNC);
-	rc = (jint)ImmAssociateContext((HWND)arg0, (HIMC)arg1);
+	rc = (jintLong)ImmAssociateContext((HWND)arg0, (HIMC)arg1);
 	OS_NATIVE_EXIT(env, that, ImmAssociateContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ImmCreateContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmCreateContext)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmCreateContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmCreateContext_FUNC);
-	rc = (jint)ImmCreateContext();
+	rc = (jintLong)ImmCreateContext();
 	OS_NATIVE_EXIT(env, that, ImmCreateContext_FUNC);
 	return rc;
 }
@@ -6973,7 +6779,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmCreateContext)
 
 #ifndef NO_ImmDestroyContext
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDestroyContext)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmDestroyContext_FUNC);
@@ -6993,17 +6799,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService)
 	rc = (jboolean)ImmDisableTextFrameService(arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(ImmDisableTextFrameService_LIB);
-			if (hm) fp = GetProcAddress(hm, "ImmDisableTextFrameService");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, ImmDisableTextFrameService)
 		if (fp) {
-			rc = (jboolean)fp(arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, ImmDisableTextFrameService_FUNC);
@@ -7013,7 +6811,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService)
 
 #ifndef NO_ImmGetCompositionFontA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7029,7 +6827,7 @@ fail:
 
 #ifndef NO_ImmGetCompositionFontW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7045,7 +6843,7 @@ fail:
 
 #ifndef NO_ImmGetCompositionStringA
 JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -7059,45 +6857,67 @@ fail:
 }
 #endif
 
-#ifndef NO_ImmGetCompositionStringW__II_3CI
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+#if (!defined(NO_ImmGetCompositionStringW__II_3CI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3CI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_ImmGetCompositionStringW__II_3II
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+#if (!defined(NO_ImmGetCompositionStringW__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3II) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+#endif
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_ImmGetContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetContext)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetContext)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetContext_FUNC);
-	rc = (jint)ImmGetContext((HWND)arg0);
+	rc = (jintLong)ImmGetContext((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, ImmGetContext_FUNC);
 	return rc;
 }
@@ -7105,7 +6925,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmGetContext)
 
 #ifndef NO_ImmGetConversionStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetConversionStatus)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -7123,12 +6943,12 @@ fail:
 #endif
 
 #ifndef NO_ImmGetDefaultIMEWnd
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetDefaultIMEWnd_FUNC);
-	rc = (jint)ImmGetDefaultIMEWnd((HWND)arg0);
+	rc = (jintLong)ImmGetDefaultIMEWnd((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, ImmGetDefaultIMEWnd_FUNC);
 	return rc;
 }
@@ -7136,7 +6956,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
 
 #ifndef NO_ImmGetOpenStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetOpenStatus_FUNC);
@@ -7148,7 +6968,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus)
 
 #ifndef NO_ImmNotifyIME
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmNotifyIME_FUNC);
@@ -7160,7 +6980,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME)
 
 #ifndef NO_ImmReleaseContext
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmReleaseContext_FUNC);
@@ -7172,7 +6992,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext)
 
 #ifndef NO_ImmSetCandidateWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCandidateWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	CANDIDATEFORM _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7188,7 +7008,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionFontA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7204,7 +7024,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionFontW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7220,7 +7040,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	COMPOSITIONFORM _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7236,7 +7056,7 @@ fail:
 
 #ifndef NO_ImmSetConversionStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmSetConversionStatus_FUNC);
@@ -7248,7 +7068,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus)
 
 #ifndef NO_ImmSetOpenStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetOpenStatus)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmSetOpenStatus_FUNC);
@@ -7298,7 +7118,7 @@ fail:
 
 #ifndef NO_InsertMenuA
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
 	jboolean rc = 0;
@@ -7314,7 +7134,7 @@ fail:
 
 #ifndef NO_InsertMenuItemA
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -7330,7 +7150,7 @@ fail:
 
 #ifndef NO_InsertMenuItemW
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -7346,7 +7166,7 @@ fail:
 
 #ifndef NO_InsertMenuW
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jcharArray arg4)
 {
 	jchar *lparg4=NULL;
 	jboolean rc = 0;
@@ -7362,7 +7182,7 @@ fail:
 
 #ifndef NO_InternetSetOption
 JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, InternetSetOption_FUNC);
@@ -7374,7 +7194,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption)
 
 #ifndef NO_IntersectClipRect
 JNIEXPORT jint JNICALL OS_NATIVE(IntersectClipRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, IntersectClipRect_FUNC);
@@ -7406,7 +7226,7 @@ fail:
 
 #ifndef NO_InvalidateRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7422,7 +7242,7 @@ fail:
 
 #ifndef NO_InvalidateRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, InvalidateRgn_FUNC);
@@ -7442,17 +7262,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed)
 	rc = (jboolean)IsAppThemed();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(IsAppThemed_LIB);
-			if (hm) fp = GetProcAddress(hm, "IsAppThemed");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, IsAppThemed)
 		if (fp) {
-			rc = (jboolean)fp();
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, IsAppThemed_FUNC);
@@ -7462,7 +7274,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed)
 
 #ifndef NO_IsBadReadPtr
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadReadPtr)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsBadReadPtr_FUNC);
@@ -7474,7 +7286,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadReadPtr)
 
 #ifndef NO_IsBadWritePtr
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadWritePtr)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsBadWritePtr_FUNC);
@@ -7498,7 +7310,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsDBCSLeadByte)
 
 #ifndef NO_IsHungAppWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsHungAppWindow_FUNC);
@@ -7506,17 +7318,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
 	rc = (jboolean)IsHungAppWindow((HWND)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(IsHungAppWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "IsHungAppWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, IsHungAppWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, IsHungAppWindow_FUNC);
@@ -7526,7 +7330,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
 
 #ifndef NO_IsIconic
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsIconic_FUNC);
@@ -7538,7 +7342,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic)
 
 #ifndef NO_IsWindowEnabled
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsWindowEnabled_FUNC);
@@ -7550,7 +7354,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled)
 
 #ifndef NO_IsWindowVisible
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsWindowVisible_FUNC);
@@ -7562,7 +7366,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible)
 
 #ifndef NO_IsZoomed
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsZoomed)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsZoomed_FUNC);
@@ -7586,7 +7390,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(KEYBDINPUT_1sizeof)
 
 #ifndef NO_KillTimer
 JNIEXPORT jboolean JNICALL OS_NATIVE(KillTimer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, KillTimer_FUNC);
@@ -7658,7 +7462,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOGPEN_1sizeof)
 
 #ifndef NO_LOWORD
 JNIEXPORT jint JNICALL OS_NATIVE(LOWORD)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, LOWORD_FUNC);
@@ -7670,7 +7474,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOWORD)
 
 #ifndef NO_LPtoDP
 JNIEXPORT jboolean JNICALL OS_NATIVE(LPtoDP)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7722,7 +7526,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LVITEM_1sizeof)
 
 #ifndef NO_LineTo
 JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, LineTo_FUNC);
@@ -7733,142 +7537,186 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
 #endif
 
 #ifndef NO_LoadBitmapA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadBitmapA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadBitmapA_FUNC);
-	rc = (jint)LoadBitmapA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadBitmapA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadBitmapA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadBitmapW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadBitmapW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadBitmapW_FUNC);
-	rc = (jint)LoadBitmapW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadBitmapW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadBitmapW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadCursorA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadCursorA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadCursorA_FUNC);
-	rc = (jint)LoadCursorA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadCursorA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadCursorA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadCursorW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadCursorW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadCursorW_FUNC);
-	rc = (jint)LoadCursorW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadCursorW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadCursorW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadIconA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadIconA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadIconA_FUNC);
-	rc = (jint)LoadIconA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadIconA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadIconA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadIconW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadIconW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadIconW_FUNC);
-	rc = (jint)LoadIconW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadIconW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadIconW_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageA__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageA__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageA__IIIIII) && !defined(JNI64)) || (!defined(NO_LoadImageA__JJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__JJIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageA__IIIIII_FUNC);
-	rc = (jint)LoadImageA((HINSTANCE)arg0, (LPSTR)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageA__JJIIII_FUNC);
+#endif
+	rc = (jintLong)LoadImageA((HINSTANCE)arg0, (LPSTR)arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageA__IIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageA__JJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageA__I_3BIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageA__I_3BIIII)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageA__I_3BIIII) && !defined(JNI64)) || (!defined(NO_LoadImageA__J_3BIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__I_3BIIII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__J_3BIIII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageA__I_3BIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageA__J_3BIIII_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)LoadImageA((HINSTANCE)arg0, (LPSTR)lparg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)LoadImageA((HINSTANCE)arg0, (LPSTR)lparg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageA__I_3BIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageA__J_3BIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageW__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageW__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageW__IIIIII) && !defined(JNI64)) || (!defined(NO_LoadImageW__JJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__JJIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageW__IIIIII_FUNC);
-	rc = (jint)LoadImageW((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageW__JJIIII_FUNC);
+#endif
+	rc = (jintLong)LoadImageW((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageW__IIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageW__JJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageW__I_3CIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageW__I_3CIIII)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageW__I_3CIIII) && !defined(JNI64)) || (!defined(NO_LoadImageW__J_3CIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__I_3CIIII)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__J_3CIIII)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageW__I_3CIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageW__J_3CIIII_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)LoadImageW((HINSTANCE)arg0, (LPWSTR)lparg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)LoadImageW((HINSTANCE)arg0, (LPWSTR)lparg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageW__I_3CIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageW__J_3CIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadLibraryA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadLibraryA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadLibraryA)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadLibraryA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)LoadLibraryA((LPSTR)lparg0);
+	rc = (jintLong)LoadLibraryA((LPSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, LoadLibraryA_FUNC);
@@ -7877,14 +7725,14 @@ fail:
 #endif
 
 #ifndef NO_LoadLibraryW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadLibraryW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadLibraryW)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadLibraryW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)LoadLibraryW((LPWSTR)lparg0);
+	rc = (jintLong)LoadLibraryW((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, LoadLibraryW_FUNC);
@@ -7894,7 +7742,7 @@ fail:
 
 #ifndef NO_LoadStringA
 JNIEXPORT jint JNICALL OS_NATIVE(LoadStringA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -7910,7 +7758,7 @@ fail:
 
 #ifndef NO_LoadStringW
 JNIEXPORT jint JNICALL OS_NATIVE(LoadStringW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
@@ -7925,12 +7773,12 @@ fail:
 #endif
 
 #ifndef NO_LocalFree
-JNIEXPORT jint JNICALL OS_NATIVE(LocalFree)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LocalFree)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LocalFree_FUNC);
-	rc = (jint)LocalFree((HLOCAL)arg0);
+	rc = (jintLong)LocalFree((HLOCAL)arg0);
 	OS_NATIVE_EXIT(env, that, LocalFree_FUNC);
 	return rc;
 }
@@ -7938,7 +7786,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LocalFree)
 
 #ifndef NO_LockWindowUpdate
 JNIEXPORT jboolean JNICALL OS_NATIVE(LockWindowUpdate)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, LockWindowUpdate_FUNC);
@@ -7949,24 +7797,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LockWindowUpdate)
 #endif
 
 #ifndef NO_MAKELPARAM
-JNIEXPORT jint JNICALL OS_NATIVE(MAKELPARAM)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELPARAM)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKELPARAM_FUNC);
-	rc = (jint)MAKELPARAM(arg0, arg1);
+	rc = (jintLong)MAKELPARAM(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKELPARAM_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_MAKELRESULT
-JNIEXPORT jint JNICALL OS_NATIVE(MAKELRESULT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELRESULT)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKELRESULT_FUNC);
-	rc = (jint)MAKELRESULT(arg0, arg1);
+	rc = (jintLong)MAKELRESULT(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKELRESULT_FUNC);
 	return rc;
 }
@@ -7985,12 +7833,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(MAKEWORD)
 #endif
 
 #ifndef NO_MAKEWPARAM
-JNIEXPORT jint JNICALL OS_NATIVE(MAKEWPARAM)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKEWPARAM)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKEWPARAM_FUNC);
-	rc = (jint)MAKEWPARAM(arg0, arg1);
+	rc = (jintLong)MAKEWPARAM(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKEWPARAM_FUNC);
 	return rc;
 }
@@ -8030,17 +7878,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass)
 	rc = (jboolean)MCIWndRegisterClass();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(MCIWndRegisterClass_LIB);
-			if (hm) fp = GetProcAddress(hm, "MCIWndRegisterClass");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, MCIWndRegisterClass)
 		if (fp) {
-			rc = (jboolean)fp();
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, MCIWndRegisterClass_FUNC);
@@ -8168,34 +8008,56 @@ JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyW)
 }
 #endif
 
-#ifndef NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	POINT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -8214,7 +8076,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MessageBeep)
 
 #ifndef NO_MessageBoxA
 JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -8233,7 +8095,7 @@ fail:
 
 #ifndef NO_MessageBoxW
 JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
@@ -8251,26 +8113,18 @@ fail:
 #endif
 
 #ifndef NO_MonitorFromWindow
-JNIEXPORT jint JNICALL OS_NATIVE(MonitorFromWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MonitorFromWindow_FUNC);
 /*
-	rc = (jint)MonitorFromWindow(arg0, arg1);
+	rc = (jintLong)MonitorFromWindow(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(MonitorFromWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "MonitorFromWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, MonitorFromWindow)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, MonitorFromWindow_FUNC);
@@ -8278,322 +8132,593 @@ JNIEXPORT jint JNICALL OS_NATIVE(MonitorFromWindow)
 }
 #endif
 
-#ifndef NO_MoveMemory__III
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__III) && !defined(JNI64)) || (!defined(NO_MoveMemory__JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JJI_FUNC);
+#endif
 	MoveMemory((PVOID)arg0, (CONST VOID *)arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	DOCHOSTUIINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getDOCHOSTUIINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	DROPFILES _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getDROPFILESFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GRADIENT_RECT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGRADIENT_RECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	KEYBDINPUT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getKEYBDINPUTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	LOGFONTA _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getLOGFONTAFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	LOGFONTW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getLOGFONTWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MEASUREITEMSTRUCT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMEASUREITEMSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MINMAXINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMINMAXINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MOUSEINPUT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMOUSEINPUTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MSG _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMSGFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMLVCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMLVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMLVDISPINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMLVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOA _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTDISPINFOAFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTDISPINFOWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTVCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTVDISPINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	OPENFILENAME _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getOPENFILENAMEFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setOPENFILENAMEFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	RECT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	SHDRAGIMAGE _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSHDRAGIMAGEFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	TRIVERTEX _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getTRIVERTEXFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	UDACCEL _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getUDACCELFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	WINDOWPOS _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getWINDOWPOSFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3BI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3BI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8612,16 +8737,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3BI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3CI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3CI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3CI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
+#endif
 {
 	jchar *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3CI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8640,16 +8776,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3CI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3DI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3DI)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3DI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3DI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2)
+#endif
 {
 	jdouble *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3DI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3DI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8668,16 +8815,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3DI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3DI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3FI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3FI)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3FI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3FI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
+#endif
 {
 	jfloat *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3FI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3FI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8696,16 +8854,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3FI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3FI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3II)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3II) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
+#endif
 {
 	jint *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3II_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8724,16 +8893,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3II_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3JI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3JI)
-	(JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3JI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2)
+#endif
 {
 	jlong *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3JI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3JI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8752,16 +8932,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3JI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3SI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3SI)
-	(JNIEnv *env, jclass that, jint arg0, jshortArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3SI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3SI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2)
+#endif
 {
 	jshort *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3SI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3SI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8780,21 +8971,36 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3SI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3SI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	BITMAPINFOHEADER _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setBITMAPINFOHEADERFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC);
+#endif
 }
 #endif
 
@@ -8829,521 +9035,928 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DOCHOSTUIINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDOCHOSTUIINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DRAWITEMSTRUCT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDRAWITEMSTRUCTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EMREXTCREATEFONTINDIRECTW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEMREXTCREATEFONTINDIRECTWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EMR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEMRFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EXTLOGPEN _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEXTLOGPENFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	HDITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setHDITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	HELPINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setHELPINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	LOGFONTA _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setLOGFONTAFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	LOGFONTW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setLOGFONTWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MEASUREITEMSTRUCT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMEASUREITEMSTRUCTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MINMAXINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMINMAXINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MSG _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMCUSTOMDRAW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMCUSTOMDRAWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II) && !define