*** empty log message ***

200 files changed, 4851 insertions, 1734 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
index dea73938c7..2a47fdf052 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
@@ -15,6 +15,18 @@
 
 #define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func
 
+#ifndef NO_CAUUID_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(CAUUID_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, CAUUID_1sizeof_FUNC);
+	rc = (jint)CAUUID_sizeof();
+	COM_NATIVE_EXIT(env, that, CAUUID_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_CLSIDFromProgID
 JNIEXPORT jint JNICALL COM_NATIVE(CLSIDFromProgID)
 	(JNIEnv *env, jclass that, jcharArray arg0, jobject arg1)
@@ -53,6 +65,30 @@ fail:
 }
 #endif
 
+#ifndef NO_CONTROLINFO_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(CONTROLINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, CONTROLINFO_1sizeof_FUNC);
+	rc = (jint)CONTROLINFO_sizeof();
+	COM_NATIVE_EXIT(env, that, CONTROLINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_COSERVERINFO_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(COSERVERINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, COSERVERINFO_1sizeof_FUNC);
+	rc = (jint)COSERVERINFO_sizeof();
+	COM_NATIVE_EXIT(env, that, COSERVERINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_CoCreateInstance
 JNIEXPORT jint JNICALL COM_NATIVE(CoCreateInstance)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
@@ -176,6 +212,30 @@ fail:
 }
 #endif
 
+#ifndef NO_DISPPARAMS_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(DISPPARAMS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, DISPPARAMS_1sizeof_FUNC);
+	rc = (jint)DISPPARAMS_sizeof();
+	COM_NATIVE_EXIT(env, that, DISPPARAMS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DVTARGETDEVICE_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(DVTARGETDEVICE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, DVTARGETDEVICE_1sizeof_FUNC);
+	rc = (jint)DVTARGETDEVICE_sizeof();
+	COM_NATIVE_EXIT(env, that, DVTARGETDEVICE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_DoDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(DoDragDrop)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
@@ -192,6 +252,54 @@ fail:
 }
 #endif
 
+#ifndef NO_EXCEPINFO_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(EXCEPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, EXCEPINFO_1sizeof_FUNC);
+	rc = (jint)EXCEPINFO_sizeof();
+	COM_NATIVE_EXIT(env, that, EXCEPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_FORMATETC_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(FORMATETC_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, FORMATETC_1sizeof_FUNC);
+	rc = (jint)FORMATETC_sizeof();
+	COM_NATIVE_EXIT(env, that, FORMATETC_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_FUNCDESC_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(FUNCDESC_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, FUNCDESC_1sizeof_FUNC);
+	rc = (jint)FUNCDESC_sizeof();
+	COM_NATIVE_EXIT(env, that, FUNCDESC_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GUID_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(GUID_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, GUID_1sizeof_FUNC);
+	rc = (jint)GUID_sizeof();
+	COM_NATIVE_EXIT(env, that, GUID_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GetClassFile
 JNIEXPORT jint JNICALL COM_NATIVE(GetClassFile)
 	(JNIEnv *env, jclass that, jcharArray arg0, jobject arg1)
@@ -249,6 +357,18 @@ fail:
 }
 #endif
 
+#ifndef NO_LICINFO_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(LICINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, LICINFO_1sizeof_FUNC);
+	rc = (jint)LICINFO_sizeof();
+	COM_NATIVE_EXIT(env, that, LICINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_LresultFromObject
 JNIEXPORT jint JNICALL COM_NATIVE(LresultFromObject)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
@@ -458,6 +578,20 @@ fail:
 }
 #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)
+{
+	VARIANT _arg0, *lparg0=NULL;
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
+	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
+fail:
+	if (arg0 && lparg0) setVARIANTFields(env, arg0, lparg0);
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+}
+#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)
@@ -472,6 +606,30 @@ fail:
 }
 #endif
 
+#ifndef NO_OLECMD_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(OLECMD_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, OLECMD_1sizeof_FUNC);
+	rc = (jint)OLECMD_sizeof();
+	COM_NATIVE_EXIT(env, that, OLECMD_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_OLEINPLACEFRAMEINFO_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(OLEINPLACEFRAMEINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, OLEINPLACEFRAMEINFO_1sizeof_FUNC);
+	rc = (jint)OLEINPLACEFRAMEINFO_sizeof();
+	COM_NATIVE_EXIT(env, that, OLEINPLACEFRAMEINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #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)
@@ -756,6 +914,30 @@ JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop)
 }
 #endif
 
+#ifndef NO_STATSTG_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(STATSTG_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, STATSTG_1sizeof_FUNC);
+	rc = (jint)STATSTG_sizeof();
+	COM_NATIVE_EXIT(env, that, STATSTG_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_STGMEDIUM_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(STGMEDIUM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, STGMEDIUM_1sizeof_FUNC);
+	rc = (jint)STGMEDIUM_sizeof();
+	COM_NATIVE_EXIT(env, that, STGMEDIUM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_StgCreateDocfile
 JNIEXPORT jint JNICALL COM_NATIVE(StgCreateDocfile)
 	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintArray arg3)
@@ -867,6 +1049,42 @@ JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen)
 }
 #endif
 
+#ifndef NO_TYPEATTR_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(TYPEATTR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, TYPEATTR_1sizeof_FUNC);
+	rc = (jint)TYPEATTR_sizeof();
+	COM_NATIVE_EXIT(env, that, TYPEATTR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VARDESC_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(VARDESC_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VARDESC_1sizeof_FUNC);
+	rc = (jint)VARDESC_sizeof();
+	COM_NATIVE_EXIT(env, that, VARDESC_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VARIANT_1sizeof
+JNIEXPORT jint JNICALL COM_NATIVE(VARIANT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VARIANT_1sizeof_FUNC);
+	rc = (jint)VARIANT_sizeof();
+	COM_NATIVE_EXIT(env, that, VARIANT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_VariantChangeType
 JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jshort arg3)
@@ -1027,6 +1245,38 @@ fail:
 }
 #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)
+{
+	jlong *lparg4=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+	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);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+	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)
+{
+	jint *lparg4=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__IIIJ_3I_FUNC);
+	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);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__IIIJ_3I_FUNC);
+	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)
@@ -1229,6 +1479,54 @@ fail:
 }
 #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)
+{
+	jlong *lparg3=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__III_3J_FUNC);
+	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);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__III_3J_FUNC);
+	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)
+{
+	jint *lparg4=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__IIJI_3I_FUNC);
+	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);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__IIJI_3I_FUNC);
+	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)
+{
+	jint *lparg3=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+	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);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+	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)
@@ -1560,6 +1858,44 @@ fail:
 }
 #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)
+{
+	jchar *lparg2=NULL;
+	jlong *lparg6=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3J_FUNC);
+	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);
+fail:
+	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
+	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3J_FUNC);
+	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)
+{
+	jchar *lparg2=NULL;
+	jlong *lparg6=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__II_3CJII_3J_FUNC);
+	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);
+fail:
+	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
+	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__II_3CJII_3J_FUNC);
+	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)
@@ -1595,6 +1931,46 @@ fail:
 }
 #endif
 
+#ifndef NO_VtblCall__II_3J
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
+{
+	jlong *lparg2=NULL;
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	COM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VtblCall__IJIIIIJ
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIJ)
+	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIJ_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIIIJ_FUNC);
+	return rc;
+}
+#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)
+{
+	jint rc = 0;
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIII_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_WriteClassStg
 JNIEXPORT jint JNICALL COM_NATIVE(WriteClassStg)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
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
new file mode 100644
index 0000000000..fdb39114af
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
@@ -0,0 +1,312 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+#include "swt.h"
+#include "com_structs.h"
+#include "com_stats.h"
+
+#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 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)
+{
+	get_accChild_CALLBACK = func;
+	return (SWT_PTR)get_accChild;
+}
+#endif
+
+#ifndef NO_get_1accName_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accName_CALLBACK = func;
+	return (SWT_PTR)get_accName;
+}
+#endif
+
+#ifndef NO_get_1accValue_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accValue_CALLBACK = func;
+	return (SWT_PTR)get_accValue;
+}
+#endif
+
+#ifndef NO_get_1accDescription_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accDescription_CALLBACK = func;
+	return (SWT_PTR)get_accDescription;
+}
+#endif
+
+#ifndef NO_get_1accRole_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accRole_CALLBACK = func;
+	return (SWT_PTR)get_accRole;
+}
+#endif
+
+#ifndef NO_get_1accState_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accState_CALLBACK = func;
+	return (SWT_PTR)get_accState;
+}
+#endif
+
+#ifndef NO_get_1accHelp_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accHelp_CALLBACK = func;
+	return (SWT_PTR)get_accHelp;
+}
+#endif
+
+#ifndef NO_get_1accHelpTopic_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accHelpTopic_CALLBACK = func;
+	return (SWT_PTR)get_accHelpTopic;
+}
+#endif
+
+#ifndef NO_get_1accKeyboardShortcut_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accKeyboardShortcut_CALLBACK = func;
+	return (SWT_PTR)get_accKeyboardShortcut;
+}
+#endif
+
+#ifndef NO_get_1accDefaultAction_1CALLBACK
+static SWT_PTR 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)
+{
+	get_accDefaultAction_CALLBACK = func;
+	return (SWT_PTR)get_accDefaultAction;
+}
+#endif
+
+#ifndef NO_accSelect_1CALLBACK
+static SWT_PTR 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)
+{
+	accSelect_CALLBACK = func;
+	return (SWT_PTR)accSelect;
+}
+#endif
+
+#ifndef NO_accLocation_1CALLBACK
+static SWT_PTR 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)
+{
+	accLocation_CALLBACK = func;
+	return (SWT_PTR)accLocation;
+}
+#endif
+
+#ifndef NO_accNavigate_1CALLBACK
+static SWT_PTR 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)
+{
+	accNavigate_CALLBACK = func;
+	return (SWT_PTR)accNavigate;
+}
+#endif
+
+#ifndef NO_accDoDefaultAction_1CALLBACK
+static SWT_PTR 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)
+{
+	accDoDefaultAction_CALLBACK = func;
+	return (SWT_PTR)accDoDefaultAction;
+}
+#endif
+
+#ifndef NO_put_1accName_1CALLBACK
+static SWT_PTR 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)
+{
+	put_accName_CALLBACK = func;
+	return (SWT_PTR)put_accName;
+}
+#endif
+
+#ifndef NO_put_1accValue_1CALLBACK
+static SWT_PTR 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)
+{
+	put_accValue_CALLBACK = func;
+	return (SWT_PTR)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)
+{
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1PPPPVARIANT_FUNC);
+	return rc;
+}
+#endif
+
+#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)
+{
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANT_FUNC);
+	return rc;
+}
+#endif
+
+#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)
+{
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1PVARIANTP_FUNC);
+	return rc;
+}
+#endif
+
+#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)
+{
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANTP_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VtblCall_1VARIANT
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
+	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR 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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANT_FUNC);
+	return rc;
+}
+#endif
+
+#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)
+{
+	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);
+	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANTP_FUNC);
+	return rc;
+}
+#endif
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 9cebdd9c24..56afc6e0b6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
@@ -14,11 +14,14 @@
 
 #ifdef NATIVE_STATS
 
-int COM_nativeFunctionCount = 99;
-int COM_nativeFunctionCallCount[99];
+int COM_nativeFunctionCount = 149;
+int COM_nativeFunctionCallCount[149];
 char * COM_nativeFunctionNames[] = {
+	"CAUUID_1sizeof",
 	"CLSIDFromProgID",
 	"CLSIDFromString",
+	"CONTROLINFO_1sizeof",
+	"COSERVERINFO_1sizeof",
 	"CoCreateInstance",
 	"CoFreeUnusedLibraries",
 	"CoGetClassObject",
@@ -26,10 +29,17 @@ char * COM_nativeFunctionNames[] = {
 	"CoTaskMemAlloc",
 	"CoTaskMemFree",
 	"CreateStdAccessibleObject",
+	"DISPPARAMS_1sizeof",
+	"DVTARGETDEVICE_1sizeof",
 	"DoDragDrop",
+	"EXCEPINFO_1sizeof",
+	"FORMATETC_1sizeof",
+	"FUNCDESC_1sizeof",
+	"GUID_1sizeof",
 	"GetClassFile",
 	"IIDFromString",
 	"IsEqualGUID",
+	"LICINFO_1sizeof",
 	"LresultFromObject",
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I",
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I",
@@ -44,7 +54,10 @@ char * COM_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II",
+	"OLECMD_1sizeof",
+	"OLEINPLACEFRAMEINFO_1sizeof",
 	"OleCreate",
 	"OleCreateFromFile",
 	"OleCreatePropertyFrame",
@@ -64,6 +77,8 @@ char * COM_nativeFunctionNames[] = {
 	"RegisterDragDrop",
 	"ReleaseStgMedium",
 	"RevokeDragDrop",
+	"STATSTG_1sizeof",
+	"STGMEDIUM_1sizeof",
 	"StgCreateDocfile",
 	"StgIsStorageFile",
 	"StgOpenStorage",
@@ -71,6 +86,9 @@ char * COM_nativeFunctionNames[] = {
 	"SysAllocString",
 	"SysFreeString",
 	"SysStringByteLen",
+	"TYPEATTR_1sizeof",
+	"VARDESC_1sizeof",
+	"VARIANT_1sizeof",
 	"VariantChangeType",
 	"VariantClear",
 	"VariantInit",
@@ -83,6 +101,8 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2",
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I",
 	"VtblCall__IIII_3I",
+	"VtblCall__IIII_3J",
+	"VtblCall__IIIJ_3I",
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I",
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2",
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II",
@@ -94,6 +114,9 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__III_3I",
 	"VtblCall__III_3II_3I",
 	"VtblCall__III_3I_3I_3I_3I",
+	"VtblCall__III_3J",
+	"VtblCall__IIJI_3I",
+	"VtblCall__IIJ_3I",
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2",
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2",
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2",
@@ -113,9 +136,36 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__II_3CI",
 	"VtblCall__II_3CIIII_3I",
 	"VtblCall__II_3CIII_3I",
+	"VtblCall__II_3CIII_3J",
+	"VtblCall__II_3CJII_3J",
 	"VtblCall__II_3C_3C",
 	"VtblCall__II_3I",
+	"VtblCall__II_3J",
+	"VtblCall__IJIIIIJ",
+	"VtblCall__IJJIIIII",
+	"VtblCall_1IVARIANT",
+	"VtblCall_1IVARIANTP",
+	"VtblCall_1PPPPVARIANT",
+	"VtblCall_1PVARIANTP",
+	"VtblCall_1VARIANT",
+	"VtblCall_1VARIANTP",
 	"WriteClassStg",
+	"accDoDefaultAction_1CALLBACK",
+	"accLocation_1CALLBACK",
+	"accNavigate_1CALLBACK",
+	"accSelect_1CALLBACK",
+	"get_1accChild_1CALLBACK",
+	"get_1accDefaultAction_1CALLBACK",
+	"get_1accDescription_1CALLBACK",
+	"get_1accHelpTopic_1CALLBACK",
+	"get_1accHelp_1CALLBACK",
+	"get_1accKeyboardShortcut_1CALLBACK",
+	"get_1accName_1CALLBACK",
+	"get_1accRole_1CALLBACK",
+	"get_1accState_1CALLBACK",
+	"get_1accValue_1CALLBACK",
+	"put_1accName_1CALLBACK",
+	"put_1accValue_1CALLBACK",
 };
 
 #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
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 6005033070..7c9e3c897d 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
@@ -21,8 +21,11 @@ extern char* COM_nativeFunctionNames[];
 #endif
 
 typedef enum {
+	CAUUID_1sizeof_FUNC,
 	CLSIDFromProgID_FUNC,
 	CLSIDFromString_FUNC,
+	CONTROLINFO_1sizeof_FUNC,
+	COSERVERINFO_1sizeof_FUNC,
 	CoCreateInstance_FUNC,
 	CoFreeUnusedLibraries_FUNC,
 	CoGetClassObject_FUNC,
@@ -30,10 +33,17 @@ typedef enum {
 	CoTaskMemAlloc_FUNC,
 	CoTaskMemFree_FUNC,
 	CreateStdAccessibleObject_FUNC,
+	DISPPARAMS_1sizeof_FUNC,
+	DVTARGETDEVICE_1sizeof_FUNC,
 	DoDragDrop_FUNC,
+	EXCEPINFO_1sizeof_FUNC,
+	FORMATETC_1sizeof_FUNC,
+	FUNCDESC_1sizeof_FUNC,
+	GUID_1sizeof_FUNC,
 	GetClassFile_FUNC,
 	IIDFromString_FUNC,
 	IsEqualGUID_FUNC,
+	LICINFO_1sizeof_FUNC,
 	LresultFromObject_FUNC,
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC,
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC,
@@ -48,7 +58,10 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC,
+	OLECMD_1sizeof_FUNC,
+	OLEINPLACEFRAMEINFO_1sizeof_FUNC,
 	OleCreate_FUNC,
 	OleCreateFromFile_FUNC,
 	OleCreatePropertyFrame_FUNC,
@@ -68,6 +81,8 @@ typedef enum {
 	RegisterDragDrop_FUNC,
 	ReleaseStgMedium_FUNC,
 	RevokeDragDrop_FUNC,
+	STATSTG_1sizeof_FUNC,
+	STGMEDIUM_1sizeof_FUNC,
 	StgCreateDocfile_FUNC,
 	StgIsStorageFile_FUNC,
 	StgOpenStorage_FUNC,
@@ -75,6 +90,9 @@ typedef enum {
 	SysAllocString_FUNC,
 	SysFreeString_FUNC,
 	SysStringByteLen_FUNC,
+	TYPEATTR_1sizeof_FUNC,
+	VARDESC_1sizeof_FUNC,
+	VARIANT_1sizeof_FUNC,
 	VariantChangeType_FUNC,
 	VariantClear_FUNC,
 	VariantInit_FUNC,
@@ -87,6 +105,8 @@ typedef enum {
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC,
 	VtblCall__IIII_3I_FUNC,
+	VtblCall__IIII_3J_FUNC,
+	VtblCall__IIIJ_3I_FUNC,
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC,
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC,
@@ -98,6 +118,9 @@ typedef enum {
 	VtblCall__III_3I_FUNC,
 	VtblCall__III_3II_3I_FUNC,
 	VtblCall__III_3I_3I_3I_3I_FUNC,
+	VtblCall__III_3J_FUNC,
+	VtblCall__IIJI_3I_FUNC,
+	VtblCall__IIJ_3I_FUNC,
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC,
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC,
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC,
@@ -117,7 +140,34 @@ typedef enum {
 	VtblCall__II_3CI_FUNC,
 	VtblCall__II_3CIIII_3I_FUNC,
 	VtblCall__II_3CIII_3I_FUNC,
+	VtblCall__II_3CIII_3J_FUNC,
+	VtblCall__II_3CJII_3J_FUNC,
 	VtblCall__II_3C_3C_FUNC,
 	VtblCall__II_3I_FUNC,
+	VtblCall__II_3J_FUNC,
+	VtblCall__IJIIIIJ_FUNC,
+	VtblCall__IJJIIIII_FUNC,
+	VtblCall_1IVARIANT_FUNC,
+	VtblCall_1IVARIANTP_FUNC,
+	VtblCall_1PPPPVARIANT_FUNC,
+	VtblCall_1PVARIANTP_FUNC,
+	VtblCall_1VARIANT_FUNC,
+	VtblCall_1VARIANTP_FUNC,
 	WriteClassStg_FUNC,
+	accDoDefaultAction_1CALLBACK_FUNC,
+	accLocation_1CALLBACK_FUNC,
+	accNavigate_1CALLBACK_FUNC,
+	accSelect_1CALLBACK_FUNC,
+	get_1accChild_1CALLBACK_FUNC,
+	get_1accDefaultAction_1CALLBACK_FUNC,
+	get_1accDescription_1CALLBACK_FUNC,
+	get_1accHelpTopic_1CALLBACK_FUNC,
+	get_1accHelp_1CALLBACK_FUNC,
+	get_1accKeyboardShortcut_1CALLBACK_FUNC,
+	get_1accName_1CALLBACK_FUNC,
+	get_1accRole_1CALLBACK_FUNC,
+	get_1accState_1CALLBACK_FUNC,
+	get_1accValue_1CALLBACK_FUNC,
+	put_1accName_1CALLBACK_FUNC,
+	put_1accValue_1CALLBACK_FUNC,
 } COM_FUNCS;
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 126faa0898..6cdc2887e7 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
@@ -875,3 +875,46 @@ void setVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct)
 }
 #endif
 
+#ifndef NO_VARIANT
+typedef struct VARIANT_FID_CACHE {
+	int cached;
+	jclass clazz;
+	jfieldID vt, wReserved1, wReserved2, wReserved3, lVal;
+} VARIANT_FID_CACHE;
+
+VARIANT_FID_CACHE VARIANTFc;
+
+void cacheVARIANTFields(JNIEnv *env, jobject lpObject)
+{
+	if (VARIANTFc.cached) return;
+	VARIANTFc.clazz = (*env)->GetObjectClass(env, lpObject);
+	VARIANTFc.vt = (*env)->GetFieldID(env, VARIANTFc.clazz, "vt", "S");
+	VARIANTFc.wReserved1 = (*env)->GetFieldID(env, VARIANTFc.clazz, "wReserved1", "S");
+	VARIANTFc.wReserved2 = (*env)->GetFieldID(env, VARIANTFc.clazz, "wReserved2", "S");
+	VARIANTFc.wReserved3 = (*env)->GetFieldID(env, VARIANTFc.clazz, "wReserved3", "S");
+	VARIANTFc.lVal = (*env)->GetFieldID(env, VARIANTFc.clazz, "lVal", "I");
+	VARIANTFc.cached = 1;
+}
+
+VARIANT *getVARIANTFields(JNIEnv *env, jobject lpObject, VARIANT *lpStruct)
+{
+	if (!VARIANTFc.cached) cacheVARIANTFields(env, lpObject);
+	lpStruct->vt = (*env)->GetShortField(env, lpObject, VARIANTFc.vt);
+	lpStruct->wReserved1 = (*env)->GetShortField(env, lpObject, VARIANTFc.wReserved1);
+	lpStruct->wReserved2 = (*env)->GetShortField(env, lpObject, VARIANTFc.wReserved2);
+	lpStruct->wReserved3 = (*env)->GetShortField(env, lpObject, VARIANTFc.wReserved3);
+	lpStruct->lVal = (*env)->GetIntField(env, lpObject, VARIANTFc.lVal);
+	return lpStruct;
+}
+
+void setVARIANTFields(JNIEnv *env, jobject lpObject, VARIANT *lpStruct)
+{
+	if (!VARIANTFc.cached) cacheVARIANTFields(env, lpObject);
+	(*env)->SetShortField(env, lpObject, VARIANTFc.vt, (jshort)lpStruct->vt);
+	(*env)->SetShortField(env, lpObject, VARIANTFc.wReserved1, (jshort)lpStruct->wReserved1);
+	(*env)->SetShortField(env, lpObject, VARIANTFc.wReserved2, (jshort)lpStruct->wReserved2);
+	(*env)->SetShortField(env, lpObject, VARIANTFc.wReserved3, (jshort)lpStruct->wReserved3);
+	(*env)->SetIntField(env, lpObject, VARIANTFc.lVal, (jint)lpStruct->lVal);
+}
+#endif
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
index b0b7172b69..03a317b259 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
@@ -215,3 +215,15 @@ void setVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct);
 #define VARDESC_sizeof() 0
 #endif
 
+#ifndef NO_VARIANT
+void cacheVARIANTFields(JNIEnv *env, jobject lpObject);
+VARIANT *getVARIANTFields(JNIEnv *env, jobject lpObject, VARIANT *lpStruct);
+void setVARIANTFields(JNIEnv *env, jobject lpObject, VARIANT *lpStruct);
+#define VARIANT_sizeof() sizeof(VARIANT)
+#else
+#define cacheVARIANTFields(a,b)
+#define getVARIANTFields(a,b,c) NULL
+#define setVARIANTFields(a,b,c)
+#define VARIANT_sizeof() 0
+#endif
+
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 99976b254b..b4139ac35f 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
@@ -181,6 +181,18 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)
 }
 #endif
 
+#ifndef NO_ColorPalette_1sizeof
+JNIEXPORT jint JNICALL Gdip_NATIVE(ColorPalette_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	Gdip_NATIVE_ENTER(env, that, ColorPalette_1sizeof_FUNC);
+	rc = (jint)ColorPalette_sizeof();
+	Gdip_NATIVE_EXIT(env, that, ColorPalette_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Color_1delete
 JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -329,14 +341,10 @@ fail:
 
 #ifndef NO_GdiplusShutdown
 JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint *lparg0=NULL;
 	Gdip_NATIVE_ENTER(env, that, GdiplusShutdown_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
-	GdiplusShutdown((ULONG_PTR)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
+	GdiplusShutdown((ULONG_PTR)arg0);
 	Gdip_NATIVE_EXIT(env, that, GdiplusShutdown_FUNC);
 }
 #endif
@@ -360,6 +368,18 @@ fail:
 }
 #endif
 
+#ifndef NO_GdiplusStartupInput_1sizeof
+JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartupInput_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	Gdip_NATIVE_ENTER(env, that, GdiplusStartupInput_1sizeof_FUNC);
+	rc = (jint)GdiplusStartupInput_sizeof();
+	Gdip_NATIVE_EXIT(env, that, GdiplusStartupInput_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GraphicsPath_1AddArc
 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)
@@ -1508,17 +1528,13 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1new)
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II
-JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
 {
-	BitmapData _arg0, *lparg0=NULL;
-	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II_FUNC);
-	if (arg0) if ((lparg0 = getBitmapDataFields(env, arg0, &_arg0)) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID*)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setBitmapDataFields(env, arg0, lparg0);
-	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II_FUNC);
+	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
+	if (arg0) setBitmapDataFields(env, arg0, (BitmapData *)arg1);
+	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
 }
 #endif
 
@@ -1909,12 +1925,14 @@ JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
 #endif
 
 #ifndef NO_TextureBrush_1SetTransform
-JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
+JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
+	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1SetTransform_FUNC);
-	((TextureBrush *)arg0)->SetTransform((Matrix *)arg1);
+	rc = (jint)((TextureBrush *)arg0)->SetTransform((Matrix *)arg1);
 	Gdip_NATIVE_EXIT(env, that, TextureBrush_1SetTransform_FUNC);
+	return rc;
 }
 #endif
 
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 2c38ba7ef5..78b1e6ee28 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, jint arg0, jint arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR 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, jint arg0, jint arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR 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, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR 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, jint arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points = NULL;
 	jfloat *lparg1=NULL;
@@ -124,7 +124,7 @@ fail:
 
 #ifndef NO_Matrix_1TransformPoints__I_3FI
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__I_3FI)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points = NULL;
 	jfloat *lparg1=NULL;
@@ -156,14 +156,14 @@ fail:
 
 #ifndef NO_LinearGradientBrush_1SetInterpolationColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jfloatArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
 {
 	Color *colors;
-	jint *lparg1=NULL;
+	SWT_PTR *lparg1=NULL;
 	jfloat *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetIntArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1) {
 		colors = new Color[arg3];
@@ -177,7 +177,7 @@ fail:
 		delete colors;
 	}
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
 	return rc;
 }
@@ -185,14 +185,14 @@ fail:
 
 #ifndef NO_PathGradientBrush_1SetSurroundColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jintArray arg2)
 {
 	Color *colors;
-	jint *lparg1=NULL;
+	SWT_PTR *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetIntArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1 && lparg2) {
 		colors = new Color[lparg2[0]];
@@ -206,7 +206,7 @@ fail:
 		delete colors;
 	}	
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
 	return rc;
 }
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 0236cb46d3..a94c2382ff 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
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int Gdip_nativeFunctionCount = 160;
-int Gdip_nativeFunctionCallCount[160];
+int Gdip_nativeFunctionCount = 162;
+int Gdip_nativeFunctionCallCount[162];
 char * Gdip_nativeFunctionNames[] = {
 	"BitmapData_1delete",
 	"BitmapData_1new",
@@ -30,6 +30,7 @@ char * Gdip_nativeFunctionNames[] = {
 	"Bitmap_1new___3CZ",
 	"Brush_1Clone",
 	"Brush_1GetType",
+	"ColorPalette_1sizeof",
 	"Color_1delete",
 	"Color_1new",
 	"FontFamily_1GetFamilyName",
@@ -44,6 +45,7 @@ char * Gdip_nativeFunctionNames[] = {
 	"Font_1new___3CFIII",
 	"GdiplusShutdown",
 	"GdiplusStartup",
+	"GdiplusStartupInput_1sizeof",
 	"GraphicsPath_1AddArc",
 	"GraphicsPath_1AddBezier",
 	"GraphicsPath_1AddLine",
@@ -140,7 +142,7 @@ char * Gdip_nativeFunctionNames[] = {
 	"Matrix_1Translate",
 	"Matrix_1delete",
 	"Matrix_1new",
-	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I",
 	"MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II",
 	"PathGradientBrush_1SetCenterColor",
 	"PathGradientBrush_1SetCenterPoint",
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 7d63084548..b8cee23aae 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
@@ -34,6 +34,7 @@ typedef enum {
 	Bitmap_1new___3CZ_FUNC,
 	Brush_1Clone_FUNC,
 	Brush_1GetType_FUNC,
+	ColorPalette_1sizeof_FUNC,
 	Color_1delete_FUNC,
 	Color_1new_FUNC,
 	FontFamily_1GetFamilyName_FUNC,
@@ -48,6 +49,7 @@ typedef enum {
 	Font_1new___3CFIII_FUNC,
 	GdiplusShutdown_FUNC,
 	GdiplusStartup_FUNC,
+	GdiplusStartupInput_1sizeof_FUNC,
 	GraphicsPath_1AddArc_FUNC,
 	GraphicsPath_1AddBezier_FUNC,
 	GraphicsPath_1AddLine_FUNC,
@@ -144,7 +146,7 @@ typedef enum {
 	Matrix_1Translate_FUNC,
 	Matrix_1delete_FUNC,
 	Matrix_1new_FUNC,
-	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC,
 	PathGradientBrush_1SetCenterColor_FUNC,
 	PathGradientBrush_1SetCenterPoint_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 85eb6c889b..8d8fb529f8 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
@@ -116,8 +116,8 @@ void cacheGdiplusStartupInputFields(JNIEnv *env, jobject lpObject)
 	GdiplusStartupInputFc.clazz = env->GetObjectClass(lpObject);
 	GdiplusStartupInputFc.GdiplusVersion = env->GetFieldID(GdiplusStartupInputFc.clazz, "GdiplusVersion", "I");
 	GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", "I");
-	GdiplusStartupInputFc.SuppressBackgroundThread = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressBackgroundThread", "I");
-	GdiplusStartupInputFc.SuppressExternalCodecs = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressExternalCodecs", "I");
+	GdiplusStartupInputFc.SuppressBackgroundThread = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressBackgroundThread", "Z");
+	GdiplusStartupInputFc.SuppressExternalCodecs = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressExternalCodecs", "Z");
 	GdiplusStartupInputFc.cached = 1;
 }
 
@@ -126,8 +126,8 @@ 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->SuppressBackgroundThread = (BOOL)env->GetIntField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread);
-	lpStruct->SuppressExternalCodecs = (BOOL)env->GetIntField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs);
+	lpStruct->SuppressBackgroundThread = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread);
+	lpStruct->SuppressExternalCodecs = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs);
 	return lpStruct;
 }
 
@@ -136,8 +136,8 @@ 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->SetIntField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread, (jint)lpStruct->SuppressBackgroundThread);
-	env->SetIntField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs, (jint)lpStruct->SuppressExternalCodecs);
+	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread, (jboolean)lpStruct->SuppressBackgroundThread);
+	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs, (jboolean)lpStruct->SuppressExternalCodecs);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index 7c5e8d693e..8440d68501 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -26,7 +26,7 @@ WS_PREFIX   = win32
 SWT_VERSION = $(maj_ver)$(min_ver)
 SWT_LIB     = $(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
 SWT_LIBS    = ole32.lib comctl32.lib user32.lib gdi32.lib comdlg32.lib kernel32.lib shell32.lib oleaut32.lib advapi32.lib imm32.lib winspool.lib oleacc.lib usp10.lib wininet.lib
-SWT_OBJS    = swt.obj callback.obj os.obj os_structs.obj os_custom.obj os_stats.obj com_structs.obj com.obj com_stats.obj
+SWT_OBJS    = swt.obj callback.obj os.obj os_structs.obj os_custom.obj os_stats.obj com_structs.obj com.obj com_stats.obj com_custom.obj
 
 GDIP_PREFIX  = swt-gdip
 GDIP_LIB     = $(GDIP_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
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 3ac71f0d34..498f44c37d 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
@@ -15,6 +15,30 @@
 
 #define OS_NATIVE(func) Java_org_eclipse_swt_internal_win32_OS_##func
 
+#ifndef NO_ACCEL_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(ACCEL_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ACCEL_1sizeof_FUNC);
+	rc = (jint)ACCEL_sizeof();
+	OS_NATIVE_EXIT(env, that, ACCEL_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_ACTCTX_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(ACTCTX_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ACTCTX_1sizeof_FUNC);
+	rc = (jint)ACTCTX_sizeof();
+	OS_NATIVE_EXIT(env, that, ACTCTX_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_AbortDoc
 JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -171,6 +195,66 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AttachThreadInput)
 }
 #endif
 
+#ifndef NO_BITMAPINFOHEADER_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(BITMAPINFOHEADER_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, BITMAPINFOHEADER_1sizeof_FUNC);
+	rc = (jint)BITMAPINFOHEADER_sizeof();
+	OS_NATIVE_EXIT(env, that, BITMAPINFOHEADER_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_BITMAP_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(BITMAP_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, BITMAP_1sizeof_FUNC);
+	rc = (jint)BITMAP_sizeof();
+	OS_NATIVE_EXIT(env, that, BITMAP_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_BLENDFUNCTION_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(BLENDFUNCTION_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, BLENDFUNCTION_1sizeof_FUNC);
+	rc = (jint)BLENDFUNCTION_sizeof();
+	OS_NATIVE_EXIT(env, that, BLENDFUNCTION_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_BROWSEINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(BROWSEINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, BROWSEINFO_1sizeof_FUNC);
+	rc = (jint)BROWSEINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, BROWSEINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_BUTTON_1IMAGELIST_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(BUTTON_1IMAGELIST_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, BUTTON_1IMAGELIST_1sizeof_FUNC);
+	rc = (jint)BUTTON_IMAGELIST_sizeof();
+	OS_NATIVE_EXIT(env, that, BUTTON_1IMAGELIST_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_BeginDeferWindowPos
 JNIEXPORT jint JNICALL OS_NATIVE(BeginDeferWindowPos)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -235,6 +319,66 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BringWindowToTop)
 }
 #endif
 
+#ifndef NO_CHOOSECOLOR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(CHOOSECOLOR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, CHOOSECOLOR_1sizeof_FUNC);
+	rc = (jint)CHOOSECOLOR_sizeof();
+	OS_NATIVE_EXIT(env, that, CHOOSECOLOR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_CHOOSEFONT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(CHOOSEFONT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, CHOOSEFONT_1sizeof_FUNC);
+	rc = (jint)CHOOSEFONT_sizeof();
+	OS_NATIVE_EXIT(env, that, CHOOSEFONT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_COMBOBOXINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(COMBOBOXINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, COMBOBOXINFO_1sizeof_FUNC);
+	rc = (jint)COMBOBOXINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, COMBOBOXINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_COMPOSITIONFORM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(COMPOSITIONFORM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, COMPOSITIONFORM_1sizeof_FUNC);
+	rc = (jint)COMPOSITIONFORM_sizeof();
+	OS_NATIVE_EXIT(env, that, COMPOSITIONFORM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_CREATESTRUCT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(CREATESTRUCT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, CREATESTRUCT_1sizeof_FUNC);
+	rc = (jint)CREATESTRUCT_sizeof();
+	OS_NATIVE_EXIT(env, that, CREATESTRUCT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Call
 JNIEXPORT jint JNICALL OS_NATIVE(Call)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
@@ -1172,6 +1316,66 @@ fail:
 }
 #endif
 
+#ifndef NO_DIBSECTION_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DIBSECTION_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DIBSECTION_1sizeof_FUNC);
+	rc = (jint)DIBSECTION_sizeof();
+	OS_NATIVE_EXIT(env, that, DIBSECTION_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DLLVERSIONINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DLLVERSIONINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DLLVERSIONINFO_1sizeof_FUNC);
+	rc = (jint)DLLVERSIONINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, DLLVERSIONINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DOCINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DOCINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DOCINFO_1sizeof_FUNC);
+	rc = (jint)DOCINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, DOCINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DRAWITEMSTRUCT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DRAWITEMSTRUCT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DRAWITEMSTRUCT_1sizeof_FUNC);
+	rc = (jint)DRAWITEMSTRUCT_sizeof();
+	OS_NATIVE_EXIT(env, that, DRAWITEMSTRUCT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_DROPFILES_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DROPFILES_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, DROPFILES_1sizeof_FUNC);
+	rc = (jint)DROPFILES_sizeof();
+	OS_NATIVE_EXIT(env, that, DROPFILES_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_DefFrameProcA
 JNIEXPORT jint JNICALL OS_NATIVE(DefFrameProcA)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
@@ -1785,6 +1989,18 @@ fail:
 }
 #endif
 
+#ifndef NO_EXTLOGPEN_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(EXTLOGPEN_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, EXTLOGPEN_1sizeof_FUNC);
+	rc = (jint)EXTLOGPEN_sizeof();
+	OS_NATIVE_EXIT(env, that, EXTLOGPEN_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_Ellipse
 JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
@@ -2308,6 +2524,18 @@ fail:
 }
 #endif
 
+#ifndef NO_FILETIME_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(FILETIME_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, FILETIME_1sizeof_FUNC);
+	rc = (jint)FILETIME_sizeof();
+	OS_NATIVE_EXIT(env, that, FILETIME_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_FillPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(FillPath)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -2417,6 +2645,42 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FreeLibrary)
 }
 #endif
 
+#ifndef NO_GCP_1RESULTS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GCP_1RESULTS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GCP_1RESULTS_1sizeof_FUNC);
+	rc = (jint)GCP_RESULTS_sizeof();
+	OS_NATIVE_EXIT(env, that, GCP_1RESULTS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GRADIENT_1RECT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GRADIENT_1RECT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GRADIENT_1RECT_1sizeof_FUNC);
+	rc = (jint)GRADIENT_RECT_sizeof();
+	OS_NATIVE_EXIT(env, that, GRADIENT_1RECT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GUITHREADINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GUITHREADINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GUITHREADINFO_1sizeof_FUNC);
+	rc = (jint)GUITHREADINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, GUITHREADINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GdiSetBatchLimit
 JNIEXPORT jint JNICALL OS_NATIVE(GdiSetBatchLimit)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -4951,6 +5215,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
 }
 #endif
 
+#ifndef NO_GetWindowLongPtrA
+JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrA)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GetWindowLongPtrA_FUNC);
+	rc = (jint)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)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GetWindowLongPtrW_FUNC);
+	rc = (jint)GetWindowLongPtrW((HWND)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, GetWindowLongPtrW_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GetWindowLongW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongW)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -5231,6 +5519,66 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
 }
 #endif
 
+#ifndef NO_HDHITTESTINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(HDHITTESTINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HDHITTESTINFO_1sizeof_FUNC);
+	rc = (jint)HDHITTESTINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, HDHITTESTINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_HDITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(HDITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HDITEM_1sizeof_FUNC);
+	rc = (jint)HDITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, HDITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_HDLAYOUT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(HDLAYOUT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HDLAYOUT_1sizeof_FUNC);
+	rc = (jint)HDLAYOUT_sizeof();
+	OS_NATIVE_EXIT(env, that, HDLAYOUT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_HELPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(HELPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HELPINFO_1sizeof_FUNC);
+	rc = (jint)HELPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, HELPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_HIGHCONTRAST_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(HIGHCONTRAST_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, HIGHCONTRAST_1sizeof_FUNC);
+	rc = (jint)HIGHCONTRAST_sizeof();
+	OS_NATIVE_EXIT(env, that, HIGHCONTRAST_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_HeapAlloc
 JNIEXPORT jint JNICALL OS_NATIVE(HeapAlloc)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
@@ -5317,6 +5665,18 @@ fail:
 }
 #endif
 
+#ifndef NO_ICONINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(ICONINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ICONINFO_1sizeof_FUNC);
+	rc = (jint)ICONINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, ICONINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_IIDFromString
 JNIEXPORT jint JNICALL OS_NATIVE(IIDFromString)
 	(JNIEnv *env, jclass that, jcharArray arg0, jbyteArray arg1)
@@ -5336,6 +5696,30 @@ fail:
 }
 #endif
 
+#ifndef NO_INITCOMMONCONTROLSEX_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(INITCOMMONCONTROLSEX_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, INITCOMMONCONTROLSEX_1sizeof_FUNC);
+	rc = (jint)INITCOMMONCONTROLSEX_sizeof();
+	OS_NATIVE_EXIT(env, that, INITCOMMONCONTROLSEX_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_INPUT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(INPUT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, INPUT_1sizeof_FUNC);
+	rc = (jint)INPUT_sizeof();
+	OS_NATIVE_EXIT(env, that, INPUT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ImageList_1Add
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
@@ -6145,6 +6529,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsZoomed)
 }
 #endif
 
+#ifndef NO_KEYBDINPUT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(KEYBDINPUT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, KEYBDINPUT_1sizeof_FUNC);
+	rc = (jint)KEYBDINPUT_sizeof();
+	OS_NATIVE_EXIT(env, that, KEYBDINPUT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_KillTimer
 JNIEXPORT jboolean JNICALL OS_NATIVE(KillTimer)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -6157,6 +6553,102 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(KillTimer)
 }
 #endif
 
+#ifndef NO_LITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LITEM_1sizeof_FUNC);
+	rc = (jint)LITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, LITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LOGBRUSH_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LOGBRUSH_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LOGBRUSH_1sizeof_FUNC);
+	rc = (jint)LOGBRUSH_sizeof();
+	OS_NATIVE_EXIT(env, that, LOGBRUSH_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LOGFONTA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LOGFONTA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LOGFONTA_1sizeof_FUNC);
+	rc = (jint)LOGFONTA_sizeof();
+	OS_NATIVE_EXIT(env, that, LOGFONTA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LOGFONTW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LOGFONTW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LOGFONTW_1sizeof_FUNC);
+	rc = (jint)LOGFONTW_sizeof();
+	OS_NATIVE_EXIT(env, that, LOGFONTW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LOGPEN_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LOGPEN_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LOGPEN_1sizeof_FUNC);
+	rc = (jint)LOGPEN_sizeof();
+	OS_NATIVE_EXIT(env, that, LOGPEN_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LVCOLUMN_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LVCOLUMN_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LVCOLUMN_1sizeof_FUNC);
+	rc = (jint)LVCOLUMN_sizeof();
+	OS_NATIVE_EXIT(env, that, LVCOLUMN_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LVHITTESTINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LVHITTESTINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LVHITTESTINFO_1sizeof_FUNC);
+	rc = (jint)LVHITTESTINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, LVHITTESTINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_LVITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LVITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, LVITEM_1sizeof_FUNC);
+	rc = (jint)LVITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, LVITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_LineTo
 JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
@@ -6385,6 +6877,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LockWindowUpdate)
 }
 #endif
 
+#ifndef NO_MARGINS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MARGINS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MARGINS_1sizeof_FUNC);
+	rc = (jint)MARGINS_sizeof();
+	OS_NATIVE_EXIT(env, that, MARGINS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_MCIWndRegisterClass
 JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass)
 	(JNIEnv *env, jclass that)
@@ -6413,6 +6917,102 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass)
 }
 #endif
 
+#ifndef NO_MEASUREITEMSTRUCT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MEASUREITEMSTRUCT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MEASUREITEMSTRUCT_1sizeof_FUNC);
+	rc = (jint)MEASUREITEMSTRUCT_sizeof();
+	OS_NATIVE_EXIT(env, that, MEASUREITEMSTRUCT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MENUBARINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MENUBARINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MENUBARINFO_1sizeof_FUNC);
+	rc = (jint)MENUBARINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, MENUBARINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MENUINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MENUINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MENUINFO_1sizeof_FUNC);
+	rc = (jint)MENUINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, MENUINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MENUITEMINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MENUITEMINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MENUITEMINFO_1sizeof_FUNC);
+	rc = (jint)MENUITEMINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, MENUITEMINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MINMAXINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MINMAXINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MINMAXINFO_1sizeof_FUNC);
+	rc = (jint)MINMAXINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, MINMAXINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MONITORINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MONITORINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MONITORINFO_1sizeof_FUNC);
+	rc = (jint)MONITORINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, MONITORINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MOUSEINPUT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MOUSEINPUT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MOUSEINPUT_1sizeof_FUNC);
+	rc = (jint)MOUSEINPUT_sizeof();
+	OS_NATIVE_EXIT(env, that, MOUSEINPUT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_MSG_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(MSG_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MSG_1sizeof_FUNC);
+	rc = (jint)MSG_sizeof();
+	OS_NATIVE_EXIT(env, that, MSG_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_MapVirtualKeyA
 JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyA)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -7469,6 +8069,23 @@ fail:
 }
 #endif
 
+#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II)
+	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1, jint arg2)
+{
+	RECT _arg0, *lparg0=NULL;
+	jint *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC);
+	if (arg0) if ((lparg0 = getRECTFields(env, arg0, &_arg0)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	MoveMemory(lparg0, lparg1, arg2);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC);
+}
+#endif
+
 #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II
 JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
@@ -7926,6 +8543,282 @@ fail:
 }
 #endif
 
+#ifndef NO_NMCUSTOMDRAW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMCUSTOMDRAW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMCUSTOMDRAW_1sizeof_FUNC);
+	rc = (jint)NMCUSTOMDRAW_sizeof();
+	OS_NATIVE_EXIT(env, that, NMCUSTOMDRAW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMHDR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMHDR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMHDR_1sizeof_FUNC);
+	rc = (jint)NMHDR_sizeof();
+	OS_NATIVE_EXIT(env, that, NMHDR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMHEADER_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMHEADER_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMHEADER_1sizeof_FUNC);
+	rc = (jint)NMHEADER_sizeof();
+	OS_NATIVE_EXIT(env, that, NMHEADER_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMLINK_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMLINK_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMLINK_1sizeof_FUNC);
+	rc = (jint)NMLINK_sizeof();
+	OS_NATIVE_EXIT(env, that, NMLINK_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMLISTVIEW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMLISTVIEW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMLISTVIEW_1sizeof_FUNC);
+	rc = (jint)NMLISTVIEW_sizeof();
+	OS_NATIVE_EXIT(env, that, NMLISTVIEW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMLVCUSTOMDRAW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMLVCUSTOMDRAW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMLVCUSTOMDRAW_1sizeof_FUNC);
+	rc = (jint)NMLVCUSTOMDRAW_sizeof();
+	OS_NATIVE_EXIT(env, that, NMLVCUSTOMDRAW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMLVDISPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMLVDISPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMLVDISPINFO_1sizeof_FUNC);
+	rc = (jint)NMLVDISPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, NMLVDISPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMLVFINDITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMLVFINDITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMLVFINDITEM_1sizeof_FUNC);
+	rc = (jint)NMLVFINDITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, NMLVFINDITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMREBARCHEVRON_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMREBARCHEVRON_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMREBARCHEVRON_1sizeof_FUNC);
+	rc = (jint)NMREBARCHEVRON_sizeof();
+	OS_NATIVE_EXIT(env, that, NMREBARCHEVRON_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMREBARCHILDSIZE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMREBARCHILDSIZE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMREBARCHILDSIZE_1sizeof_FUNC);
+	rc = (jint)NMREBARCHILDSIZE_sizeof();
+	OS_NATIVE_EXIT(env, that, NMREBARCHILDSIZE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMRGINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMRGINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMRGINFO_1sizeof_FUNC);
+	rc = (jint)NMRGINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, NMRGINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTBHOTITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTBHOTITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTBHOTITEM_1sizeof_FUNC);
+	rc = (jint)NMTBHOTITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTBHOTITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTOOLBAR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTOOLBAR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTOOLBAR_1sizeof_FUNC);
+	rc = (jint)NMTOOLBAR_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTOOLBAR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTTDISPINFOA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTTDISPINFOA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTTDISPINFOA_1sizeof_FUNC);
+	rc = (jint)NMTTDISPINFOA_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTTDISPINFOA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTTDISPINFOW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTTDISPINFOW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTTDISPINFOW_1sizeof_FUNC);
+	rc = (jint)NMTTDISPINFOW_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTTDISPINFOW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTVCUSTOMDRAW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTVCUSTOMDRAW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTVCUSTOMDRAW_1sizeof_FUNC);
+	rc = (jint)NMTVCUSTOMDRAW_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTVCUSTOMDRAW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTVDISPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTVDISPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTVDISPINFO_1sizeof_FUNC);
+	rc = (jint)NMTVDISPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTVDISPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMTVITEMCHANGE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTVITEMCHANGE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMTVITEMCHANGE_1sizeof_FUNC);
+	rc = (jint)NMTVITEMCHANGE_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTVITEMCHANGE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NMUPDOWN_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMUPDOWN_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NMUPDOWN_1sizeof_FUNC);
+	rc = (jint)NMUPDOWN_sizeof();
+	OS_NATIVE_EXIT(env, that, NMUPDOWN_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NONCLIENTMETRICSA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NONCLIENTMETRICSA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NONCLIENTMETRICSA_1sizeof_FUNC);
+	rc = (jint)NONCLIENTMETRICSA_sizeof();
+	OS_NATIVE_EXIT(env, that, NONCLIENTMETRICSA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NONCLIENTMETRICSW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NONCLIENTMETRICSW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NONCLIENTMETRICSW_1sizeof_FUNC);
+	rc = (jint)NONCLIENTMETRICSW_sizeof();
+	OS_NATIVE_EXIT(env, that, NONCLIENTMETRICSW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NOTIFYICONDATAA_1V2_1SIZE
+JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATAA_1V2_1SIZE)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NOTIFYICONDATAA_1V2_1SIZE_FUNC);
+	rc = (jint)NOTIFYICONDATAA_V2_SIZE;
+	OS_NATIVE_EXIT(env, that, NOTIFYICONDATAA_1V2_1SIZE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_NOTIFYICONDATAW_1V2_1SIZE
+JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATAW_1V2_1SIZE)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, NOTIFYICONDATAW_1V2_1SIZE_FUNC);
+	rc = (jint)NOTIFYICONDATAW_V2_SIZE;
+	OS_NATIVE_EXIT(env, that, NOTIFYICONDATAW_1V2_1SIZE_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_NotifyWinEvent
 JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
@@ -7951,6 +8844,54 @@ JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent)
 }
 #endif
 
+#ifndef NO_OFNOTIFY_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(OFNOTIFY_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, OFNOTIFY_1sizeof_FUNC);
+	rc = (jint)OFNOTIFY_sizeof();
+	OS_NATIVE_EXIT(env, that, OFNOTIFY_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_OPENFILENAME_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(OPENFILENAME_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, OPENFILENAME_1sizeof_FUNC);
+	rc = (jint)OPENFILENAME_sizeof();
+	OS_NATIVE_EXIT(env, that, OPENFILENAME_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_OSVERSIONINFOA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(OSVERSIONINFOA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, OSVERSIONINFOA_1sizeof_FUNC);
+	rc = (jint)OSVERSIONINFOA_sizeof();
+	OS_NATIVE_EXIT(env, that, OSVERSIONINFOA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_OSVERSIONINFOW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(OSVERSIONINFOW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, OSVERSIONINFOW_1sizeof_FUNC);
+	rc = (jint)OSVERSIONINFOW_sizeof();
+	OS_NATIVE_EXIT(env, that, OSVERSIONINFOW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_OffsetRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(OffsetRect)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
@@ -8045,6 +8986,30 @@ fail:
 }
 #endif
 
+#ifndef NO_PAINTSTRUCT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PAINTSTRUCT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PAINTSTRUCT_1sizeof_FUNC);
+	rc = (jint)PAINTSTRUCT_sizeof();
+	OS_NATIVE_EXIT(env, that, PAINTSTRUCT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_POINT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(POINT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, POINT_1sizeof_FUNC);
+	rc = (jint)POINT_sizeof();
+	OS_NATIVE_EXIT(env, that, POINT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_PRIMARYLANGID
 JNIEXPORT jshort JNICALL OS_NATIVE(PRIMARYLANGID)
 	(JNIEnv *env, jclass that, jshort arg0)
@@ -8057,6 +9022,42 @@ JNIEXPORT jshort JNICALL OS_NATIVE(PRIMARYLANGID)
 }
 #endif
 
+#ifndef NO_PRINTDLG_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PRINTDLG_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PRINTDLG_1sizeof_FUNC);
+	rc = (jint)PRINTDLG_sizeof();
+	OS_NATIVE_EXIT(env, that, PRINTDLG_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PROCESS_1INFORMATION_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PROCESS_1INFORMATION_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PROCESS_1INFORMATION_1sizeof_FUNC);
+	rc = (jint)PROCESS_INFORMATION_sizeof();
+	OS_NATIVE_EXIT(env, that, PROCESS_1INFORMATION_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PTR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PTR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PTR_1sizeof_FUNC);
+	rc = (jint)PTR_sizeof();
+	OS_NATIVE_EXIT(env, that, PTR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_PatBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(PatBlt)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
@@ -8282,6 +9283,30 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRegion)
 }
 #endif
 
+#ifndef NO_REBARBANDINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(REBARBANDINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, REBARBANDINFO_1sizeof_FUNC);
+	rc = (jint)REBARBANDINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, REBARBANDINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_RECT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(RECT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, RECT_1sizeof_FUNC);
+	rc = (jint)RECT_sizeof();
+	OS_NATIVE_EXIT(env, that, RECT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_RealizePalette
 JNIEXPORT jint JNICALL OS_NATIVE(RealizePalette)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -8803,6 +9828,126 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RoundRect)
 }
 #endif
 
+#ifndef NO_SCRIPT_1ANALYSIS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1ANALYSIS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1ANALYSIS_1sizeof_FUNC);
+	rc = (jint)SCRIPT_ANALYSIS_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1ANALYSIS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1CONTROL_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1CONTROL_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1CONTROL_1sizeof_FUNC);
+	rc = (jint)SCRIPT_CONTROL_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1CONTROL_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1DIGITSUBSTITUTE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1DIGITSUBSTITUTE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC);
+	rc = (jint)SCRIPT_DIGITSUBSTITUTE_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1FONTPROPERTIES_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1FONTPROPERTIES_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1FONTPROPERTIES_1sizeof_FUNC);
+	rc = (jint)SCRIPT_FONTPROPERTIES_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1FONTPROPERTIES_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1ITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1ITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1ITEM_1sizeof_FUNC);
+	rc = (jint)SCRIPT_ITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1ITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1LOGATTR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1LOGATTR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1LOGATTR_1sizeof_FUNC);
+	rc = (jint)SCRIPT_LOGATTR_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1LOGATTR_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1PROPERTIES_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1PROPERTIES_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1PROPERTIES_1sizeof_FUNC);
+	rc = (jint)SCRIPT_PROPERTIES_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1PROPERTIES_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCRIPT_1STATE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1STATE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCRIPT_1STATE_1sizeof_FUNC);
+	rc = (jint)SCRIPT_STATE_sizeof();
+	OS_NATIVE_EXIT(env, that, SCRIPT_1STATE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SCROLLINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SCROLLINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SCROLLINFO_1sizeof_FUNC);
+	rc = (jint)SCROLLINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SCROLLINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SHACTIVATEINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHACTIVATEINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHACTIVATEINFO_1sizeof_FUNC);
+	rc = (jint)SHACTIVATEINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SHACTIVATEINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SHBrowseForFolderA
 JNIEXPORT jint JNICALL OS_NATIVE(SHBrowseForFolderA)
 	(JNIEnv *env, jclass that, jobject arg0)
@@ -8851,6 +9996,42 @@ fail:
 }
 #endif
 
+#ifndef NO_SHELLEXECUTEINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHELLEXECUTEINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHELLEXECUTEINFO_1sizeof_FUNC);
+	rc = (jint)SHELLEXECUTEINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SHELLEXECUTEINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SHFILEINFOA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHFILEINFOA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHFILEINFOA_1sizeof_FUNC);
+	rc = (jint)SHFILEINFOA_sizeof();
+	OS_NATIVE_EXIT(env, that, SHFILEINFOA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SHFILEINFOW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHFILEINFOW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHFILEINFOW_1sizeof_FUNC);
+	rc = (jint)SHFILEINFOW_sizeof();
+	OS_NATIVE_EXIT(env, that, SHFILEINFOW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SHGetFileInfoA
 JNIEXPORT jint JNICALL OS_NATIVE(SHGetFileInfoA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
@@ -8953,6 +10134,30 @@ fail:
 }
 #endif
 
+#ifndef NO_SHMENUBARINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHMENUBARINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHMENUBARINFO_1sizeof_FUNC);
+	rc = (jint)SHMENUBARINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SHMENUBARINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SHRGINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHRGINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SHRGINFO_1sizeof_FUNC);
+	rc = (jint)SHRGINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SHRGINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SHRecognizeGesture
 JNIEXPORT jint JNICALL OS_NATIVE(SHRecognizeGesture)
 	(JNIEnv *env, jclass that, jobject arg0)
@@ -9003,6 +10208,54 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SHSipPreference)
 }
 #endif
 
+#ifndef NO_SIPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SIPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SIPINFO_1sizeof_FUNC);
+	rc = (jint)SIPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SIPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SIZE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SIZE_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SIZE_1sizeof_FUNC);
+	rc = (jint)SIZE_sizeof();
+	OS_NATIVE_EXIT(env, that, SIZE_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_STARTUPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(STARTUPINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, STARTUPINFO_1sizeof_FUNC);
+	rc = (jint)STARTUPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, STARTUPINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SYSTEMTIME_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SYSTEMTIME_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SYSTEMTIME_1sizeof_FUNC);
+	rc = (jint)SYSTEMTIME_sizeof();
+	OS_NATIVE_EXIT(env, that, SYSTEMTIME_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SaveDC
 JNIEXPORT jint JNICALL OS_NATIVE(SaveDC)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -10827,6 +12080,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongA)
 }
 #endif
 
+#ifndef NO_SetWindowLongPtrA
+JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongPtrA)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SetWindowLongPtrA_FUNC);
+	rc = (jint)SetWindowLongPtrA((HWND)arg0, arg1, (LONG_PTR)arg2);
+	OS_NATIVE_EXIT(env, that, SetWindowLongPtrA_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_SetWindowLongPtrW
+JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongPtrW)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SetWindowLongPtrW_FUNC);
+	rc = (jint)SetWindowLongPtrW((HWND)arg0, arg1, (LONG_PTR)arg2);
+	OS_NATIVE_EXIT(env, that, SetWindowLongPtrW_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SetWindowLongW
 JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongW)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
@@ -11326,6 +12603,150 @@ fail:
 }
 #endif
 
+#ifndef NO_TBBUTTONINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TBBUTTONINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TBBUTTONINFO_1sizeof_FUNC);
+	rc = (jint)TBBUTTONINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, TBBUTTONINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TBBUTTON_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TBBUTTON_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TBBUTTON_1sizeof_FUNC);
+	rc = (jint)TBBUTTON_sizeof();
+	OS_NATIVE_EXIT(env, that, TBBUTTON_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TCITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TCITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TCITEM_1sizeof_FUNC);
+	rc = (jint)TCITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, TCITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TEXTMETRICA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TEXTMETRICA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TEXTMETRICA_1sizeof_FUNC);
+	rc = (jint)TEXTMETRICA_sizeof();
+	OS_NATIVE_EXIT(env, that, TEXTMETRICA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TEXTMETRICW_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TEXTMETRICW_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TEXTMETRICW_1sizeof_FUNC);
+	rc = (jint)TEXTMETRICW_sizeof();
+	OS_NATIVE_EXIT(env, that, TEXTMETRICW_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TOOLINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TOOLINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TOOLINFO_1sizeof_FUNC);
+	rc = (jint)TOOLINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, TOOLINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TRACKMOUSEEVENT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TRACKMOUSEEVENT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TRACKMOUSEEVENT_1sizeof_FUNC);
+	rc = (jint)TRACKMOUSEEVENT_sizeof();
+	OS_NATIVE_EXIT(env, that, TRACKMOUSEEVENT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TRIVERTEX_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TRIVERTEX_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TRIVERTEX_1sizeof_FUNC);
+	rc = (jint)TRIVERTEX_sizeof();
+	OS_NATIVE_EXIT(env, that, TRIVERTEX_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TVHITTESTINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TVHITTESTINFO_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TVHITTESTINFO_1sizeof_FUNC);
+	rc = (jint)TVHITTESTINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, TVHITTESTINFO_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TVINSERTSTRUCT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TVINSERTSTRUCT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TVINSERTSTRUCT_1sizeof_FUNC);
+	rc = (jint)TVINSERTSTRUCT_sizeof();
+	OS_NATIVE_EXIT(env, that, TVINSERTSTRUCT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TVITEMEX_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TVITEMEX_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TVITEMEX_1sizeof_FUNC);
+	rc = (jint)TVITEMEX_sizeof();
+	OS_NATIVE_EXIT(env, that, TVITEMEX_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_TVITEM_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TVITEM_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, TVITEM_1sizeof_FUNC);
+	rc = (jint)TVITEM_sizeof();
+	OS_NATIVE_EXIT(env, that, TVITEM_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ToAscii
 JNIEXPORT jint JNICALL OS_NATIVE(ToAscii)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jshortArray arg3, jint arg4)
@@ -11516,6 +12937,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentImage)
 }
 #endif
 
+#ifndef NO_UDACCEL_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(UDACCEL_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, UDACCEL_1sizeof_FUNC);
+	rc = (jint)UDACCEL_sizeof();
+	OS_NATIVE_EXIT(env, that, UDACCEL_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_UnhookWindowsHookEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(UnhookWindowsHookEx)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -11652,6 +13085,66 @@ fail:
 }
 #endif
 
+#ifndef NO_VtblCall__IIIJI_3J
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJI_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
+{
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, VtblCall__IIIJI_3J_FUNC);
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+	OS_NATIVE_EXIT(env, that, VtblCall__IIIJI_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VtblCall__IIJ
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
+	OS_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VtblCall__IIJII_3J
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJII_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5)
+{
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, VtblCall__IIJII_3J_FUNC);
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+	OS_NATIVE_EXIT(env, that, VtblCall__IIJII_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_VtblCall__IIJJI_3J
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJI_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
+{
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, VtblCall__IIJJI_3J_FUNC);
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+	OS_NATIVE_EXIT(env, that, VtblCall__IIJJI_3J_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_VtblCall__II_3CII_3I_3I
 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CII_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
@@ -11674,6 +13167,42 @@ fail:
 }
 #endif
 
+#ifndef NO_WINDOWPLACEMENT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(WINDOWPLACEMENT_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WINDOWPLACEMENT_1sizeof_FUNC);
+	rc = (jint)WINDOWPLACEMENT_sizeof();
+	OS_NATIVE_EXIT(env, that, WINDOWPLACEMENT_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WINDOWPOS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(WINDOWPOS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WINDOWPOS_1sizeof_FUNC);
+	rc = (jint)WINDOWPOS_sizeof();
+	OS_NATIVE_EXIT(env, that, WINDOWPOS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_WNDCLASS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(WNDCLASS_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, WNDCLASS_1sizeof_FUNC);
+	rc = (jint)WNDCLASS_sizeof();
+	OS_NATIVE_EXIT(env, that, WNDCLASS_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_WaitMessage
 JNIEXPORT jboolean JNICALL OS_NATIVE(WaitMessage)
 	(JNIEnv *env, jclass that)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
index 91c83da8f1..b8c4de5d90 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
@@ -270,6 +270,8 @@
 #define NO_GetThemeSysSize
 #define NO_GetVersionExA
 #define NO_GetWindowLongA
+#define NO_GetWindowLongPtrA
+#define NO_GetWindowLongPtrW
 #define NO_GetWindowOrgEx
 #define NO_GetWindowPlacement
 #define NO_GetWindowTextA
@@ -404,6 +406,8 @@
 #define NO_SetStretchBltMode
 #define NO_SetTextAlign
 #define NO_SetWindowLongA
+#define NO_SetWindowLongPtrA
+#define NO_SetWindowLongPtrW
 #define NO_SetWindowOrgEx
 #define NO_SetWindowPlacement
 #define NO_SetWindowTextA
@@ -485,6 +489,7 @@
 
 #ifndef WIN32_PLATFORM_PSPC
 #define NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II
+#define NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI
 #define NO_NMRGINFO
 #define NO_SHHandleWMSettingChange
 #define NO_SHRecognizeGesture
@@ -502,6 +507,15 @@
 #endif /* _WIN32_WCE */
 
 #define TrackMouseEvent _TrackMouseEvent
+#ifdef _WIN32_WCE
+#define NOTIFYICONDATAA_V2_SIZE     sizeof(NOTIFYICONDATAA)
+#define NOTIFYICONDATAW_V2_SIZE     sizeof(NOTIFYICONDATAW)
+#else
+#undef NOTIFYICONDATAA_V2_SIZE
+#undef NOTIFYICONDATAW_V2_SIZE
+#define NOTIFYICONDATAA_V2_SIZE     (FIELD_OFFSET(NOTIFYICONDATAA, dwInfoFlags)+sizeof(int))
+#define NOTIFYICONDATAW_V2_SIZE     (FIELD_OFFSET(NOTIFYICONDATAW, dwInfoFlags)+sizeof(int))
+#endif
 
 #if (_WIN32_IE <= 0x0600)
 typedef struct tagTVITEMCHANGE {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
index 26d33afe1d..92a0c2b477 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
@@ -18,11 +18,11 @@
 __declspec(dllexport) HRESULT DllGetVersion(DLLVERSIONINFO *dvi);
 HRESULT DllGetVersion(DLLVERSIONINFO *dvi)
 {
-     dvi->dwMajorVersion = SWT_VERSION / 1000;
-     dvi->dwMinorVersion = SWT_VERSION % 1000;
-     dvi->dwBuildNumber = 0;
-     dvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
-     return 1;
+	dvi->dwMajorVersion = SWT_VERSION / 1000;
+	dvi->dwMinorVersion = SWT_VERSION % 1000;
+	dvi->dwBuildNumber = 0;
+	dvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
+	return 1;
 }
 
 HINSTANCE g_hInstance = NULL;
@@ -35,12 +35,12 @@ BOOL WINAPI DllMain(HANDLE hInstDLL, DWORD dwReason, LPVOID lpvReserved)
 }
 
 #ifndef NO_GetLibraryHandle
-JNIEXPORT jint JNICALL OS_NATIVE(GetLibraryHandle)
+JNIEXPORT SWT_PTR JNICALL OS_NATIVE(GetLibraryHandle)
 	(JNIEnv *env, jclass that)
 {
-	jint rc;
+	SWT_PTR rc;
 	OS_NATIVE_ENTER(env, that, GetLibraryHandle_FUNC)
-	rc = (jint)g_hInstance;
+	rc = (SWT_PTR)g_hInstance;
 	OS_NATIVE_EXIT(env, that, GetLibraryHandle_FUNC)
 	return rc;
 }
@@ -78,16 +78,20 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsSP)
 }
 #endif
 
+#ifdef SWT_PTR_SIZE_64
+#define SendMessageW__II_3I_3I SendMessageW__JI_3J_3J
+#define SendMessageW__II_3I_3I_FUNC SendMessageW__JI_3J_3J_FUNC
+#endif
 #ifndef NO_SendMessageW__II_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
+	(JNIEnv *env, jclass that, SWT_PTR arg0, jint arg1, SWT_PTRArray arg2, SWT_PTRArray arg3)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint rc;
+	SWT_PTR *lparg2=NULL;
+	SWT_PTR *lparg3=NULL;
+	SWT_PTR rc;
 	OS_NATIVE_ENTER(env, that, SendMessageW__II_3I_3I_FUNC)
-	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)->GetSWT_PTRArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetSWT_PTRArrayElements(env, arg3, NULL)) == NULL) goto fail;
 #ifdef _WIN32_WCE
 	/*
 	* Bug on WinCE.  SendMessage can fail (return 0) when being passed references
@@ -98,24 +102,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
 	switch (arg1) {
 		case EM_GETSEL:
 		case CB_GETEDITSEL: {
-			jint wParam = 0, lParam = 0;
-			jint *lpwParam = NULL, *lplParam = NULL;
+			SWT_PTR wParam = 0, lParam = 0;
+			SWT_PTR *lpwParam = NULL, *lplParam = NULL;
 			if (lparg2 != NULL) lpwParam = &wParam;
 			if (lparg3 != NULL) lplParam = &lParam;
-			rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)lpwParam, (LPARAM)lplParam);
+			rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lpwParam, (LPARAM)lplParam);
 			if (lparg2 != NULL) lparg2[0] = wParam;
 			if (lparg3 != NULL) lparg3[0] = lParam;
 			break;
 		}
 		default:
-			rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+			rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 	}
 #else
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+	rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 #endif
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseSWT_PTRArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseSWT_PTRArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, SendMessageW__II_3I_3I_FUNC)
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
index ef03ac73ef..42e0bd4237 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h
@@ -55,4 +55,5 @@
 #define SetProcessDPIAware_LIB "user32.dll"
 #define SetWindowTheme_LIB "uxtheme.dll"
 #define TransparentBlt_LIB "msimg32.dll"
+#define PTR_sizeof() sizeof(void *)
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
index 669dbca949..cf1bb48feb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
@@ -14,9 +14,11 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 717;
-int OS_nativeFunctionCallCount[717];
+int OS_nativeFunctionCount = 843;
+int OS_nativeFunctionCallCount[843];
 char * OS_nativeFunctionNames[] = {
+	"ACCEL_1sizeof",
+	"ACTCTX_1sizeof",
 	"AbortDoc",
 	"ActivateActCtx",
 	"ActivateKeyboardLayout",
@@ -25,11 +27,21 @@ char * OS_nativeFunctionNames[] = {
 	"AnimateWindow",
 	"Arc",
 	"AttachThreadInput",
+	"BITMAPINFOHEADER_1sizeof",
+	"BITMAP_1sizeof",
+	"BLENDFUNCTION_1sizeof",
+	"BROWSEINFO_1sizeof",
+	"BUTTON_1IMAGELIST_1sizeof",
 	"BeginDeferWindowPos",
 	"BeginPaint",
 	"BeginPath",
 	"BitBlt",
 	"BringWindowToTop",
+	"CHOOSECOLOR_1sizeof",
+	"CHOOSEFONT_1sizeof",
+	"COMBOBOXINFO_1sizeof",
+	"COMPOSITIONFORM_1sizeof",
+	"CREATESTRUCT_1sizeof",
 	"Call",
 	"CallNextHookEx",
 	"CallWindowProcA",
@@ -88,6 +100,11 @@ char * OS_nativeFunctionNames[] = {
 	"CreateStreamOnHGlobal",
 	"CreateWindowExA",
 	"CreateWindowExW",
+	"DIBSECTION_1sizeof",
+	"DLLVERSIONINFO_1sizeof",
+	"DOCINFO_1sizeof",
+	"DRAWITEMSTRUCT_1sizeof",
+	"DROPFILES_1sizeof",
 	"DefFrameProcA",
 	"DefFrameProcW",
 	"DefMDIChildProcA",
@@ -124,6 +141,7 @@ char * OS_nativeFunctionNames[] = {
 	"DrawThemeIcon",
 	"DrawThemeParentBackground",
 	"DrawThemeText",
+	"EXTLOGPEN_1sizeof",
 	"Ellipse",
 	"EnableMenuItem",
 	"EnableScrollBar",
@@ -153,6 +171,7 @@ char * OS_nativeFunctionNames[] = {
 	"ExtTextOutW",
 	"ExtractIconExA",
 	"ExtractIconExW",
+	"FILETIME_1sizeof",
 	"FillPath",
 	"FillRect",
 	"FindWindowA",
@@ -160,6 +179,9 @@ char * OS_nativeFunctionNames[] = {
 	"FormatMessageA",
 	"FormatMessageW",
 	"FreeLibrary",
+	"GCP_1RESULTS_1sizeof",
+	"GRADIENT_1RECT_1sizeof",
+	"GUITHREADINFO_1sizeof",
 	"GdiSetBatchLimit",
 	"GetACP",
 	"GetActiveWindow",
@@ -302,6 +324,8 @@ char * OS_nativeFunctionNames[] = {
 	"GetWindow",
 	"GetWindowDC",
 	"GetWindowLongA",
+	"GetWindowLongPtrA",
+	"GetWindowLongPtrW",
 	"GetWindowLongW",
 	"GetWindowOrgEx",
 	"GetWindowPlacement",
@@ -321,12 +345,20 @@ char * OS_nativeFunctionNames[] = {
 	"GlobalSize",
 	"GlobalUnlock",
 	"GradientFill",
+	"HDHITTESTINFO_1sizeof",
+	"HDITEM_1sizeof",
+	"HDLAYOUT_1sizeof",
+	"HELPINFO_1sizeof",
+	"HIGHCONTRAST_1sizeof",
 	"HeapAlloc",
 	"HeapFree",
 	"HeapValidate",
 	"HideCaret",
 	"HitTestThemeBackground",
+	"ICONINFO_1sizeof",
 	"IIDFromString",
+	"INITCOMMONCONTROLSEX_1sizeof",
+	"INPUT_1sizeof",
 	"ImageList_1Add",
 	"ImageList_1AddMasked",
 	"ImageList_1BeginDrag",
@@ -386,7 +418,16 @@ char * OS_nativeFunctionNames[] = {
 	"IsWindowEnabled",
 	"IsWindowVisible",
 	"IsZoomed",
+	"KEYBDINPUT_1sizeof",
 	"KillTimer",
+	"LITEM_1sizeof",
+	"LOGBRUSH_1sizeof",
+	"LOGFONTA_1sizeof",
+	"LOGFONTW_1sizeof",
+	"LOGPEN_1sizeof",
+	"LVCOLUMN_1sizeof",
+	"LVHITTESTINFO_1sizeof",
+	"LVITEM_1sizeof",
 	"LineTo",
 	"LoadBitmapA",
 	"LoadBitmapW",
@@ -404,7 +445,16 @@ char * OS_nativeFunctionNames[] = {
 	"LoadStringW",
 	"LocalFree",
 	"LockWindowUpdate",
+	"MARGINS_1sizeof",
 	"MCIWndRegisterClass",
+	"MEASUREITEMSTRUCT_1sizeof",
+	"MENUBARINFO_1sizeof",
+	"MENUINFO_1sizeof",
+	"MENUITEMINFO_1sizeof",
+	"MINMAXINFO_1sizeof",
+	"MONITORINFO_1sizeof",
+	"MOUSEINPUT_1sizeof",
+	"MSG_1sizeof",
 	"MapVirtualKeyA",
 	"MapVirtualKeyW",
 	"MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I",
@@ -472,6 +522,7 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II",
@@ -493,14 +544,46 @@ char * OS_nativeFunctionNames[] = {
 	"MsgWaitForMultipleObjectsEx",
 	"MultiByteToWideChar__IIII_3CI",
 	"MultiByteToWideChar__II_3BI_3CI",
+	"NMCUSTOMDRAW_1sizeof",
+	"NMHDR_1sizeof",
+	"NMHEADER_1sizeof",
+	"NMLINK_1sizeof",
+	"NMLISTVIEW_1sizeof",
+	"NMLVCUSTOMDRAW_1sizeof",
+	"NMLVDISPINFO_1sizeof",
+	"NMLVFINDITEM_1sizeof",
+	"NMREBARCHEVRON_1sizeof",
+	"NMREBARCHILDSIZE_1sizeof",
+	"NMRGINFO_1sizeof",
+	"NMTBHOTITEM_1sizeof",
+	"NMTOOLBAR_1sizeof",
+	"NMTTDISPINFOA_1sizeof",
+	"NMTTDISPINFOW_1sizeof",
+	"NMTVCUSTOMDRAW_1sizeof",
+	"NMTVDISPINFO_1sizeof",
+	"NMTVITEMCHANGE_1sizeof",
+	"NMUPDOWN_1sizeof",
+	"NONCLIENTMETRICSA_1sizeof",
+	"NONCLIENTMETRICSW_1sizeof",
+	"NOTIFYICONDATAA_1V2_1SIZE",
+	"NOTIFYICONDATAW_1V2_1SIZE",
 	"NotifyWinEvent",
+	"OFNOTIFY_1sizeof",
+	"OPENFILENAME_1sizeof",
+	"OSVERSIONINFOA_1sizeof",
+	"OSVERSIONINFOW_1sizeof",
 	"OffsetRect",
 	"OffsetRgn",
 	"OleInitialize",
 	"OleUninitialize",
 	"OpenClipboard",
 	"OpenThemeData",
+	"PAINTSTRUCT_1sizeof",
+	"POINT_1sizeof",
 	"PRIMARYLANGID",
+	"PRINTDLG_1sizeof",
+	"PROCESS_1INFORMATION_1sizeof",
+	"PTR_1sizeof",
 	"PatBlt",
 	"PeekMessageA",
 	"PeekMessageW",
@@ -515,6 +598,8 @@ char * OS_nativeFunctionNames[] = {
 	"PrintDlgW",
 	"PtInRect",
 	"PtInRegion",
+	"REBARBANDINFO_1sizeof",
+	"RECT_1sizeof",
 	"RealizePalette",
 	"RectInRegion",
 	"Rectangle",
@@ -543,19 +628,38 @@ char * OS_nativeFunctionNames[] = {
 	"RemovePropW",
 	"RestoreDC",
 	"RoundRect",
+	"SCRIPT_1ANALYSIS_1sizeof",
+	"SCRIPT_1CONTROL_1sizeof",
+	"SCRIPT_1DIGITSUBSTITUTE_1sizeof",
+	"SCRIPT_1FONTPROPERTIES_1sizeof",
+	"SCRIPT_1ITEM_1sizeof",
+	"SCRIPT_1LOGATTR_1sizeof",
+	"SCRIPT_1PROPERTIES_1sizeof",
+	"SCRIPT_1STATE_1sizeof",
+	"SCROLLINFO_1sizeof",
+	"SHACTIVATEINFO_1sizeof",
 	"SHBrowseForFolderA",
 	"SHBrowseForFolderW",
 	"SHCreateMenuBar",
+	"SHELLEXECUTEINFO_1sizeof",
+	"SHFILEINFOA_1sizeof",
+	"SHFILEINFOW_1sizeof",
 	"SHGetFileInfoA",
 	"SHGetFileInfoW",
 	"SHGetMalloc",
 	"SHGetPathFromIDListA",
 	"SHGetPathFromIDListW",
 	"SHHandleWMSettingChange",
+	"SHMENUBARINFO_1sizeof",
+	"SHRGINFO_1sizeof",
 	"SHRecognizeGesture",
 	"SHSendBackToFocusWindow",
 	"SHSetAppKeyWndAssoc",
 	"SHSipPreference",
+	"SIPINFO_1sizeof",
+	"SIZE_1sizeof",
+	"STARTUPINFO_1sizeof",
+	"SYSTEMTIME_1sizeof",
 	"SaveDC",
 	"ScreenToClient",
 	"ScriptApplyDigitSubstitution",
@@ -672,6 +776,8 @@ char * OS_nativeFunctionNames[] = {
 	"SetTextColor",
 	"SetTimer",
 	"SetWindowLongA",
+	"SetWindowLongPtrA",
+	"SetWindowLongPtrW",
 	"SetWindowLongW",
 	"SetWindowOrgEx",
 	"SetWindowPlacement",
@@ -705,6 +811,18 @@ char * OS_nativeFunctionNames[] = {
 	"SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I",
 	"SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I",
 	"SystemParametersInfoW__II_3II",
+	"TBBUTTONINFO_1sizeof",
+	"TBBUTTON_1sizeof",
+	"TCITEM_1sizeof",
+	"TEXTMETRICA_1sizeof",
+	"TEXTMETRICW_1sizeof",
+	"TOOLINFO_1sizeof",
+	"TRACKMOUSEEVENT_1sizeof",
+	"TRIVERTEX_1sizeof",
+	"TVHITTESTINFO_1sizeof",
+	"TVINSERTSTRUCT_1sizeof",
+	"TVITEMEX_1sizeof",
+	"TVITEM_1sizeof",
 	"ToAscii",
 	"ToUnicode",
 	"TrackMouseEvent",
@@ -716,6 +834,7 @@ char * OS_nativeFunctionNames[] = {
 	"TranslateMessage",
 	"TransparentBlt",
 	"TransparentImage",
+	"UDACCEL_1sizeof",
 	"UnhookWindowsHookEx",
 	"UnregisterClassA",
 	"UnregisterClassW",
@@ -726,7 +845,14 @@ char * OS_nativeFunctionNames[] = {
 	"VtblCall__II",
 	"VtblCall__III",
 	"VtblCall__IIIII_3I",
+	"VtblCall__IIIJI_3J",
+	"VtblCall__IIJ",
+	"VtblCall__IIJII_3J",
+	"VtblCall__IIJJI_3J",
 	"VtblCall__II_3CII_3I_3I",
+	"WINDOWPLACEMENT_1sizeof",
+	"WINDOWPOS_1sizeof",
+	"WNDCLASS_1sizeof",
 	"WaitMessage",
 	"WideCharToMultiByte__II_3CIII_3B_3Z",
 	"WideCharToMultiByte__II_3CI_3BI_3B_3Z",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
index 2399072388..ce6b9dce7c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
@@ -21,6 +21,8 @@ extern char* OS_nativeFunctionNames[];
 #endif
 
 typedef enum {
+	ACCEL_1sizeof_FUNC,
+	ACTCTX_1sizeof_FUNC,
 	AbortDoc_FUNC,
 	ActivateActCtx_FUNC,
 	ActivateKeyboardLayout_FUNC,
@@ -29,11 +31,21 @@ typedef enum {
 	AnimateWindow_FUNC,
 	Arc_FUNC,
 	AttachThreadInput_FUNC,
+	BITMAPINFOHEADER_1sizeof_FUNC,
+	BITMAP_1sizeof_FUNC,
+	BLENDFUNCTION_1sizeof_FUNC,
+	BROWSEINFO_1sizeof_FUNC,
+	BUTTON_1IMAGELIST_1sizeof_FUNC,
 	BeginDeferWindowPos_FUNC,
 	BeginPaint_FUNC,
 	BeginPath_FUNC,
 	BitBlt_FUNC,
 	BringWindowToTop_FUNC,
+	CHOOSECOLOR_1sizeof_FUNC,
+	CHOOSEFONT_1sizeof_FUNC,
+	COMBOBOXINFO_1sizeof_FUNC,
+	COMPOSITIONFORM_1sizeof_FUNC,
+	CREATESTRUCT_1sizeof_FUNC,
 	Call_FUNC,
 	CallNextHookEx_FUNC,
 	CallWindowProcA_FUNC,
@@ -92,6 +104,11 @@ typedef enum {
 	CreateStreamOnHGlobal_FUNC,
 	CreateWindowExA_FUNC,
 	CreateWindowExW_FUNC,
+	DIBSECTION_1sizeof_FUNC,
+	DLLVERSIONINFO_1sizeof_FUNC,
+	DOCINFO_1sizeof_FUNC,
+	DRAWITEMSTRUCT_1sizeof_FUNC,
+	DROPFILES_1sizeof_FUNC,
 	DefFrameProcA_FUNC,
 	DefFrameProcW_FUNC,
 	DefMDIChildProcA_FUNC,
@@ -128,6 +145,7 @@ typedef enum {
 	DrawThemeIcon_FUNC,
 	DrawThemeParentBackground_FUNC,
 	DrawThemeText_FUNC,
+	EXTLOGPEN_1sizeof_FUNC,
 	Ellipse_FUNC,
 	EnableMenuItem_FUNC,
 	EnableScrollBar_FUNC,
@@ -157,6 +175,7 @@ typedef enum {
 	ExtTextOutW_FUNC,
 	ExtractIconExA_FUNC,
 	ExtractIconExW_FUNC,
+	FILETIME_1sizeof_FUNC,
 	FillPath_FUNC,
 	FillRect_FUNC,
 	FindWindowA_FUNC,
@@ -164,6 +183,9 @@ typedef enum {
 	FormatMessageA_FUNC,
 	FormatMessageW_FUNC,
 	FreeLibrary_FUNC,
+	GCP_1RESULTS_1sizeof_FUNC,
+	GRADIENT_1RECT_1sizeof_FUNC,
+	GUITHREADINFO_1sizeof_FUNC,
 	GdiSetBatchLimit_FUNC,
 	GetACP_FUNC,
 	GetActiveWindow_FUNC,
@@ -306,6 +328,8 @@ typedef enum {
 	GetWindow_FUNC,
 	GetWindowDC_FUNC,
 	GetWindowLongA_FUNC,
+	GetWindowLongPtrA_FUNC,
+	GetWindowLongPtrW_FUNC,
 	GetWindowLongW_FUNC,
 	GetWindowOrgEx_FUNC,
 	GetWindowPlacement_FUNC,
@@ -325,12 +349,20 @@ typedef enum {
 	GlobalSize_FUNC,
 	GlobalUnlock_FUNC,
 	GradientFill_FUNC,
+	HDHITTESTINFO_1sizeof_FUNC,
+	HDITEM_1sizeof_FUNC,
+	HDLAYOUT_1sizeof_FUNC,
+	HELPINFO_1sizeof_FUNC,
+	HIGHCONTRAST_1sizeof_FUNC,
 	HeapAlloc_FUNC,
 	HeapFree_FUNC,
 	HeapValidate_FUNC,
 	HideCaret_FUNC,
 	HitTestThemeBackground_FUNC,
+	ICONINFO_1sizeof_FUNC,
 	IIDFromString_FUNC,
+	INITCOMMONCONTROLSEX_1sizeof_FUNC,
+	INPUT_1sizeof_FUNC,
 	ImageList_1Add_FUNC,
 	ImageList_1AddMasked_FUNC,
 	ImageList_1BeginDrag_FUNC,
@@ -390,7 +422,16 @@ typedef enum {
 	IsWindowEnabled_FUNC,
 	IsWindowVisible_FUNC,
 	IsZoomed_FUNC,
+	KEYBDINPUT_1sizeof_FUNC,
 	KillTimer_FUNC,
+	LITEM_1sizeof_FUNC,
+	LOGBRUSH_1sizeof_FUNC,
+	LOGFONTA_1sizeof_FUNC,
+	LOGFONTW_1sizeof_FUNC,
+	LOGPEN_1sizeof_FUNC,
+	LVCOLUMN_1sizeof_FUNC,
+	LVHITTESTINFO_1sizeof_FUNC,
+	LVITEM_1sizeof_FUNC,
 	LineTo_FUNC,
 	LoadBitmapA_FUNC,
 	LoadBitmapW_FUNC,
@@ -408,7 +449,16 @@ typedef enum {
 	LoadStringW_FUNC,
 	LocalFree_FUNC,
 	LockWindowUpdate_FUNC,
+	MARGINS_1sizeof_FUNC,
 	MCIWndRegisterClass_FUNC,
+	MEASUREITEMSTRUCT_1sizeof_FUNC,
+	MENUBARINFO_1sizeof_FUNC,
+	MENUINFO_1sizeof_FUNC,
+	MENUITEMINFO_1sizeof_FUNC,
+	MINMAXINFO_1sizeof_FUNC,
+	MONITORINFO_1sizeof_FUNC,
+	MOUSEINPUT_1sizeof_FUNC,
+	MSG_1sizeof_FUNC,
 	MapVirtualKeyA_FUNC,
 	MapVirtualKeyW_FUNC,
 	MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
@@ -476,6 +526,7 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC,
@@ -497,14 +548,46 @@ typedef enum {
 	MsgWaitForMultipleObjectsEx_FUNC,
 	MultiByteToWideChar__IIII_3CI_FUNC,
 	MultiByteToWideChar__II_3BI_3CI_FUNC,
+	NMCUSTOMDRAW_1sizeof_FUNC,
+	NMHDR_1sizeof_FUNC,
+	NMHEADER_1sizeof_FUNC,
+	NMLINK_1sizeof_FUNC,
+	NMLISTVIEW_1sizeof_FUNC,
+	NMLVCUSTOMDRAW_1sizeof_FUNC,
+	NMLVDISPINFO_1sizeof_FUNC,
+	NMLVFINDITEM_1sizeof_FUNC,
+	NMREBARCHEVRON_1sizeof_FUNC,
+	NMREBARCHILDSIZE_1sizeof_FUNC,
+	NMRGINFO_1sizeof_FUNC,
+	NMTBHOTITEM_1sizeof_FUNC,
+	NMTOOLBAR_1sizeof_FUNC,
+	NMTTDISPINFOA_1sizeof_FUNC,
+	NMTTDISPINFOW_1sizeof_FUNC,
+	NMTVCUSTOMDRAW_1sizeof_FUNC,
+	NMTVDISPINFO_1sizeof_FUNC,
+	NMTVITEMCHANGE_1sizeof_FUNC,
+	NMUPDOWN_1sizeof_FUNC,
+	NONCLIENTMETRICSA_1sizeof_FUNC,
+	NONCLIENTMETRICSW_1sizeof_FUNC,
+	NOTIFYICONDATAA_1V2_1SIZE_FUNC,
+	NOTIFYICONDATAW_1V2_1SIZE_FUNC,
 	NotifyWinEvent_FUNC,
+	OFNOTIFY_1sizeof_FUNC,
+	OPENFILENAME_1sizeof_FUNC,
+	OSVERSIONINFOA_1sizeof_FUNC,
+	OSVERSIONINFOW_1sizeof_FUNC,
 	OffsetRect_FUNC,
 	OffsetRgn_FUNC,
 	OleInitialize_FUNC,
 	OleUninitialize_FUNC,
 	OpenClipboard_FUNC,
 	OpenThemeData_FUNC,
+	PAINTSTRUCT_1sizeof_FUNC,
+	POINT_1sizeof_FUNC,
 	PRIMARYLANGID_FUNC,
+	PRINTDLG_1sizeof_FUNC,
+	PROCESS_1INFORMATION_1sizeof_FUNC,
+	PTR_1sizeof_FUNC,
 	PatBlt_FUNC,
 	PeekMessageA_FUNC,
 	PeekMessageW_FUNC,
@@ -519,6 +602,8 @@ typedef enum {
 	PrintDlgW_FUNC,
 	PtInRect_FUNC,
 	PtInRegion_FUNC,
+	REBARBANDINFO_1sizeof_FUNC,
+	RECT_1sizeof_FUNC,
 	RealizePalette_FUNC,
 	RectInRegion_FUNC,
 	Rectangle_FUNC,
@@ -547,19 +632,38 @@ typedef enum {
 	RemovePropW_FUNC,
 	RestoreDC_FUNC,
 	RoundRect_FUNC,
+	SCRIPT_1ANALYSIS_1sizeof_FUNC,
+	SCRIPT_1CONTROL_1sizeof_FUNC,
+	SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC,
+	SCRIPT_1FONTPROPERTIES_1sizeof_FUNC,
+	SCRIPT_1ITEM_1sizeof_FUNC,
+	SCRIPT_1LOGATTR_1sizeof_FUNC,
+	SCRIPT_1PROPERTIES_1sizeof_FUNC,
+	SCRIPT_1STATE_1sizeof_FUNC,
+	SCROLLINFO_1sizeof_FUNC,
+	SHACTIVATEINFO_1sizeof_FUNC,
 	SHBrowseForFolderA_FUNC,
 	SHBrowseForFolderW_FUNC,
 	SHCreateMenuBar_FUNC,
+	SHELLEXECUTEINFO_1sizeof_FUNC,
+	SHFILEINFOA_1sizeof_FUNC,
+	SHFILEINFOW_1sizeof_FUNC,
 	SHGetFileInfoA_FUNC,
 	SHGetFileInfoW_FUNC,
 	SHGetMalloc_FUNC,
 	SHGetPathFromIDListA_FUNC,
 	SHGetPathFromIDListW_FUNC,
 	SHHandleWMSettingChange_FUNC,
+	SHMENUBARINFO_1sizeof_FUNC,
+	SHRGINFO_1sizeof_FUNC,
 	SHRecognizeGesture_FUNC,
 	SHSendBackToFocusWindow_FUNC,
 	SHSetAppKeyWndAssoc_FUNC,
 	SHSipPreference_FUNC,
+	SIPINFO_1sizeof_FUNC,
+	SIZE_1sizeof_FUNC,
+	STARTUPINFO_1sizeof_FUNC,
+	SYSTEMTIME_1sizeof_FUNC,
 	SaveDC_FUNC,
 	ScreenToClient_FUNC,
 	ScriptApplyDigitSubstitution_FUNC,
@@ -676,6 +780,8 @@ typedef enum {
 	SetTextColor_FUNC,
 	SetTimer_FUNC,
 	SetWindowLongA_FUNC,
+	SetWindowLongPtrA_FUNC,
+	SetWindowLongPtrW_FUNC,
 	SetWindowLongW_FUNC,
 	SetWindowOrgEx_FUNC,
 	SetWindowPlacement_FUNC,
@@ -709,6 +815,18 @@ typedef enum {
 	SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I_FUNC,
 	SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
 	SystemParametersInfoW__II_3II_FUNC,
+	TBBUTTONINFO_1sizeof_FUNC,
+	TBBUTTON_1sizeof_FUNC,
+	TCITEM_1sizeof_FUNC,
+	TEXTMETRICA_1sizeof_FUNC,
+	TEXTMETRICW_1sizeof_FUNC,
+	TOOLINFO_1sizeof_FUNC,
+	TRACKMOUSEEVENT_1sizeof_FUNC,
+	TRIVERTEX_1sizeof_FUNC,
+	TVHITTESTINFO_1sizeof_FUNC,
+	TVINSERTSTRUCT_1sizeof_FUNC,
+	TVITEMEX_1sizeof_FUNC,
+	TVITEM_1sizeof_FUNC,
 	ToAscii_FUNC,
 	ToUnicode_FUNC,
 	TrackMouseEvent_FUNC,
@@ -720,6 +838,7 @@ typedef enum {
 	TranslateMessage_FUNC,
 	TransparentBlt_FUNC,
 	TransparentImage_FUNC,
+	UDACCEL_1sizeof_FUNC,
 	UnhookWindowsHookEx_FUNC,
 	UnregisterClassA_FUNC,
 	UnregisterClassW_FUNC,
@@ -730,7 +849,14 @@ typedef enum {
 	VtblCall__II_FUNC,
 	VtblCall__III_FUNC,
 	VtblCall__IIIII_3I_FUNC,
+	VtblCall__IIIJI_3J_FUNC,
+	VtblCall__IIJ_FUNC,
+	VtblCall__IIJII_3J_FUNC,
+	VtblCall__IIJJI_3J_FUNC,
 	VtblCall__II_3CII_3I_3I_FUNC,
+	WINDOWPLACEMENT_1sizeof_FUNC,
+	WINDOWPOS_1sizeof_FUNC,
+	WNDCLASS_1sizeof_FUNC,
 	WaitMessage_FUNC,
 	WideCharToMultiByte__II_3CIII_3B_3Z_FUNC,
 	WideCharToMultiByte__II_3CI_3BI_3B_3Z_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
index ae44828cb9..a728346e0a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
@@ -1218,7 +1218,7 @@ void setHDHITTESTINFOFields(JNIEnv *env, jobject lpObject, HDHITTESTINFO *lpStru
 typedef struct HDITEM_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID mask, cxy, pszText, hbm, cchTextMax, fmt, lParam, iImage, iOrder;
+	jfieldID mask, cxy, pszText, hbm, cchTextMax, fmt, lParam, iImage, iOrder, type, pvFilter;
 } HDITEM_FID_CACHE;
 
 HDITEM_FID_CACHE HDITEMFc;
@@ -1236,6 +1236,8 @@ void cacheHDITEMFields(JNIEnv *env, jobject lpObject)
 	HDITEMFc.lParam = (*env)->GetFieldID(env, HDITEMFc.clazz, "lParam", "I");
 	HDITEMFc.iImage = (*env)->GetFieldID(env, HDITEMFc.clazz, "iImage", "I");
 	HDITEMFc.iOrder = (*env)->GetFieldID(env, HDITEMFc.clazz, "iOrder", "I");
+	HDITEMFc.type = (*env)->GetFieldID(env, HDITEMFc.clazz, "type", "I");
+	HDITEMFc.pvFilter = (*env)->GetFieldID(env, HDITEMFc.clazz, "pvFilter", "I");
 	HDITEMFc.cached = 1;
 }
 
@@ -1251,6 +1253,12 @@ HDITEM *getHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct)
 	lpStruct->lParam = (*env)->GetIntField(env, lpObject, HDITEMFc.lParam);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, HDITEMFc.iImage);
 	lpStruct->iOrder = (*env)->GetIntField(env, lpObject, HDITEMFc.iOrder);
+#ifndef _WIN32_WCE
+	lpStruct->type = (*env)->GetIntField(env, lpObject, HDITEMFc.type);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->pvFilter = (void *)(*env)->GetIntField(env, lpObject, HDITEMFc.pvFilter);
+#endif
 	return lpStruct;
 }
 
@@ -1266,6 +1274,12 @@ void setHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, HDITEMFc.lParam, (jint)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.iImage, (jint)lpStruct->iImage);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.iOrder, (jint)lpStruct->iOrder);
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, HDITEMFc.type, (jint)lpStruct->type);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, HDITEMFc.pvFilter, (jint)lpStruct->pvFilter);
+#endif
 }
 #endif
 
@@ -1969,7 +1983,7 @@ void setLVHITTESTINFOFields(JNIEnv *env, jobject lpObject, LVHITTESTINFO *lpStru
 typedef struct LVITEM_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID mask, iItem, iSubItem, state, stateMask, pszText, cchTextMax, iImage, lParam, iIndent;
+	jfieldID mask, iItem, iSubItem, state, stateMask, pszText, cchTextMax, iImage, lParam, iIndent, iGroupId, cColumns, puColumns;
 } LVITEM_FID_CACHE;
 
 LVITEM_FID_CACHE LVITEMFc;
@@ -1988,6 +2002,9 @@ void cacheLVITEMFields(JNIEnv *env, jobject lpObject)
 	LVITEMFc.iImage = (*env)->GetFieldID(env, LVITEMFc.clazz, "iImage", "I");
 	LVITEMFc.lParam = (*env)->GetFieldID(env, LVITEMFc.clazz, "lParam", "I");
 	LVITEMFc.iIndent = (*env)->GetFieldID(env, LVITEMFc.clazz, "iIndent", "I");
+	LVITEMFc.iGroupId = (*env)->GetFieldID(env, LVITEMFc.clazz, "iGroupId", "I");
+	LVITEMFc.cColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "cColumns", "I");
+	LVITEMFc.puColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "puColumns", "I");
 	LVITEMFc.cached = 1;
 }
 
@@ -2004,6 +2021,15 @@ LVITEM *getLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, LVITEMFc.iImage);
 	lpStruct->lParam = (*env)->GetIntField(env, lpObject, LVITEMFc.lParam);
 	lpStruct->iIndent = (*env)->GetIntField(env, lpObject, LVITEMFc.iIndent);
+#ifndef _WIN32_WCE
+	lpStruct->iGroupId = (*env)->GetIntField(env, lpObject, LVITEMFc.iGroupId);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->cColumns = (*env)->GetIntField(env, lpObject, LVITEMFc.cColumns);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->puColumns = (PUINT)(*env)->GetIntField(env, lpObject, LVITEMFc.puColumns);
+#endif
 	return lpStruct;
 }
 
@@ -2020,6 +2046,15 @@ void setLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iImage, (jint)lpStruct->iImage);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.lParam, (jint)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iIndent, (jint)lpStruct->iIndent);
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, LVITEMFc.iGroupId, (jint)lpStruct->iGroupId);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, LVITEMFc.cColumns, (jint)lpStruct->cColumns);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, LVITEMFc.puColumns, (jint)lpStruct->puColumns);
+#endif
 }
 #endif
 
@@ -2747,7 +2782,7 @@ void setNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStruct)
 typedef struct NMLVCUSTOMDRAW_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID clrText, clrTextBk, iSubItem;
+	jfieldID clrText, clrTextBk, iSubItem, dwItemType, clrFace, iIconEffect, iIconPhase, iPartId, iStateId, left, top, right, bottom, uAlign;
 } NMLVCUSTOMDRAW_FID_CACHE;
 
 NMLVCUSTOMDRAW_FID_CACHE NMLVCUSTOMDRAWFc;
@@ -2760,6 +2795,17 @@ void cacheNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject)
 	NMLVCUSTOMDRAWFc.clrText = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "clrText", "I");
 	NMLVCUSTOMDRAWFc.clrTextBk = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "clrTextBk", "I");
 	NMLVCUSTOMDRAWFc.iSubItem = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "iSubItem", "I");
+	NMLVCUSTOMDRAWFc.dwItemType = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "dwItemType", "I");
+	NMLVCUSTOMDRAWFc.clrFace = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "clrFace", "I");
+	NMLVCUSTOMDRAWFc.iIconEffect = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "iIconEffect", "I");
+	NMLVCUSTOMDRAWFc.iIconPhase = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "iIconPhase", "I");
+	NMLVCUSTOMDRAWFc.iPartId = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "iPartId", "I");
+	NMLVCUSTOMDRAWFc.iStateId = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "iStateId", "I");
+	NMLVCUSTOMDRAWFc.left = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "left", "I");
+	NMLVCUSTOMDRAWFc.top = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "top", "I");
+	NMLVCUSTOMDRAWFc.right = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "right", "I");
+	NMLVCUSTOMDRAWFc.bottom = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "bottom", "I");
+	NMLVCUSTOMDRAWFc.uAlign = (*env)->GetFieldID(env, NMLVCUSTOMDRAWFc.clazz, "uAlign", "I");
 	NMLVCUSTOMDRAWFc.cached = 1;
 }
 
@@ -2770,6 +2816,39 @@ NMLVCUSTOMDRAW *getNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMLVCUSTO
 	lpStruct->clrText = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrText);
 	lpStruct->clrTextBk = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrTextBk);
 	lpStruct->iSubItem = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iSubItem);
+#ifndef _WIN32_WCE
+	lpStruct->dwItemType = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.dwItemType);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->clrFace = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrFace);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->iIconEffect = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iIconEffect);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->iIconPhase = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iIconPhase);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->iPartId = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iPartId);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->iStateId = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iStateId);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->rcText.left = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.left);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->rcText.top = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.top);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->rcText.right = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.right);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->rcText.bottom = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.bottom);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->uAlign = (*env)->GetIntField(env, lpObject, NMLVCUSTOMDRAWFc.uAlign);
+#endif
 	return lpStruct;
 }
 
@@ -2780,6 +2859,39 @@ void setNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMLVCUSTOMDRAW *lpSt
 	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrText, (jint)lpStruct->clrText);
 	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrTextBk, (jint)lpStruct->clrTextBk);
 	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iSubItem, (jint)lpStruct->iSubItem);
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.dwItemType, (jint)lpStruct->dwItemType);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.clrFace, (jint)lpStruct->clrFace);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iIconEffect, (jint)lpStruct->iIconEffect);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iIconPhase, (jint)lpStruct->iIconPhase);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iPartId, (jint)lpStruct->iPartId);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.iStateId, (jint)lpStruct->iStateId);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.left, (jint)lpStruct->rcText.left);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.top, (jint)lpStruct->rcText.top);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.right, (jint)lpStruct->rcText.right);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.bottom, (jint)lpStruct->rcText.bottom);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVCUSTOMDRAWFc.uAlign, (jint)lpStruct->uAlign);
+#endif
 }
 #endif
 
@@ -2787,7 +2899,7 @@ void setNMLVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMLVCUSTOMDRAW *lpSt
 typedef struct NMLVDISPINFO_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID mask, iItem, iSubItem, state, stateMask, pszText, cchTextMax, iImage, lParam, iIndent;
+	jfieldID mask, iItem, iSubItem, state, stateMask, pszText, cchTextMax, iImage, lParam, iIndent, iGroupId, cColumns, puColumns;
 } NMLVDISPINFO_FID_CACHE;
 
 NMLVDISPINFO_FID_CACHE NMLVDISPINFOFc;
@@ -2807,6 +2919,9 @@ void cacheNMLVDISPINFOFields(JNIEnv *env, jobject lpObject)
 	NMLVDISPINFOFc.iImage = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iImage", "I");
 	NMLVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "lParam", "I");
 	NMLVDISPINFOFc.iIndent = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iIndent", "I");
+	NMLVDISPINFOFc.iGroupId = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iGroupId", "I");
+	NMLVDISPINFOFc.cColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "cColumns", "I");
+	NMLVDISPINFOFc.puColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "puColumns", "I");
 	NMLVDISPINFOFc.cached = 1;
 }
 
@@ -2824,6 +2939,15 @@ NMLVDISPINFO *getNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO
 	lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iImage);
 	lpStruct->item.lParam = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.lParam);
 	lpStruct->item.iIndent = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iIndent);
+#ifndef _WIN32_WCE
+	lpStruct->item.iGroupId = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->item.cColumns = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.cColumns);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->item.puColumns = (PUINT)(*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.puColumns);
+#endif
 	return lpStruct;
 }
 
@@ -2841,6 +2965,15 @@ void setNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO *lpStruct
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iImage, (jint)lpStruct->item.iImage);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.lParam, (jint)lpStruct->item.lParam);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iIndent, (jint)lpStruct->item.iIndent);
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId, (jint)lpStruct->item.iGroupId);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.cColumns, (jint)lpStruct->item.cColumns);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.puColumns, (jint)lpStruct->item.puColumns);
+#endif
 }
 #endif
 
@@ -4066,7 +4199,7 @@ void setOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct)
 typedef struct OPENFILENAME_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID lStructSize, hwndOwner, hInstance, lpstrFilter, lpstrCustomFilter, nMaxCustFilter, nFilterIndex, lpstrFile, nMaxFile, lpstrFileTitle, nMaxFileTitle, lpstrInitialDir, lpstrTitle, Flags, nFileOffset, nFileExtension, lpstrDefExt, lCustData, lpfnHook, lpTemplateName;
+	jfieldID lStructSize, hwndOwner, hInstance, lpstrFilter, lpstrCustomFilter, nMaxCustFilter, nFilterIndex, lpstrFile, nMaxFile, lpstrFileTitle, nMaxFileTitle, lpstrInitialDir, lpstrTitle, Flags, nFileOffset, nFileExtension, lpstrDefExt, lCustData, lpfnHook, lpTemplateName, pvReserved, dwReserved, FlagsEx;
 } OPENFILENAME_FID_CACHE;
 
 OPENFILENAME_FID_CACHE OPENFILENAMEFc;
@@ -4095,6 +4228,9 @@ void cacheOPENFILENAMEFields(JNIEnv *env, jobject lpObject)
 	OPENFILENAMEFc.lCustData = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lCustData", "I");
 	OPENFILENAMEFc.lpfnHook = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpfnHook", "I");
 	OPENFILENAMEFc.lpTemplateName = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpTemplateName", "I");
+	OPENFILENAMEFc.pvReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "pvReserved", "I");
+	OPENFILENAMEFc.dwReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "dwReserved", "I");
+	OPENFILENAMEFc.FlagsEx = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "FlagsEx", "I");
 	OPENFILENAMEFc.cached = 1;
 }
 
@@ -4121,6 +4257,15 @@ OPENFILENAME *getOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME
 	lpStruct->lCustData = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lCustData);
 	lpStruct->lpfnHook = (LPOFNHOOKPROC)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpfnHook);
 	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpTemplateName);
+#ifndef _WIN32_WCE
+	lpStruct->pvReserved = (void *)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.pvReserved);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.dwReserved);
+#endif
+#ifndef _WIN32_WCE
+	lpStruct->FlagsEx = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.FlagsEx);
+#endif
 	return lpStruct;
 }
 
@@ -4147,6 +4292,15 @@ void setOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME *lpStruct
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lCustData, (jint)lpStruct->lCustData);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpfnHook, (jint)lpStruct->lpfnHook);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpTemplateName, (jint)lpStruct->lpTemplateName);
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.pvReserved, (jint)lpStruct->pvReserved);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.dwReserved, (jint)lpStruct->dwReserved);
+#endif
+#ifndef _WIN32_WCE
+	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.FlagsEx, (jint)lpStruct->FlagsEx);
+#endif
 }
 #endif
 
@@ -6080,7 +6234,7 @@ void setTEXTMETRICWFields(JNIEnv *env, jobject lpObject, TEXTMETRICW *lpStruct)
 typedef struct TOOLINFO_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID cbSize, uFlags, hwnd, uId, left, top, right, bottom, hinst, lpszText, lParam;
+	jfieldID cbSize, uFlags, hwnd, uId, left, top, right, bottom, hinst, lpszText, lParam, lpReserved;
 } TOOLINFO_FID_CACHE;
 
 TOOLINFO_FID_CACHE TOOLINFOFc;
@@ -6100,6 +6254,7 @@ void cacheTOOLINFOFields(JNIEnv *env, jobject lpObject)
 	TOOLINFOFc.hinst = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hinst", "I");
 	TOOLINFOFc.lpszText = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpszText", "I");
 	TOOLINFOFc.lParam = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lParam", "I");
+	TOOLINFOFc.lpReserved = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpReserved", "I");
 	TOOLINFOFc.cached = 1;
 }
 
@@ -6117,6 +6272,7 @@ TOOLINFO *getTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct)
 	lpStruct->hinst = (HINSTANCE)(*env)->GetIntField(env, lpObject, TOOLINFOFc.hinst);
 	lpStruct->lpszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TOOLINFOFc.lpszText);
 	lpStruct->lParam = (*env)->GetIntField(env, lpObject, TOOLINFOFc.lParam);
+	lpStruct->lpReserved = (void *)(*env)->GetIntField(env, lpObject, TOOLINFOFc.lpReserved);
 	return lpStruct;
 }
 
@@ -6134,6 +6290,7 @@ void setTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.hinst, (jint)lpStruct->hinst);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lpszText, (jint)lpStruct->lpszText);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lpReserved, (jint)lpStruct->lpReserved);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
index 3f1b5ff481..857eb2e600 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
@@ -12,10 +12,9 @@ package org.eclipse.swt.internal.gdip;
 
 public class BitmapData {
 	public int Width;
-    public int Height;
-    public int Stride;
-    public int PixelFormat;
-    public int Scan0;
-    public int Reserved;
-    public static final int sizeof = 24;
+	public int Height;
+	public int Stride;
+	public int PixelFormat;
+	public int /*long*/ Scan0;
+	public int /*long*/ Reserved;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/ColorPalette.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/ColorPalette.java
index c78892a01a..1245be1bd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/ColorPalette.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/ColorPalette.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.gdip;
 
 public class ColorPalette {
 	public int Flags;
-    public int Count;
-    public int[] Entries = new int[1];
-	public static final int sizeof = 12;
+	public int Count;
+	public int[] Entries = new int[1];
+	public static final int sizeof = Gdip.ColorPalette_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
index f8c5f39738..1f872699dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
@@ -35,265 +35,267 @@ public class Gdip extends Platform {
 	public static final int FillModeWinding = 1;
 	public static final int DashCapFlat = 0;
 	public static final int DashCapRound = 2;
-    public static final int DashCapTriangle = 3;
-    public static final int DashStyleSolid = 0;
-    public static final int DashStyleDash = 1;
-    public static final int DashStyleDot = 2;
-    public static final int DashStyleDashDot = 3;
-    public static final int DashStyleDashDotDot = 4;
-    public static final int DashStyleCustom = 5;
-    public static final int FontStyleRegular = 0;
-    public static final int FontStyleBold = 1;
-    public static final int FontStyleItalic = 2;
-    public static final int FontStyleBoldItalic = 3;
-    public static final int FontStyleUnderline = 4;
-    public static final int FontStyleStrikeout = 8;
-    public static final int PaletteFlagsHasAlpha = 0x0001;
-    public static final int FlushIntentionFlush = 0;
-    public static final int FlushIntentionSync = 1;
-    public static final int HotkeyPrefixNone = 0;
-    public static final int HotkeyPrefixShow = 1;
-    public static final int HotkeyPrefixHide = 2;
-    public static final int LineJoinMiter = 0;
-    public static final int LineJoinBevel = 1;
-    public static final int LineJoinRound = 2;
-    public static final int LineCapFlat = 0;
-    public static final int LineCapSquare = 1;
-    public static final int LineCapRound = 2;
-    public static final int MatrixOrderPrepend = 0;
-    public static final int MatrixOrderAppend = 1;
-    public static final int QualityModeDefault = 0;
-    public static final int QualityModeLow = 1;
-    public static final int QualityModeHigh = 2;
-    public static final int InterpolationModeDefault = QualityModeDefault;
-    public static final int InterpolationModeLowQuality = QualityModeLow;
-    public static final int InterpolationModeHighQuality = QualityModeHigh;
-    public static final int InterpolationModeBilinear = QualityModeHigh + 1;
-    public static final int InterpolationModeBicubic = QualityModeHigh + 2;
-    public static final int InterpolationModeNearestNeighbor = QualityModeHigh + 3;
-    public static final int InterpolationModeHighQualityBilinear = QualityModeHigh + 4;
-    public static final int InterpolationModeHighQualityBicubic = QualityModeHigh + 5;
-    public static final int PathPointTypeStart = 0;
-    public static final int PathPointTypeLine = 1;
-    public static final int PathPointTypeBezier = 3;
-    public static final int PathPointTypePathTypeMask = 0x7;
-    public static final int PathPointTypePathDashMode = 0x10;
-    public static final int PathPointTypePathMarker = 0x20;
-    public static final int PathPointTypeCloseSubpath = 0x80;
-    public static final int PathPointTypeBezier3 = 3;
-    public static final int PixelFormatIndexed = 0x00010000;
-    public static final int PixelFormatGDI = 0x00020000;
-    public static final int PixelFormatAlpha = 0x00040000;
-    public static final int PixelFormatPAlpha = 0x00080000;
-    public static final int PixelFormatExtended = 0x00100000;
-    public static final int PixelFormatCanonical = 0x00200000;
-    public static final int PixelFormat1bppIndexed = (1 | ( 1 << 8) | PixelFormatIndexed | PixelFormatGDI);
-    public static final int PixelFormat4bppIndexed = (2 | ( 4 << 8) | PixelFormatIndexed | PixelFormatGDI);
-    public static final int PixelFormat8bppIndexed = (3 | ( 8 << 8) | PixelFormatIndexed | PixelFormatGDI);
-    public static final int PixelFormat16bppGrayScale = (4 | (16 << 8) | PixelFormatExtended);
-    public static final int PixelFormat16bppRGB555 = (5 | (16 << 8) | PixelFormatGDI);
-    public static final int PixelFormat16bppRGB565 = (6 | (16 << 8) | PixelFormatGDI);
-    public static final int PixelFormat16bppARGB1555 = (7 | (16 << 8) | PixelFormatAlpha | PixelFormatGDI);
-    public static final int PixelFormat24bppRGB = (8 | (24 << 8) | PixelFormatGDI);
-    public static final int PixelFormat32bppRGB = (9 | (32 << 8) | PixelFormatGDI);
-    public static final int PixelFormat32bppARGB = (10 | (32 << 8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical);
-    public static final int PixelFormat32bppPARGB = (11 | (32 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI);
-    public static final int PixelFormat48bppRGB = (12 | (48 << 8) | PixelFormatExtended);
-    public static final int PixelFormat64bppARGB = (13 | (64 << 8) | PixelFormatAlpha  | PixelFormatCanonical | PixelFormatExtended);
-    public static final int PixelFormat64bppPARGB = (14 | (64 << 8) | PixelFormatAlpha  | PixelFormatPAlpha | PixelFormatExtended);
-    public static final int PixelFormatMax = 15;
-    public static final int PixelOffsetModeNone = QualityModeHigh + 1;
-    public static final int PixelOffsetModeHalf = QualityModeHigh + 2;
-    public static final int SmoothingModeDefault = QualityModeDefault;
-    public static final int SmoothingModeHighSpeed = QualityModeLow;
-    public static final int SmoothingModeHighQuality = QualityModeHigh;
-    public static final int SmoothingModeNone = 3;
-    public static final int SmoothingModeAntiAlias8x4 = 4;
-    public static final int SmoothingModeAntiAlias = SmoothingModeAntiAlias8x4;
-    public static final int SmoothingModeAntiAlias8x8 = 5;
-    public static final int StringFormatFlagsDirectionRightToLeft = 0x00000001;
-    public static final int StringFormatFlagsDirectionVertical = 0x00000002;
-    public static final int StringFormatFlagsNoFitBlackBox = 0x00000004;
-    public static final int StringFormatFlagsDisplayFormatControl = 0x00000020;
-    public static final int StringFormatFlagsNoFontFallback = 0x00000400;
-    public static final int StringFormatFlagsMeasureTrailingSpaces = 0x00000800;
-    public static final int StringFormatFlagsNoWrap = 0x00001000;
-    public static final int StringFormatFlagsLineLimit = 0x00002000;
-    public static final int StringFormatFlagsNoClip = 0x00004000;
-    public static final int TextRenderingHintSystemDefault = 0;
-    public static final int TextRenderingHintSingleBitPerPixelGridFit = 1;
-    public static final int TextRenderingHintSingleBitPerPixel = 2;
-    public static final int TextRenderingHintAntiAliasGridFit = 3;
-    public static final int TextRenderingHintAntiAlias = 4;
-    public static final int TextRenderingHintClearTypeGridFit = 5;
-    public static final int UnitPixel = 2;
-    public static final int WrapModeTile = 0;
-    public static final int WrapModeTileFlipX = 1;
-    public static final int WrapModeTileFlipY = 2;
-    public static final int WrapModeTileFlipXY = 3;
-    public static final int WrapModeClamp = 4;
+	public static final int DashCapTriangle = 3;
+	public static final int DashStyleSolid = 0;
+	public static final int DashStyleDash = 1;
+	public static final int DashStyleDot = 2;
+	public static final int DashStyleDashDot = 3;
+	public static final int DashStyleDashDotDot = 4;
+	public static final int DashStyleCustom = 5;
+	public static final int FontStyleRegular = 0;
+	public static final int FontStyleBold = 1;
+	public static final int FontStyleItalic = 2;
+	public static final int FontStyleBoldItalic = 3;
+	public static final int FontStyleUnderline = 4;
+	public static final int FontStyleStrikeout = 8;
+	public static final int PaletteFlagsHasAlpha = 0x0001;
+	public static final int FlushIntentionFlush = 0;
+	public static final int FlushIntentionSync = 1;
+	public static final int HotkeyPrefixNone = 0;
+	public static final int HotkeyPrefixShow = 1;
+	public static final int HotkeyPrefixHide = 2;
+	public static final int LineJoinMiter = 0;
+	public static final int LineJoinBevel = 1;
+	public static final int LineJoinRound = 2;
+	public static final int LineCapFlat = 0;
+	public static final int LineCapSquare = 1;
+	public static final int LineCapRound = 2;
+	public static final int MatrixOrderPrepend = 0;
+	public static final int MatrixOrderAppend = 1;
+	public static final int QualityModeDefault = 0;
+	public static final int QualityModeLow = 1;
+	public static final int QualityModeHigh = 2;
+	public static final int InterpolationModeDefault = QualityModeDefault;
+	public static final int InterpolationModeLowQuality = QualityModeLow;
+	public static final int InterpolationModeHighQuality = QualityModeHigh;
+	public static final int InterpolationModeBilinear = QualityModeHigh + 1;
+	public static final int InterpolationModeBicubic = QualityModeHigh + 2;
+	public static final int InterpolationModeNearestNeighbor = QualityModeHigh + 3;
+	public static final int InterpolationModeHighQualityBilinear = QualityModeHigh + 4;
+	public static final int InterpolationModeHighQualityBicubic = QualityModeHigh + 5;
+	public static final int PathPointTypeStart = 0;
+	public static final int PathPointTypeLine = 1;
+	public static final int PathPointTypeBezier = 3;
+	public static final int PathPointTypePathTypeMask = 0x7;
+	public static final int PathPointTypePathDashMode = 0x10;
+	public static final int PathPointTypePathMarker = 0x20;
+	public static final int PathPointTypeCloseSubpath = 0x80;
+	public static final int PathPointTypeBezier3 = 3;
+	public static final int PixelFormatIndexed = 0x00010000;
+	public static final int PixelFormatGDI = 0x00020000;
+	public static final int PixelFormatAlpha = 0x00040000;
+	public static final int PixelFormatPAlpha = 0x00080000;
+	public static final int PixelFormatExtended = 0x00100000;
+	public static final int PixelFormatCanonical = 0x00200000;
+	public static final int PixelFormat1bppIndexed = (1 | ( 1 << 8) | PixelFormatIndexed | PixelFormatGDI);
+	public static final int PixelFormat4bppIndexed = (2 | ( 4 << 8) | PixelFormatIndexed | PixelFormatGDI);
+	public static final int PixelFormat8bppIndexed = (3 | ( 8 << 8) | PixelFormatIndexed | PixelFormatGDI);
+	public static final int PixelFormat16bppGrayScale = (4 | (16 << 8) | PixelFormatExtended);
+	public static final int PixelFormat16bppRGB555 = (5 | (16 << 8) | PixelFormatGDI);
+	public static final int PixelFormat16bppRGB565 = (6 | (16 << 8) | PixelFormatGDI);
+	public static final int PixelFormat16bppARGB1555 = (7 | (16 << 8) | PixelFormatAlpha | PixelFormatGDI);
+	public static final int PixelFormat24bppRGB = (8 | (24 << 8) | PixelFormatGDI);
+	public static final int PixelFormat32bppRGB = (9 | (32 << 8) | PixelFormatGDI);
+	public static final int PixelFormat32bppARGB = (10 | (32 << 8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical);
+	public static final int PixelFormat32bppPARGB = (11 | (32 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI);
+	public static final int PixelFormat48bppRGB = (12 | (48 << 8) | PixelFormatExtended);
+	public static final int PixelFormat64bppARGB = (13 | (64 << 8) | PixelFormatAlpha  | PixelFormatCanonical | PixelFormatExtended);
+	public static final int PixelFormat64bppPARGB = (14 | (64 << 8) | PixelFormatAlpha  | PixelFormatPAlpha | PixelFormatExtended);
+	public static final int PixelFormatMax = 15;
+	public static final int PixelOffsetModeNone = QualityModeHigh + 1;
+	public static final int PixelOffsetModeHalf = QualityModeHigh + 2;
+	public static final int SmoothingModeDefault = QualityModeDefault;
+	public static final int SmoothingModeHighSpeed = QualityModeLow;
+	public static final int SmoothingModeHighQuality = QualityModeHigh;
+	public static final int SmoothingModeNone = 3;
+	public static final int SmoothingModeAntiAlias8x4 = 4;
+	public static final int SmoothingModeAntiAlias = SmoothingModeAntiAlias8x4;
+	public static final int SmoothingModeAntiAlias8x8 = 5;
+	public static final int StringFormatFlagsDirectionRightToLeft = 0x00000001;
+	public static final int StringFormatFlagsDirectionVertical = 0x00000002;
+	public static final int StringFormatFlagsNoFitBlackBox = 0x00000004;
+	public static final int StringFormatFlagsDisplayFormatControl = 0x00000020;
+	public static final int StringFormatFlagsNoFontFallback = 0x00000400;
+	public static final int StringFormatFlagsMeasureTrailingSpaces = 0x00000800;
+	public static final int StringFormatFlagsNoWrap = 0x00001000;
+	public static final int StringFormatFlagsLineLimit = 0x00002000;
+	public static final int StringFormatFlagsNoClip = 0x00004000;
+	public static final int TextRenderingHintSystemDefault = 0;
+	public static final int TextRenderingHintSingleBitPerPixelGridFit = 1;
+	public static final int TextRenderingHintSingleBitPerPixel = 2;
+	public static final int TextRenderingHintAntiAliasGridFit = 3;
+	public static final int TextRenderingHintAntiAlias = 4;
+	public static final int TextRenderingHintClearTypeGridFit = 5;
+	public static final int UnitPixel = 2;
+	public static final int WrapModeTile = 0;
+	public static final int WrapModeTileFlipX = 1;
+	public static final int WrapModeTileFlipY = 2;
+	public static final int WrapModeTileFlipXY = 3;
+	public static final int WrapModeClamp = 4;
 
+/** 64 bit */
+public static final native int ColorPalette_sizeof();
+public static final native int GdiplusStartupInput_sizeof();
 
 /** GdiPlus natives */
-public static final native int GdiplusStartup(int[] token, GdiplusStartupInput input, int output);
-public static final native void GdiplusShutdown(int[] token);
-public static final native int Bitmap_new(int hbm, int hpal);
-public static final native int Bitmap_new(int hicon);
-public static final native int Bitmap_new(int width, int height, int stride, int format, int scan0);
-public static final native int Bitmap_new(char[] filename, boolean useIcm);
-public static final native void Bitmap_delete(int bitmap);
-public static final native int Bitmap_GetHBITMAP(int bitmap, int colorBackground, int[] hbmReturn);
-public static final native int Bitmap_GetHICON(int bitmap, int[] hicon);
-public static final native int BitmapData_new();
-public static final native void BitmapData_delete(int bitmapData);
-public static final native int Bitmap_LockBits(int bitmap, int rect, int flags, int pixelFormat, int lockedBitmapData);
-public static final native int Bitmap_UnlockBits(int bitmap, int lockedBitmapData);
-public static final native int Brush_Clone(int brush);
-public static final native int Brush_GetType(int brush);
-public static final native int Color_new(int argb);
-public static final native void Color_delete(int color);
-public static final native int Font_new(int hdc, int hfont);
-public static final native int Font_new(char[] familyName, float emSize, int style, int unit, int fontCollection);
-public static final native void Font_delete(int font);
-public static final native int Font_GetFamily(int font, int family);
-public static final native float Font_GetSize(int font);
-public static final native int Font_GetStyle(int font);
-public static final native boolean Font_IsAvailable(int font);
-public static final native int FontFamily_new();
-public static final native void FontFamily_delete(int family);
-public static final native int FontFamily_GetFamilyName(int family, char[] name, char language);
-public static final native int Graphics_new(int hdc);
-public static final native void Graphics_delete(int graphics);
-public static final native int Graphics_DrawArc(int graphics, int pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
-public static final native int Graphics_DrawEllipse(int graphics, int pen, int x, int y, int width, int height);
-public static final native int Graphics_DrawImage(int graphics, int image, int x, int y);
-public static final native int Graphics_DrawImage(int graphics, int image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, int imageAttributes, int callback, int callbackData);
-public static final native int Graphics_DrawLine(int graphics, int pen, int x1, int y1, int x2, int y2);
-public static final native int Graphics_DrawLines(int graphics, int pen, int[] points, int count);
-public static final native int Graphics_DrawPath(int graphics, int pen, int path);
-public static final native int Graphics_DrawPolygon(int graphics, int pen, int[] points, int count);
-public static final native int Graphics_DrawRectangle(int graphics, int pen, int x, int y, int width, int height);
-public static final native int Graphics_DrawString(int graphics, char[] string, int length, int font, PointF origin, int brush);
-public static final native int Graphics_DrawString(int graphics, char[] string, int length, int font, PointF origin, int format, int brush);
-public static final native int Graphics_FillEllipse(int graphics, int brush, int x, int y, int width, int height);
-public static final native int Graphics_FillPath(int graphics, int brush, int path);
-public static final native void Graphics_Flush(int graphics, int intention);
-public static final native int Graphics_FillPie(int graphics, int brush, int x, int y, int width, int height, float startAngle, float sweepAngle);
-public static final native int Graphics_FillPolygon(int graphics, int brush, int[] points, int count, int fillMode);
-public static final native int Graphics_FillRectangle(int graphics, int brush, int x, int y, int width, int height);
-public static final native int Graphics_GetClipBounds(int graphics, RectF rect);
-public static final native int Graphics_GetClipBounds(int graphics, Rect rect);
-public static final native int Graphics_GetClip(int graphics, int region);
-public static final native int Graphics_GetHDC(int graphics);
-public static final native void Graphics_ReleaseHDC(int graphics, int hdc);
-public static final native int Graphics_GetInterpolationMode(int graphics);
-public static final native int Graphics_GetSmoothingMode(int graphics);
-public static final native int Graphics_GetTextRenderingHint(int graphics);
-public static final native int Graphics_GetTransform(int graphics, int matrix);
-public static final native int Graphics_GetVisibleClipBounds(int graphics, Rect rect);
-public static final native int Graphics_MeasureString(int graphics, char[] string, int length, int font, PointF origin, RectF boundingBox);
-public static final native int Graphics_MeasureString(int graphics, char[] string, int length, int font, PointF origin, int format, RectF boundingBox);
-public static final native int Graphics_ResetClip(int graphics);
-public static final native int Graphics_Restore(int graphics, int gstate);
-public static final native int Graphics_Save(int graphics);
-public static final native int Graphics_ScaleTransform(int graphics, float sx, float sy, int order);
-public static final native int Graphics_SetClip(int graphics, int hrgn, int combineMode);
-public static final native int Graphics_SetClip(int graphics, int path);
-public static final native int Graphics_SetClip(int graphics, Rect rect, int combineMode);
-public static final native int Graphics_SetCompositingQuality(int graphics, int compositingQuality);
-public static final native int Graphics_SetPageUnit(int graphics, int unit);
-public static final native int Graphics_SetPixelOffsetMode(int graphics, int pixelOffsetMode);
-public static final native int Graphics_SetSmoothingMode(int graphics, int smoothingMode);
-public static final native int Graphics_SetTransform(int graphics, int matrix);
-public static final native int Graphics_SetInterpolationMode(int graphics, int mode);
-public static final native int Graphics_SetTextRenderingHint(int graphics, int mode);
-public static final native int Graphics_TranslateTransform(int graphics, float dx, float dy, int order);
-public static final native int GraphicsPath_new(int[] points, byte[] types, int count, int fillMode);
-public static final native int GraphicsPath_new(int brushMode);
-public static final native void GraphicsPath_delete(int path);
-public static final native int GraphicsPath_AddArc(int path, float x, float y, float width, float height, float startAngle, float sweepAngle);
-public static final native int GraphicsPath_AddBezier(int path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
-public static final native int GraphicsPath_AddLine(int path, float x1, float y1, float x2, float y2);
-public static final native int GraphicsPath_AddPath(int path, int addingPath, boolean connect);
-public static final native int GraphicsPath_AddRectangle(int path, RectF rect);
-public static final native int GraphicsPath_AddString(int path, char[] string, int length, int family, int style, float emSize, PointF origin, int format);
-public static final native int GraphicsPath_CloseFigure(int path);
-public static final native int GraphicsPath_Flatten(int path, int matrix, float flatness);
-public static final native int GraphicsPath_GetBounds(int path, RectF bounds, int matrix, int pen);
-public static final native int GraphicsPath_GetLastPoint(int path, PointF lastPoint);
-public static final native int GraphicsPath_GetPathPoints(int path, float[] points, int count);
-public static final native int GraphicsPath_GetPathTypes(int path, byte[] types, int count);
-public static final native int GraphicsPath_GetPointCount(int path);
-public static final native boolean GraphicsPath_IsOutlineVisible(int path, float x, float y, int pen, int g);
-public static final native boolean GraphicsPath_IsVisible(int path, float x, float y, int g);
-public static final native int GraphicsPath_SetFillMode(int path, int fillmode);
-public static final native int GraphicsPath_StartFigure(int path);
-public static final native int GraphicsPath_Transform(int path, int matrix);
-public static final native int HatchBrush_new(int hatchStyle, int foreColor, int backColor);
-public static final native int Image_GetLastStatus(int image);
-public static final native int Image_GetPixelFormat(int bitmap);
-public static final native int Image_GetWidth(int image);
-public static final native int Image_GetHeight(int image);
-public static final native int Image_GetPalette(int image, int palette, int size);
-public static final native int Image_GetPaletteSize(int image);
-public static final native int ImageAttributes_new();
-public static final native void ImageAttributes_delete(int attrib);
-public static final native int ImageAttributes_SetWrapMode(int attrib, int wrap);
-public static final native int ImageAttributes_SetColorMatrix(int attrib, float[] matrix, int mode, int type);
-public static final native void HatchBrush_delete(int brush);
-public static final native int LinearGradientBrush_new(PointF point1, PointF point2, int color1, int color2);
-public static final native void LinearGradientBrush_delete(int brush);
-public static final native int LinearGradientBrush_SetInterpolationColors(int brush, int[] presetColors, float[] blendPositions, int count);
-public static final native int LinearGradientBrush_SetWrapMode(int brush, int wrapMode);
-public static final native int Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy);
-public static final native void Matrix_delete(int matrix);
-public static final native int Matrix_GetElements(int matrix, float[] m);
-public static final native int Matrix_Invert(int matrix);
-public static final native boolean Matrix_IsIdentity(int metrix);
-public static final native int Matrix_Multiply(int matrix, int matrix1, int order);
-public static final native int Matrix_Rotate(int matrix, float angle, int order);
-public static final native int Matrix_Scale(int matrix, float scaleX, float scaleY, int order);
-public static final native int Matrix_Shear(int matrix, float shearX, float shearY, int order);
-public static final native int Matrix_TransformPoints(int matrix, PointF pts, int count);
-public static final native int Matrix_TransformPoints(int matrix, float[] pts, int count);
-public static final native int Matrix_Translate(int matrix, float offsetX, float offsetY, int order);
-public static final native int Matrix_SetElements(int matrix, float m11, float m12, float m21, float m22, float dx, float dy);
-public static final native void MoveMemory(ColorPalette Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(BitmapData Destination, int SourcePtr, int Length);
-public static final native int PathGradientBrush_new(int path);
-public static final native void PathGradientBrush_delete(int brush);
-public static final native int PathGradientBrush_SetCenterColor(int brush, int color);
-public static final native int PathGradientBrush_SetCenterPoint(int brush, PointF pt);
-public static final native int PathGradientBrush_SetSurroundColors(int brush, int[] colors, int[] count);
-public static final native int PathGradientBrush_SetGraphicsPath(int brush, int path);
-public static final native int Pen_new(int brush, float width);
-public static final native void Pen_delete(int pen);
-public static final native int Pen_GetBrush(int pen);
-public static final native int Pen_SetBrush(int pen, int brush);
-public static final native int Pen_SetDashPattern(int pen, float[] dashArray, int count);
-public static final native int Pen_SetDashStyle(int pen, int dashStyle);
-public static final native int Pen_SetLineCap(int pen, int startCap, int endCap, int dashCap);
-public static final native int Pen_SetLineJoin(int pen, int lineJoin);
-public static final native int Pen_SetWidth(int pen, float width);
-public static final native int Point_new(int x, int y);
-public static final native void Point_delete(int point);
-public static final native int Region_new(int hRgn);
-public static final native int Region_new();
-public static final native void Region_delete(int region);
-public static final native int Region_GetHRGN(int region, int graphics);
-public static final native boolean Region_IsInfinite(int region, int graphics);
-public static final native int SolidBrush_new(int color);
-public static final native void SolidBrush_delete(int brush);
-public static final native void StringFormat_delete(int format);
-public static final native int StringFormat_Clone(int format);
-public static final native int StringFormat_GenericDefault();
-public static final native int StringFormat_GenericTypographic();
-public static final native int StringFormat_GetFormatFlags(int format);
-public static final native int StringFormat_SetHotkeyPrefix(int format, int hotkeyPrefix);
-public static final native int StringFormat_SetFormatFlags(int format, int flags);
-public static final native int StringFormat_SetTabStops(int format, float firstTabOffset, int count, float[] tabStops);
-public static final native int TextureBrush_new(int image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight);
-public static final native void TextureBrush_delete(int brush);
-public static final native int TextureBrush_SetTransform(int brush, int matrix);
-
+public static final native int GdiplusStartup(int /*long*/[] token, GdiplusStartupInput input, int /*long*/ output);
+public static final native void GdiplusShutdown(int /*long*/ token);
+public static final native int /*long*/ Bitmap_new(int /*long*/ hbm, int /*long*/ hpal);
+public static final native int /*long*/ Bitmap_new(int /*long*/ hicon);
+public static final native int /*long*/ Bitmap_new(int width, int height, int stride, int format, int /*long*/ scan0);
+public static final native int /*long*/ Bitmap_new(char[] filename, boolean useIcm);
+public static final native void Bitmap_delete(int /*long*/ bitmap);
+public static final native int Bitmap_GetHBITMAP(int /*long*/ bitmap, int /*long*/ colorBackground, int /*long*/[] hbmReturn);
+public static final native int Bitmap_GetHICON(int /*long*/ bitmap, int /*long*/[] hicon);
+public static final native int /*long*/ BitmapData_new();
+public static final native void BitmapData_delete(int /*long*/ bitmapData);
+public static final native int Bitmap_LockBits(int /*long*/ bitmap, int /*long*/ rect, int flags, int pixelFormat, int /*long*/ lockedBitmapData);
+public static final native int Bitmap_UnlockBits(int /*long*/ bitmap, int /*long*/ lockedBitmapData);
+public static final native int /*long*/ Brush_Clone(int /*long*/ brush);
+public static final native int Brush_GetType(int /*long*/ brush);
+public static final native int /*long*/ Color_new(int argb);
+public static final native void Color_delete(int /*long*/ color);
+public static final native int /*long*/ Font_new(int /*long*/ hdc, int /*long*/ hfont);
+public static final native int /*long*/ Font_new(char[] familyName, float emSize, int style, int unit, int /*long*/ fontCollection);
+public static final native void Font_delete(int /*long*/ font);
+public static final native int Font_GetFamily(int /*long*/ font, int /*long*/ family);
+public static final native float Font_GetSize(int /*long*/ font);
+public static final native int Font_GetStyle(int /*long*/ font);
+public static final native boolean Font_IsAvailable(int /*long*/ font);
+public static final native int /*long*/ FontFamily_new();
+public static final native void FontFamily_delete(int /*long*/ family);
+public static final native int FontFamily_GetFamilyName(int /*long*/ family, char[] name, char language);
+public static final native int /*long*/ Graphics_new(int /*long*/ hdc);
+public static final native void Graphics_delete(int /*long*/ graphics);
+public static final native int Graphics_DrawArc(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
+public static final native int Graphics_DrawEllipse(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height);
+public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, int x, int y);
+public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, int /*long*/ imageAttributes, int /*long*/ callback, int /*long*/ callbackData);
+public static final native int Graphics_DrawLine(int /*long*/ graphics, int /*long*/ pen, int x1, int y1, int x2, int y2);
+public static final native int Graphics_DrawLines(int /*long*/ graphics, int /*long*/ pen, int[] points, int count);
+public static final native int Graphics_DrawPath(int /*long*/ graphics, int /*long*/ pen, int /*long*/ path);
+public static final native int Graphics_DrawPolygon(int /*long*/ graphics, int /*long*/ pen, int[] points, int count);
+public static final native int Graphics_DrawRectangle(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height);
+public static final native int Graphics_DrawString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ brush);
+public static final native int Graphics_DrawString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ format, int /*long*/ brush);
+public static final native int Graphics_FillEllipse(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height);
+public static final native int Graphics_FillPath(int /*long*/ graphics, int /*long*/ brush, int /*long*/ path);
+public static final native void Graphics_Flush(int /*long*/ graphics, int intention);
+public static final native int Graphics_FillPie(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height, float startAngle, float sweepAngle);
+public static final native int Graphics_FillPolygon(int /*long*/ graphics, int /*long*/ brush, int[] points, int count, int fillMode);
+public static final native int Graphics_FillRectangle(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height);
+public static final native int Graphics_GetClipBounds(int /*long*/ graphics, RectF rect);
+public static final native int Graphics_GetClipBounds(int /*long*/ graphics, Rect rect);
+public static final native int Graphics_GetClip(int /*long*/ graphics, int /*long*/ region);
+public static final native int /*long*/ Graphics_GetHDC(int /*long*/ graphics);
+public static final native void Graphics_ReleaseHDC(int /*long*/ graphics, int /*long*/ hdc);
+public static final native int Graphics_GetInterpolationMode(int /*long*/ graphics);
+public static final native int Graphics_GetSmoothingMode(int /*long*/ graphics);
+public static final native int Graphics_GetTextRenderingHint(int /*long*/ graphics);
+public static final native int Graphics_GetTransform(int /*long*/ graphics, int /*long*/ matrix);
+public static final native int Graphics_GetVisibleClipBounds(int /*long*/ graphics, Rect rect);
+public static final native int Graphics_MeasureString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, RectF boundingBox);
+public static final native int Graphics_MeasureString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ format, RectF boundingBox);
+public static final native int Graphics_ResetClip(int /*long*/ graphics);
+public static final native int Graphics_Restore(int /*long*/ graphics, int gstate);
+public static final native int Graphics_Save(int /*long*/ graphics);
+public static final native int Graphics_ScaleTransform(int /*long*/ graphics, float sx, float sy, int order);
+public static final native int Graphics_SetClip(int /*long*/ graphics, int /*long*/ hrgn, int combineMode);
+public static final native int Graphics_SetClip(int /*long*/ graphics, int /*long*/ path);
+public static final native int Graphics_SetClip(int /*long*/ graphics, Rect rect, int combineMode);
+public static final native int Graphics_SetCompositingQuality(int /*long*/ graphics, int compositingQuality);
+public static final native int Graphics_SetPageUnit(int /*long*/ graphics, int unit);
+public static final native int Graphics_SetPixelOffsetMode(int /*long*/ graphics, int pixelOffsetMode);
+public static final native int Graphics_SetSmoothingMode(int /*long*/ graphics, int smoothingMode);
+public static final native int Graphics_SetTransform(int /*long*/ graphics, int /*long*/ matrix);
+public static final native int Graphics_SetInterpolationMode(int /*long*/ graphics, int mode);
+public static final native int Graphics_SetTextRenderingHint(int /*long*/ graphics, int mode);
+public static final native int Graphics_TranslateTransform(int /*long*/ graphics, float dx, float dy, int order);
+public static final native int /*long*/ GraphicsPath_new(int fillMode);
+public static final native int /*long*/ GraphicsPath_new(int[] points, byte[] types, int count, int fillMode);
+public static final native void GraphicsPath_delete(int /*long*/ path);
+public static final native int GraphicsPath_AddArc(int /*long*/ path, float x, float y, float width, float height, float startAngle, float sweepAngle);
+public static final native int GraphicsPath_AddBezier(int /*long*/ path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
+public static final native int GraphicsPath_AddLine(int /*long*/ path, float x1, float y1, float x2, float y2);
+public static final native int GraphicsPath_AddPath(int /*long*/ path, int /*long*/ addingPath, boolean connect);
+public static final native int GraphicsPath_AddRectangle(int /*long*/ path, RectF rect);
+public static final native int GraphicsPath_AddString(int /*long*/ path, char[] string, int length, int /*long*/ family, int style, float emSize, PointF origin, int /*long*/ format);
+public static final native int GraphicsPath_CloseFigure(int /*long*/ path);
+public static final native int GraphicsPath_Flatten(int /*long*/ path, int /*long*/ matrix, float flatness);
+public static final native int GraphicsPath_GetBounds(int /*long*/ path, RectF bounds, int /*long*/ matrix, int /*long*/ pen);
+public static final native int GraphicsPath_GetLastPoint(int /*long*/ path, PointF lastPoint);
+public static final native int GraphicsPath_GetPathPoints(int /*long*/ path, float[] points, int count);
+public static final native int GraphicsPath_GetPathTypes(int /*long*/ path, byte[] types, int count);
+public static final native int GraphicsPath_GetPointCount(int /*long*/ path);
+public static final native boolean GraphicsPath_IsOutlineVisible(int /*long*/ path, float x, float y, int /*long*/ pen, int /*long*/ g);
+public static final native boolean GraphicsPath_IsVisible(int /*long*/ path, float x, float y, int /*long*/ g);
+public static final native int GraphicsPath_SetFillMode(int /*long*/ path, int fillmode);
+public static final native int GraphicsPath_StartFigure(int /*long*/ path);
+public static final native int GraphicsPath_Transform(int /*long*/ path, int /*long*/ matrix);
+public static final native int /*long*/ HatchBrush_new(int hatchStyle, int /*long*/ foreColor, int /*long*/ backColor);
+public static final native int Image_GetLastStatus(int /*long*/ image);
+public static final native int Image_GetPixelFormat(int /*long*/ image);
+public static final native int Image_GetWidth(int /*long*/ image);
+public static final native int Image_GetHeight(int /*long*/ image);
+public static final native int Image_GetPalette(int /*long*/ image, int /*long*/ palette, int size);
+public static final native int Image_GetPaletteSize(int /*long*/ image);
+public static final native int /*long*/ ImageAttributes_new();
+public static final native void ImageAttributes_delete(int /*long*/ attrib);
+public static final native int ImageAttributes_SetWrapMode(int /*long*/ attrib, int wrap);
+public static final native int ImageAttributes_SetColorMatrix(int /*long*/ attrib, float[] matrix, int mode, int type);
+public static final native void HatchBrush_delete(int /*long*/ brush);
+public static final native int /*long*/ LinearGradientBrush_new(PointF point1, PointF point2, int /*long*/ color1, int /*long*/ color2);
+public static final native void LinearGradientBrush_delete(int /*long*/ brush);
+public static final native int LinearGradientBrush_SetInterpolationColors(int /*long*/ brush, int /*long*/[] presetColors, float[] blendPositions, int count);
+public static final native int LinearGradientBrush_SetWrapMode(int /*long*/ brush, int wrapMode);
+public static final native int /*long*/ Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy);
+public static final native void Matrix_delete(int /*long*/ matrix);
+public static final native int Matrix_GetElements(int /*long*/ matrix, float[] m);
+public static final native int Matrix_Invert(int /*long*/ matrix);
+public static final native boolean Matrix_IsIdentity(int /*long*/ matrix);
+public static final native int Matrix_Multiply(int /*long*/ matrix, int /*long*/ matrix1, int order);
+public static final native int Matrix_Rotate(int /*long*/ matrix, float angle, int order);
+public static final native int Matrix_Scale(int /*long*/ matrix, float scaleX, float scaleY, int order);
+public static final native int Matrix_Shear(int /*long*/ matrix, float shearX, float shearY, int order);
+public static final native int Matrix_TransformPoints(int /*long*/ matrix, PointF pts, int count);
+public static final native int Matrix_TransformPoints(int /*long*/ matrix, float[] pts, int count);
+public static final native int Matrix_Translate(int /*long*/ matrix, float offsetX, float offsetY, int order);
+public static final native int Matrix_SetElements(int /*long*/ matrix, float m11, float m12, float m21, float m22, float dx, float dy);
+public static final native void MoveMemory(ColorPalette Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(BitmapData Destination, int /*long*/ SourcePtr);
+public static final native int /*long*/ PathGradientBrush_new(int /*long*/ path);
+public static final native void PathGradientBrush_delete(int /*long*/ brush);
+public static final native int PathGradientBrush_SetCenterColor(int /*long*/ brush, int /*long*/ color);
+public static final native int PathGradientBrush_SetCenterPoint(int /*long*/ brush, PointF pt);
+public static final native int PathGradientBrush_SetSurroundColors(int /*long*/ brush, int /*long*/[] colors, int[] count);
+public static final native int PathGradientBrush_SetGraphicsPath(int /*long*/ brush, int /*long*/ path);
+public static final native int /*long*/ Pen_new(int /*long*/ brush, float width);
+public static final native void Pen_delete(int /*long*/ pen);
+public static final native int /*long*/ Pen_GetBrush(int /*long*/ pen);
+public static final native int Pen_SetBrush(int /*long*/ pen, int /*long*/ brush);
+public static final native int Pen_SetDashPattern(int /*long*/ pen, float[] dashArray, int count);
+public static final native int Pen_SetDashStyle(int /*long*/ pen, int dashStyle);
+public static final native int Pen_SetLineCap(int /*long*/ pen, int startCap, int endCap, int dashCap);
+public static final native int Pen_SetLineJoin(int /*long*/ pen, int lineJoin);
+public static final native int Pen_SetWidth(int /*long*/ pen, float width);
+public static final native int /*long*/ Point_new(int x, int y);
+public static final native void Point_delete(int /*long*/ point);
+public static final native int /*long*/ Region_new(int /*long*/ hRgn);
+public static final native int /*long*/ Region_new();
+public static final native void Region_delete(int /*long*/ region);
+public static final native int /*long*/ Region_GetHRGN(int /*long*/ region, int /*long*/ graphics);
+public static final native boolean Region_IsInfinite(int /*long*/ region, int /*long*/ graphics);
+public static final native int /*long*/ SolidBrush_new(int /*long*/ color);
+public static final native void SolidBrush_delete(int /*long*/ brush);
+public static final native void StringFormat_delete(int /*long*/ format);
+public static final native int /*long*/ StringFormat_Clone(int /*long*/ format);
+public static final native int /*long*/ StringFormat_GenericDefault();
+public static final native int /*long*/ StringFormat_GenericTypographic();
+public static final native int StringFormat_GetFormatFlags(int /*long*/ format);
+public static final native int StringFormat_SetHotkeyPrefix(int /*long*/ format, int hotkeyPrefix);
+public static final native int StringFormat_SetFormatFlags(int /*long*/ format, int flags);
+public static final native int StringFormat_SetTabStops(int /*long*/ format, float firstTabOffset, int count, float[] tabStops);
+public static final native int /*long*/ TextureBrush_new(int /*long*/ image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight);
+public static final native void TextureBrush_delete(int /*long*/ brush);
+public static final native int TextureBrush_SetTransform(int /*long*/ brush, int /*long*/ matrix);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
index efad8efb95..5b05e96a97 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.gdip;
 
 public class GdiplusStartupInput {
 	public int GdiplusVersion;
-    public int DebugEventCallback;
-    public int SuppressBackgroundThread;
-    public int SuppressExternalCodecs;
-	public static final int sizeof = 16;
+	public int /*long*/ DebugEventCallback;
+	public boolean SuppressBackgroundThread;
+	public boolean SuppressExternalCodecs;
+	public static final int sizeof = Gdip.GdiplusStartupInput_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/PointF.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/PointF.java
index f465f143e1..98279f3893 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/PointF.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/PointF.java
@@ -12,6 +12,5 @@ package org.eclipse.swt.internal.gdip;
 
 public class PointF {
 	public float X;
-    public float Y;
-	public static final int sizeof = 8;
+	public float Y;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Rect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Rect.java
index 44f693d4ac..fdee5c1757 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Rect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Rect.java
@@ -11,9 +11,8 @@
 package org.eclipse.swt.internal.gdip;
 
 public class Rect {
-	public int X;             
-    public int Y;         
-    public int Width;         
-    public int Height;
-	public static final int sizeof = 16;
+	public int X;
+	public int Y;
+	public int Width;
+	public int Height;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/RectF.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/RectF.java
index 4be273d46f..b42c6266a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/RectF.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/RectF.java
@@ -11,9 +11,8 @@
 package org.eclipse.swt.internal.gdip;
 
 public class RectF {
-	public float X;             
-    public float Y;         
-    public float Width;         
-    public float Height;
-	public static final int sizeof = 16;
+	public float X;	
+	public float Y;	
+	public float Width;
+	public float Height;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
index f132f785be..27f22878e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
@@ -12,6 +12,6 @@ package org.eclipse.swt.internal.ole.win32;
 
 public final class CAUUID {
 	public int cElems;
-	public int pElems;
-	public static final int sizeof = 8;
+	public int /*long*/ pElems;
+	public static final int sizeof = COM.CAUUID_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index fc852cf896..d040264453 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
@@ -394,97 +394,137 @@ private static GUID IIDFromString(String lpsz) {
 /** Natives */
 public static final native int CLSIDFromProgID(char[] lpszProgID, GUID pclsid);
 public static final native int CLSIDFromString(char[] lpsz, GUID pclsid);
-public static final native int CoCreateInstance(GUID rclsid, int pUnkOuter, int dwClsContext, GUID riid, int[] ppv); 
+public static final native int CoCreateInstance(GUID rclsid, int /*long*/ pUnkOuter, int dwClsContext, GUID riid, int /*long*/[] ppv); 
 public static final native void CoFreeUnusedLibraries();
-public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, int pServerInfo, GUID riid, int[] ppv);
-public static final native int CoLockObjectExternal(int pUnk, boolean fLock, boolean fLastUnlockReleases);
-public static final native int CoTaskMemAlloc(int cb);
-public static final native void CoTaskMemFree(int pv);
-public static final native int DoDragDrop(int pDataObject, int pDropSource, int dwOKEffect, int[] pdwEffect);
+public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, int /*long*/ pServerInfo, GUID riid, int /*long*/[] ppv);
+public static final native int CoLockObjectExternal(int /*long*/ pUnk, boolean fLock, boolean fLastUnlockReleases);
+public static final native int /*long*/ CoTaskMemAlloc(int cb);
+public static final native void CoTaskMemFree(int /*long*/ pv);
+public static final native int DoDragDrop(int /*long*/ pDataObject, int /*long*/ pDropSource, int dwOKEffect, int[] pdwEffect);
 public static final native int GetClassFile(char[] szFileName, GUID clsid);
 public static final native int IIDFromString(char[] lpsz, GUID lpiid);
 public static final native boolean IsEqualGUID(GUID rguid1, GUID rguid2);
-public static final native void MoveMemory(int Destination, FORMATETC Source, int Length);
-public static final native void MoveMemory(int DestinationPtr, GUID Source, int Length);
-public static final native void MoveMemory(int DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length);
-public static final native void MoveMemory(int Destination, STATSTG Source, int Length);
-public static final native void MoveMemory(int Destination, STGMEDIUM Source, int Length);
-public static final native void MoveMemory(STGMEDIUM Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(DISPPARAMS Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(FORMATETC Destination, int Source, int Length);
-public static final native void MoveMemory(GUID Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(STATSTG Destination, int Source, int Length);
-public static final native void MoveMemory(TYPEATTR Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(RECT Destination, int Source, int Length);
-public static final native void MoveMemory(FUNCDESC Destination, int Source, int Length);
-public static final native void MoveMemory(VARDESC Destination, int Source, int Length);
-public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, int pClientSite, int pStg, int[] ppvObject);
-public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, int pClientSite, int pStg, int[] ppvObj); 
-public static final native int OleCreatePropertyFrame(int hwndOwner,int x, int y, char[] lpszCaption, int cObjects, int[] lplpUnk, int cPages, int lpPageClsID, int lcid, int dwReserved, int lpvReserved);
-public static final native int OleDraw(int pUnk, int dwAspect, int hdcDraw, int lprcBounds);
+public static final native void MoveMemory(int /*long*/ Destination, FORMATETC Source, int Length);
+public static final native void MoveMemory(int /*long*/ DestinationPtr, GUID Source, int Length);
+public static final native void MoveMemory(int /*long*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length);
+public static final native void MoveMemory(int /*long*/ Destination, STATSTG Source, int Length);
+public static final native void MoveMemory(int /*long*/ Destination, STGMEDIUM Source, int Length);
+public static final native void MoveMemory(STGMEDIUM Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(DISPPARAMS Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(FORMATETC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(GUID Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(STATSTG Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(TYPEATTR Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(RECT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(FUNCDESC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(VARDESC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(VARIANT Destination, int /*long*/ Source, int Length);
+public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObject);
+public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObj); 
+public static final native int OleCreatePropertyFrame(int /*long*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, int /*long*/[] lplpUnk, int cPages, int /*long*/ lpPageClsID, int lcid, int dwReserved, int /*long*/ lpvReserved);
+public static final native int OleDraw(int /*long*/ pUnk, int dwAspect, int /*long*/ hdcDraw, int /*long*/ lprcBounds);
 public static final native int OleFlushClipboard();
-public static final native int OleGetClipboard(int[] ppDataObject);
-public static final native int OleIsCurrentClipboard(int pDataObject);
-public static final native boolean OleIsRunning(int pObject);
-public static final native int OleLoad(int pStg, GUID riid, int pClientSite, int[] ppvObj);
-public static final native int OleRun(int pUnknown);
-public static final native int OleSave(int pPS, int pStg,boolean fSameAsLoad);
-public static final native int OleSetClipboard(int pDataObject);
-public static final native int OleSetContainedObject(int pUnk, boolean fContained);
-public static final native int OleSetMenuDescriptor(int holemenu, int hwndFrame, int hwndActiveObject, int lpFrame, int lpActiveObj);
-public static final native int OleTranslateColor(int clr, int hpal, int[] pcolorref);
-public static final native int ProgIDFromCLSID(GUID clsid, int[] lplpszProgID);
-public static final native int RegisterDragDrop(int hwnd, int pDropTarget);
-public static final native  void ReleaseStgMedium(int pmedium); 
-public static final native int RevokeDragDrop(int hwnd);
-public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, int[] ppstgOpen);
+public static final native int OleGetClipboard(int /*long*/[] ppDataObject);
+public static final native int OleIsCurrentClipboard(int /*long*/ pDataObject);
+public static final native boolean OleIsRunning(int /*long*/ pObject);
+public static final native int OleLoad(int /*long*/ pStg, GUID riid, int /*long*/ pClientSite, int /*long*/[] ppvObj);
+public static final native int OleRun(int /*long*/ pUnknown);
+public static final native int OleSave(int /*long*/ pPS, int /*long*/ pStg, boolean fSameAsLoad);
+public static final native int OleSetClipboard(int /*long*/ pDataObject);
+public static final native int OleSetContainedObject(int /*long*/ pUnk, boolean fContained);
+public static final native int OleSetMenuDescriptor(int /*long*/ holemenu, int /*long*/ hwndFrame, int /*long*/ hwndActiveObject, int /*long*/ lpFrame, int /*long*/ lpActiveObj);
+public static final native int OleTranslateColor(int clr, int /*long*/ hpal, int[] pcolorref);
+public static final native int ProgIDFromCLSID(GUID clsid, int /*long*/[] lplpszProgID);
+public static final native int RegisterDragDrop(int /*long*/ hwnd, int /*long*/ pDropTarget);
+public static final native void ReleaseStgMedium(int /*long*/ pmedium); 
+public static final native int RevokeDragDrop(int /*long*/ hwnd);
+public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, int /*long*/[] ppstgOpen);
 public static final native int StgIsStorageFile(char[] pwcsName);
-public static final native int StgOpenStorage(char[] pwcsName, int pstgPriority, int grfMode, int snbExclude, int reserved, int[] ppstgOpen);
-public static final native int StringFromCLSID(GUID rclsid, int[] ppsz); 
-public static final native int SysAllocString(char [] sz);
-public static final native void SysFreeString(int bstr);
-public static final native int SysStringByteLen(int bstr);
-public static final native int VariantChangeType(int pvargDest, int pvarSrc, short wFlags, short vt);
-public static final native int VariantClear(int pvarg);
-public static final native void VariantInit(int pvarg);
-public static final native int VtblCall(int fnNumber, int ppVtbl, char[] arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, char[] arg0, char[] arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, char[] arg0, int arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int[] arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int[] arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, FORMATETC arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, GUID arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, GUID arg1, int arg2, int arg3);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, STATSTG arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, MSG arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, SIZE arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, boolean arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, CAUUID arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, CONTROLINFO arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, FORMATETC arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, FORMATETC arg0, STGMEDIUM arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, GUID arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, GUID arg0, int[] arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3);
-public static final native int VtblCall(int fnNumber, int ppVtbl, LICINFO arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, RECT arg0, int arg1, boolean arg2);
-public static final native int VtblCall(int fnNumber, int ppVtbl, RECT arg0, RECT arg1);
-public static final native int VtblCall(int fnNumber, int ppVtbl, RECT arg0);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int[] arg1, int arg2, int[] arg3);
-public static final native int WriteClassStg(int pStg, GUID rclsid);
+public static final native int StgOpenStorage(char[] pwcsName, int /*long*/ pstgPriority, int grfMode, int /*long*/ snbExclude, int reserved, int /*long*/[] ppstgOpen);
+public static final native int StringFromCLSID(GUID rclsid, int /*long*/[] ppsz); 
+public static final native int /*long*/ SysAllocString(char [] sz);
+public static final native void SysFreeString(int /*long*/ bstr);
+public static final native int SysStringByteLen(int /*long*/ bstr);
+public static final native int VariantChangeType(int /*long*/ pvargDest, int /*long*/ pvarSrc, short wFlags, short vt);
+public static final native int VariantClear(int /*long*/ pvarg);
+public static final native void VariantInit(int /*long*/ pvarg);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int /*long*/ arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int /*long*/ arg1, int arg2, int arg3, int arg4, int /*long*/[] arg5);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int[] arg2);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int /*long*/ arg2);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, GUID arg2, int /*long*/ arg3, int /*long*/[] arg4);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, FORMATETC arg1, int /*long*/[] arg2);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int /*long*/ arg2, int /*long*/ arg3);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int /*long*/ arg5, EXCEPINFO arg6, int[] arg7);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, STATSTG arg1, int /*long*/[] arg2);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, MSG arg0);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, MSG arg1, int /*long*/ arg2, int arg3, int /*long*/ arg4, RECT arg5);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, SIZE arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CAUUID arg0);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CONTROLINFO arg0);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int /*long*/[] arg1);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int /*long*/ arg1, int arg2, int arg3, int[] arg4);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int /*long*/ arg3, int /*long*/ arg4);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, LICINFO arg0);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int /*long*/ arg1, boolean arg2);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, RECT arg1);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/[] arg1, int /*long*/[] arg2, int[] arg3, int /*long*/[] arg4);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/[] arg1, int arg2, int[] arg3);
+
+public static final native int WriteClassStg(int /*long*/ pStg, GUID rclsid);
 
 /** Accessibility constants */
 public static final int CHILDID_SELF = 0;
@@ -585,11 +625,55 @@ public static final int STATE_SYSTEM_MULTISELECTABLE = 0x1000000;
 //public static final int STATE_SYSTEM_VALID = 0x3fffffff;
 
 /** Accessibility natives */
-public static final native int CreateStdAccessibleObject (int hwnd, int idObject, GUID riidInterface, int[] ppvObject);
-public static final native int LresultFromObject (GUID riid, int wParam, int pAcc);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int arg2, int arg3);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-public static final native int VtblCall(int fnNumber, int ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7);
+public static final native int CreateStdAccessibleObject (int /*long*/ hwnd, int idObject, GUID riidInterface, int /*long*/[] ppvObject);
+public static final native int /*long*/ LresultFromObject (GUID riid, int /*long*/ wParam, int /*long*/ pAcc);
+/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4);
+/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5);
+/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5);
+/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int arg4, int arg5, int arg6, int arg7);
+
+/** Custom accessibility natives */
+public static final native int VtblCall_VARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0);
+public static final native int VtblCall_VARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1);
+public static final native int VtblCall_IVARIANT(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1);
+public static final native int VtblCall_IVARIANTP(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native int VtblCall_PVARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native int VtblCall_PPPPVARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
+public static final native int /*long*/ get_accChild_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accName_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accValue_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accDescription_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accRole_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accState_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accHelp_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accHelpTopic_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accKeyboardShortcut_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ get_accDefaultAction_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ accSelect_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ accLocation_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ accNavigate_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ accDoDefaultAction_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ put_accName_CALLBACK(int /*long*/ func);
+public static final native int /*long*/ put_accValue_CALLBACK(int /*long*/ func);
 
+/* sizeof's */
+public static final native int CAUUID_sizeof();
+public static final native int CONTROLINFO_sizeof();
+public static final native int COSERVERINFO_sizeof();
+public static final native int DISPPARAMS_sizeof();
+public static final native int DVTARGETDEVICE_sizeof();
+public static final native int EXCEPINFO_sizeof();
+public static final native int FORMATETC_sizeof();
+public static final native int FUNCDESC_sizeof();
+public static final native int GUID_sizeof();
+public static final native int LICINFO_sizeof();
+public static final native int OLECMD_sizeof();
+public static final native int OLEINPLACEFRAMEINFO_sizeof();
+public static final native int STATSTG_sizeof();
+public static final native int STGMEDIUM_sizeof();
+public static final native int TYPEATTR_sizeof();
+public static final native int VARDESC_sizeof();
+public static final native int VARIANT_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
index 4891ebaa95..44ba639ec9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.ole.win32;
 
 public final class CONTROLINFO {
 	public int cb;
-	public int hAccel;
+	public int /*long*/ hAccel;
 	public short cAccel;
 	public int dwFlags;
-	public static final int sizeof = 16;
+	public static final int sizeof = COM.CONTROLINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
index 56207f00ed..e155575cf9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class COSERVERINFO {
 	public int dwReserved1;   
-	public int pwszName;    
-	public int pAuthInfo;
+	public int /*long*/ pwszName;    
+	public int /*long*/ pAuthInfo;
 	public int dwReserved2;
-	public static final int sizeof = 16; 
+	public static final int sizeof = COM.COSERVERINFO_sizeof (); 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
index cdd10c94c3..abf200fc82 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
@@ -11,9 +11,9 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public final class DISPPARAMS {
-	public int rgvarg;
-	public int rgdispidNamedArgs;
+	public int /*long*/ rgvarg;
+	public int /*long*/ rgdispidNamedArgs;
 	public int cArgs;
 	public int cNamedArgs;
-	public static final int sizeof = 16; 						
+	public static final int sizeof = COM.DISPPARAMS_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
index def4ca0e96..5f0b5f0162 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
@@ -17,5 +17,5 @@ public final class DVTARGETDEVICE {
 	public short tdPortNameOffset;
 	public short tdExtDevmodeOffset;
 	public byte[] tdData = new byte[1];
-	public static final int sizeof = 13;
+	public static final int sizeof = COM.DVTARGETDEVICE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
index cb2789b872..16c800a080 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
@@ -13,12 +13,12 @@ package org.eclipse.swt.internal.ole.win32;
 public final class EXCEPINFO {
 	public short wCode;   
 	public short wReserved;
-	public int bstrSource; 
-	public int bstrDescription; 
-	public int bstrHelpFile;
+	public int /*long*/ bstrSource; 
+	public int /*long*/ bstrDescription; 
+	public int /*long*/ bstrHelpFile;
 	public int dwHelpContext; 
-	public int pvReserved;
-	public int pfnDeferredFillIn;
+	public int /*long*/ pvReserved;
+	public int /*long*/ pfnDeferredFillIn;
 	public int scode;
-	public static final int sizeof = 32;
+	public static final int sizeof = COM.EXCEPINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
index 4786e20349..d80bd0f25a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.ole.win32;
 
 public final class FORMATETC {
 	public int cfFormat;
-	public int ptd;
+	public int /*long*/ ptd;
 	public int dwAspect;
 	public int lindex;
 	public int tymed;
-	public static final int sizeof = 20;
+	public static final int sizeof = COM.FORMATETC_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
index c7a5baf565..c74761f2c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class FUNCDESC {
 	public int memid;
-	public int lprgscode;
-	public int lprgelemdescParam;
+	public int /*long*/ lprgscode;
+	public int /*long*/ lprgelemdescParam;
 	public int funckind;
 	public int invkind;
 	public int callconv;
@@ -23,11 +23,11 @@ public class FUNCDESC {
 	public short cScodes;
 //	ELEMDESC elemdescFunc;
 //	TYPEDESC elemdescFunc.tdesc
-	public int elemdescFunc_tdesc_union;
+	public int /*long*/ elemdescFunc_tdesc_union;
 	public short elemdescFunc_tdesc_vt;
 //	PARAMDESC elemdescFunc.paramdesc
-	public int elemdescFunc_paramdesc_pparamdescex;
+	public int /*long*/ elemdescFunc_paramdesc_pparamdescex;
 	public short elemdescFunc_paramdesc_wParamFlags;
 	public short wFuncFlags;
-	public static final int sizeof = 50;
+	public static final int sizeof = COM.FUNCDESC_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
index 7646263e7a..c4c7e9cf02 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
@@ -15,5 +15,5 @@ public final class GUID {
 	public short Data2;
 	public short Data3;
 	public byte[] Data4 = new byte[8];
-	public static final int sizeof = 16;
+	public static final int sizeof = COM.GUID_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
index 94b3e7cf07..467453a577 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
@@ -13,72 +13,71 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IAccessible extends IDispatch {
 
-public IAccessible(int address) {
+public IAccessible(int /*long*/ address) {
 	super(address);
 }
 
-public int get_accParent(int ppdispParent) {
+public int get_accParent(int /*long*/ ppdispParent) {
 	return COM.VtblCall(7, address, ppdispParent);
 }
-public int get_accChildCount(int pcountChildren) {
+public int get_accChildCount(int /*long*/ pcountChildren) {
 	return COM.VtblCall(8, address, pcountChildren);
 }
-public int get_accChild(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int ppdispChild) {
-	return COM.VtblCall(9, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, ppdispChild);
+public int get_accChild(int /*long*/ variant, int /*long*/ ppdispChild) {
+	return COM.VtblCall_VARIANTP(9, address, variant, ppdispChild);
 }
-public int get_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszName) {
-	return COM.VtblCall(10, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszName);
+public int get_accName(int /*long*/ variant, int /*long*/ pszName) {
+	return COM.VtblCall_VARIANTP(10, address, variant, pszName);
 }
-public int get_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszValue) {
-	return COM.VtblCall(11, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszValue);
+public int get_accValue(int /*long*/ variant, int /*long*/ pszValue) {
+	return COM.VtblCall_VARIANTP(11, address, variant, pszValue);
 }
-public int get_accDescription(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszDescription) {
-	return COM.VtblCall(12, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDescription);
+public int get_accDescription(int /*long*/ variant, int /*long*/ pszDescription) {
+	return COM.VtblCall_VARIANTP(12, address, variant, pszDescription);
 }
-public int get_accRole(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pvarRole) {
-	return COM.VtblCall(13, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarRole);
+public int get_accRole(int /*long*/ variant, int /*long*/ pvarRole) {
+	return COM.VtblCall_VARIANTP(13, address, variant, pvarRole);
 }
-public int get_accState(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pvarState) {
-	return COM.VtblCall(14, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pvarState);
+public int get_accState(int /*long*/ variant, int /*long*/ pvarState) {
+	return COM.VtblCall_VARIANTP(14, address, variant, pvarState);
 }
-public int get_accHelp(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszHelp) {
-	return COM.VtblCall(15, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszHelp);
+public int get_accHelp(int /*long*/ variant, int /*long*/ pszHelp) {
+	return COM.VtblCall_VARIANTP(15, address, variant, pszHelp);
 }
-public int get_accHelpTopic(int pszHelpFile, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pidTopic) {
-	return COM.VtblCall(16, address, pszHelpFile, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pidTopic);
+public int get_accHelpTopic(int /*long*/ pszHelpFile, int /*long*/ variant, int /*long*/ pidTopic) {
+	return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, variant, pidTopic);
 }
-public int get_accKeyboardShortcut(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszKeyboardShortcut) {
-	return COM.VtblCall(17, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszKeyboardShortcut);
+public int get_accKeyboardShortcut(int /*long*/ variant, int /*long*/ pszKeyboardShortcut) {
+	return COM.VtblCall_VARIANTP(17, address, variant, pszKeyboardShortcut);
 }
-public int get_accFocus(int pvarChild) {
+public int get_accFocus(int /*long*/ pvarChild) {
 	return COM.VtblCall(18, address, pvarChild);
 }
-public int get_accSelection(int pvarChildren) {
+public int get_accSelection(int /*long*/ pvarChildren) {
 	return COM.VtblCall(19, address, pvarChildren);
 }
-public int get_accDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int pszDefaultAction) {
-	return COM.VtblCall(20, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, pszDefaultAction);
+public int get_accDefaultAction(int /*long*/ variant, int /*long*/ pszDefaultAction) {
+	return COM.VtblCall_VARIANTP(20, address, variant, pszDefaultAction);
 }
-public int accSelect(int flagsSelect, int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
-	return COM.VtblCall(21, address, flagsSelect, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+public int accSelect(int flagsSelect, int /*long*/ variant) {
+	return COM.VtblCall_IVARIANT(21, address, flagsSelect, variant);
 }
-public int accLocation(int pxLeft, int pyTop, int pcxWidth, int pcyHeight,
-	int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
-	return COM.VtblCall(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+public int accLocation(int /*long*/ pxLeft, int /*long*/ pyTop, int /*long*/ pcxWidth, int /*long*/ pcyHeight, int /*long*/ variant) {
+	return COM.VtblCall_PPPPVARIANT(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant);
 }
-public int accNavigate(int navDir, int varStart_vt, int varStart_reserved1, int varStart_lVal, int varStart_reserved2, int pvarEndUpAt) {
-	return COM.VtblCall(23, address, navDir, varStart_vt, varStart_reserved1, varStart_lVal, varStart_reserved2, pvarEndUpAt);
+public int accNavigate(int navDir, int /*long*/ variant, int /*long*/ pvarEndUpAt) {
+	return COM.VtblCall_IVARIANTP(23, address, navDir, variant, pvarEndUpAt);
 }
-public int accHitTest(int xLeft, int yTop, int pvarChild) {
+public int accHitTest(int xLeft, int yTop, int /*long*/ pvarChild) {
 	return COM.VtblCall(24, address, xLeft, yTop, pvarChild);
 }
-public int accDoDefaultAction(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2) {
-	return COM.VtblCall(25, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2);
+public int accDoDefaultAction(int /*long*/ variant) {
+	return COM.VtblCall_VARIANT(25, address, variant);
 }
-public int put_accName(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int szName) {
-	return COM.VtblCall(26, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szName);
+public int put_accName(int /*long*/ variant, int /*long*/ szName) {
+	return COM.VtblCall_VARIANTP(26, address, variant, szName);
 }
-public int put_accValue(int varChild_vt, int varChild_reserved1, int varChild_lVal, int varChild_reserved2, int szValue) {
-	return COM.VtblCall(27, address, varChild_vt, varChild_reserved1, varChild_lVal, varChild_reserved2, szValue);
+public int put_accValue(int /*long*/ variant, int /*long*/ szValue) {
+	return COM.VtblCall_VARIANTP(27, address, variant, szValue);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
index cb20df065c..7c891701d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
@@ -12,16 +12,16 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IClassFactory2 extends IUnknown
 {
-public IClassFactory2(int address) {
+public IClassFactory2(int /*long*/ address) {
 	super(address);
 }
-public int CreateInstanceLic(int pUnkOuter, int pUnkReserved, GUID riid, int bstrKey, int ppvObject[]) {
+public int CreateInstanceLic(int /*long*/ pUnkOuter, int /*long*/ pUnkReserved, GUID riid, int /*long*/ bstrKey, int /*long*/ ppvObject[]) {
 	return COM.VtblCall(7, address, pUnkOuter, pUnkReserved, riid, bstrKey, ppvObject);
 }
 public int GetLicInfo(LICINFO licInfo) {
 	return COM.VtblCall(5, address, licInfo);
 }
-public int RequestLicKey(int dwReserved, int[] pBstrKey) {
+public int RequestLicKey(int dwReserved, int /*long*/[] pBstrKey) {
 	return COM.VtblCall(6, address, dwReserved, pBstrKey);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
index 05b1fdf9bd..0cfaa697da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IConnectionPoint extends IUnknown
 {
-public IConnectionPoint(int address) {
+public IConnectionPoint(int /*long*/ address) {
 	super(address);
 }
-public int Advise(int pUnk, int[] pdwCookie) {
+public int Advise(int /*long*/ pUnk, int[] pdwCookie) {
 	return COM.VtblCall(5, address, pUnk, pdwCookie);
 }
 public int Unadvise(int dwCookie) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
index d7796e47b3..de0512c7c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IConnectionPointContainer extends IUnknown
 {
-public IConnectionPointContainer(int address) {
+public IConnectionPointContainer(int /*long*/ address) {
 	super(address);
 }
-public int FindConnectionPoint(GUID riid, int[] ppCP) {
+public int FindConnectionPoint(GUID riid, int /*long*/[] ppCP) {
 	return COM.VtblCall(4, address, riid, ppCP);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
index d60336532f..ac51f4d060 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
@@ -11,10 +11,10 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IDataObject extends IUnknown {
-public IDataObject(int address) {
+public IDataObject(int /*long*/ address) {
 	super(address);
 }
-public int EnumFormatEtc(int dwDirection, int[] ppenumFormatetc) {
+public int EnumFormatEtc(int dwDirection, int /*long*/[] ppenumFormatetc) {
 	return COM.VtblCall(8, address, dwDirection, ppenumFormatetc);
 }
 public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
index afd9024614..28a9dfa9d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*;
 
 public class IDispatch extends IUnknown
 {
-public IDispatch(int address) {
+public IDispatch(int /*long*/ address) {
 	super(address);
 }
 public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, int[] rgDispId) {
@@ -23,9 +23,9 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
 	int size = rgszNames.length;
 
 	// create an array to hold the addresses
-	int hHeap = OS.GetProcessHeap();
-	int ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size*4);
-	int[] memTracker = new int[size];
+	int /*long*/ hHeap = OS.GetProcessHeap();
+	int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
+	int /*long*/[] memTracker = new int /*long*/[size];
 	
 	try {	
 		// add the address of each string to the array
@@ -36,10 +36,10 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
 			buffer = new char[nameSize +1];
 			rgszNames[i].getChars(0, nameSize, buffer, 0);
 			// get the address of the start of the array of char
-			int pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
+			int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
 			OS.MoveMemory(pName, buffer, buffer.length * 2);
 			// copy the address to the array of addresses
-			COM.MoveMemory(ppNames + 4*i, new int[]{pName}, 4);
+			COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF);
 			// keep track of the Global Memory so we can free it
 			memTracker[i] = pName;
 		}
@@ -54,13 +54,13 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
 		OS.HeapFree(hHeap, 0, ppNames);
 	}
 }
-public int GetTypeInfo(int iTInfo, int lcid, int[] ppTInfo ){
+public int GetTypeInfo(int iTInfo, int lcid, int /*long*/[] ppTInfo ){
 	return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo);
 }
 public int GetTypeInfoCount(int[] pctinfo ){
 	return COM.VtblCall(3, address, pctinfo);
 }
-public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int pVarResult, EXCEPINFO pExcepInfo, int pArgErr[]) {
+public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int /*long*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) {
 	return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
index 614ef33ac2..ad0b8ce438 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
@@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IEnum extends IUnknown
 {
-public IEnum(int address) {
+public IEnum(int /*long*/ address) {
 	super(address);
 }
-public int Clone( int[] ppenum  ){
+public int Clone( int /*long*/[] ppenum  ){
 	return COM.VtblCall(6, address, ppenum);
 }
-public int Next(int celt, int rgelt, int[] pceltFetched  ){
+public int Next(int celt, int /*long*/ rgelt, int[] pceltFetched  ){
 	return COM.VtblCall(3, address, celt, rgelt, pceltFetched);
 }
 public int Reset() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
index 23cfc76381..9f0632fdb1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IEnumFORMATETC extends IEnum {
-public IEnumFORMATETC(int address) {
+public IEnumFORMATETC(int /*long*/ address) {
 	super(address);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
index c1d6580099..3c8d4ec072 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IEnumSTATSTG extends IEnum {
-public IEnumSTATSTG(int address) {
+public IEnumSTATSTG(int /*long*/ address) {
 	super(address);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
index 36352cac28..be3314890d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IEnumVARIANT extends IEnum {
-public IEnumVARIANT(int address) {
+public IEnumVARIANT(int /*long*/ address) {
 	super(address);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
index 38dd307f2c..a0e554ef8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
@@ -11,10 +11,10 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IFont extends IUnknown {
-public IFont(int address) {
+public IFont(int /*long*/ address) {
 	super(address);
 }
-public int get_hFont(int[] phfont){
+public int get_hFont(int /*long*/[] phfont){
 	return COM.VtblCall(3, address, phfont);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
index dc1eeafd62..3d3a3a77a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IMoniker extends IPersist
 {
-public IMoniker(int address) {
+public IMoniker(int /*long*/ address) {
 	super(address);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
index e4a5e66b7a..540b2f8180 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
@@ -11,15 +11,15 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IOleCommandTarget extends IUnknown {
-public IOleCommandTarget(int address) {
+public IOleCommandTarget(int /*long*/ address) {
 	super(address);
 }
 public int Exec(
 	GUID pguidCmdGroup,  // Pointer to command group
 	int  nCmdID,         // Identifier of command to execute
 	int  nCmdExecOpt,    // Options for executing the command
-	int  pvaIn,          // Pointer to input arguments
-	int  pvaOut          // Pointer to command output
+	int /*long*/  pvaIn,        // Pointer to input arguments
+	int /*long*/  pvaOut        // Pointer to command output
 ){
 	return COM.VtblCall(4, address, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
index 77f86fd99c..a8ae806aef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IOleControl extends IUnknown
 {
-public IOleControl(int address) {
+public IOleControl(int /*long*/ address) {
 	super(address);
 }
 public int GetControlInfo(CONTROLINFO pCI) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
index 7eb42c1bb3..0859fc39dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IOleDocument extends IUnknown
 {
-public IOleDocument(int address) {
+public IOleDocument(int /*long*/ address) {
 	super(address);
 }
-public int CreateView(int pIPSite,int pstm, int dwReserved,int[] ppView) {
+public int CreateView(int /*long*/ pIPSite,int /*long*/ pstm, int dwReserved, int /*long*/[] ppView) {
 	return COM.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
index 9becdff433..67b93c6fc0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
@@ -15,20 +15,19 @@ import org.eclipse.swt.internal.win32.RECT;
  
 public class IOleDocumentView extends IUnknown
 {
-public IOleDocumentView(int address) {
+public IOleDocumentView(int /*long*/ address) {
 	super(address);
 }
-
-public int SetInPlaceSite(int pIPSite) {
+public int SetInPlaceSite(int /*long*/ pIPSite) {
 	return COM.VtblCall(3, address, pIPSite);
 }
-public int SetRect(RECT prcView){
+public int SetRect(RECT prcView) {
 	return COM.VtblCall(6, address, prcView);
 }
-public int Show(int fShow ){
+public int Show(int fShow) {
 	return COM.VtblCall(9, address, fShow);
 }
-public int UIActivate(int fUIActivate){
+public int UIActivate(int fUIActivate) {
 	return COM.VtblCall(10, address, fUIActivate);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
index 15a81ef7a9..b8fc5faeb9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
@@ -14,14 +14,14 @@ import org.eclipse.swt.internal.win32.*;
 
 public class IOleInPlaceActiveObject extends IOleWindow
 {
-public IOleInPlaceActiveObject(int address) {
+public IOleInPlaceActiveObject(int /*long*/ address) {
 	super(address);
 }
 public int TranslateAccelerator(MSG lpmsg) {
 	  //lpmsg - Pointer to message that may need translating
 	  return COM.VtblCall(5, address, lpmsg);
 }
-public int ResizeBorder(RECT prcBorder, int pUIWindow, boolean fFrameWindow) {
+public int ResizeBorder(RECT prcBorder, int /*long*/ pUIWindow, boolean fFrameWindow) {
 	return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
index 027914648e..5ccb269e31 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*;
 
 public class IOleInPlaceObject extends IOleWindow
 {	
-public IOleInPlaceObject(int address) {
+public IOleInPlaceObject(int /*long*/ address) {
 	super(address);
 }
 public int InPlaceDeactivate() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
index 91f8513384..343044dcf5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
@@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IOleLink extends IUnknown
 {
-public IOleLink(int address) {
+public IOleLink(int /*long*/ address) {
 	super(address);
 }
 public int BindIfRunning() {
 	return COM.VtblCall(10, address);
 }
-public int GetSourceMoniker(int[] ppmk) {
+public int GetSourceMoniker(int /*long*/[] ppmk) {
 	return COM.VtblCall(6, address, ppmk);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
index 0f46c0df8f..7a778a9d96 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
@@ -14,22 +14,22 @@ import org.eclipse.swt.internal.win32.*;
 
 public class IOleObject extends IUnknown
 {
-public IOleObject(int address) {
+public IOleObject(int /*long*/ address) {
 	super(address);
 }
-public int Advise(int pAdvSink, int pdwConnection[]) {
+public int Advise(int /*long*/ pAdvSink, int[] pdwConnection) {
 	return COM.VtblCall(19, address, pAdvSink, pdwConnection);
 }
 public int Close(int dwSaveOption) {
 	return COM.VtblCall(6, address, dwSaveOption);
 }
-public int DoVerb(int iVerb, MSG lpmsg, int pActiveSite, int lindex, int hwndParent, RECT lprcPosRect) {
+public int DoVerb(int iVerb, MSG lpmsg, int /*long*/ pActiveSite, int lindex, int /*long*/ hwndParent, RECT lprcPosRect) {
 	return COM.VtblCall(11, address, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect);
 }
 public int GetExtent(int dwDrawAspect, SIZE pSizel) {
 	return COM.VtblCall(18, address, dwDrawAspect, pSizel);
 }
-public int SetClientSite(int pClientSite) {
+public int SetClientSite(int /*long*/ pClientSite) {
 	return COM.VtblCall(3, address, pClientSite);
 }
 public int SetExtent(int dwDrawAspect, SIZE pSizel) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
index 8591661bf7..96fe1b5476 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
@@ -11,10 +11,10 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IOleWindow extends IUnknown {
-public IOleWindow(int address) {
+public IOleWindow(int /*long*/ address) {
 	super(address);
 }
-public int GetWindow(int phwnd[]) {
+public int GetWindow(int /*long*/[] phwnd) {
 	return COM.VtblCall(3, address, phwnd);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
index 43f57c088d..2b58fbf705 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IPersist extends IUnknown
 {
-public IPersist(int address) {
+public IPersist(int /*long*/ address) {
 	super(address);
 }
 public int GetClassID(GUID pClassID) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
index 51caacc6c0..bd1bab86e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
@@ -12,22 +12,22 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IPersistStorage extends IPersist
 {
-public IPersistStorage(int address) {
+public IPersistStorage(int /*long*/ address) {
 	super(address);
 }
 public int IsDirty() {
 	return COM.VtblCall(4, address);
 }
-public int InitNew(int pStg) {
+public int InitNew(int /*long*/ pStg) {
 	return COM.VtblCall(5, address, pStg);
 }
-public int Load(int pStg) {
+public int Load(int /*long*/ pStg) {
 	return COM.VtblCall(6, address, pStg);
 }
-public int Save(int pStgSave, boolean fSameAsLoad) {
+public int Save(int /*long*/ pStgSave, boolean fSameAsLoad) {
 	return COM.VtblCall(7, address, pStgSave, fSameAsLoad);
 }
-public int SaveCompleted(int pStgNew) {
+public int SaveCompleted(int /*long*/ pStgNew) {
 	return COM.VtblCall(8, address, pStgNew);
 }
 public int HandsOffStorage(){
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
index a3545c8b6f..e761a8aa98 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IPersistStreamInit extends IPersist
 {
-public IPersistStreamInit(int address) {
+public IPersistStreamInit(int /*long*/ address) {
 	super(address);
 }
 
-public int Load(int pStm) {
+public int Load(int /*long*/ pStm) {
 	return COM.VtblCall(5, address, pStm);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
index 61c88afb32..e568b23d19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IProvideClassInfo extends IUnknown
 {
-public IProvideClassInfo(int address) {
+public IProvideClassInfo(int /*long*/ address) {
 	super(address);
 }
-public int GetClassInfo(int[] ppTI) {
+public int GetClassInfo(int /*long*/[] ppTI) {
 	return COM.VtblCall(3, address, ppTI);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
index 4c555f2677..454a13e240 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IProvideClassInfo2 extends IProvideClassInfo
 {
-public IProvideClassInfo2(int address) {
+public IProvideClassInfo2(int /*long*/ address) {
 	super(address);
 }
 public int GetGUID(int dwGuidKind, GUID pGUID) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
index 3389e37cd1..fcbe71b52f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class ISpecifyPropertyPages extends IUnknown {
 
-public ISpecifyPropertyPages(int address) {
+public ISpecifyPropertyPages(int /*long*/ address) {
 	super(address);
 }
 public int GetPages(CAUUID pPages){
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
index dbc5bb99d8..4aad54da1c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IStorage extends IUnknown
 {
-public IStorage(int address) {
+public IStorage(int /*long*/ address) {
 	super(address);
 }
 public int Commit(int grfCommitFlag) {
@@ -22,7 +22,7 @@ public int CopyTo(
 	int ciidExclude,     //Number of elements in rgiidExclude
   	GUID rgiidExclude,   //Array of interface identifiers (IIDs)
   	String[] snbExclude, //Points to a block of stream names in the storage object
-	int pstgDest         //Points to destination storage object
+	int /*long*/ pstgDest         //Points to destination storage object
   ){
 	// we only support snbExclude = null
 	if (snbExclude != null) {
@@ -35,7 +35,7 @@ public int CreateStorage(
 	int grfMode,     //Access mode for the new storage object  
 	int reserved1,   //Reserved; must be zero
 	int reserved2,   //Reserved; must be zero
-	int[] ppStg      //Pointer to new storage object
+	int /*long*/[] ppStg      //Pointer to new storage object
 ){
 	
 	// create a null terminated array of char
@@ -51,7 +51,7 @@ public int CreateStream(
 	int grfMode,     //Access mode for the new stream  
 	int reserved1,   //Reserved; must be zero  
 	int reserved2,   //Reserved; must be zero  
-	int[] ppStm      //Pointer to new stream object
+	int /*long*/[] ppStm      //Pointer to new stream object
 ){
   
 	// create a null terminated array of char
@@ -73,9 +73,9 @@ public int DestroyElement(String pwcsName) {
 }
 public int EnumElements( 
 	int reserved1, //Reserved; must be zero
-	int reserved2, //Reserved; must be NULL
+	int /*long*/ reserved2, //Reserved; must be NULL
 	int reserved3, //Reserved; must be zero
-	int[] ppenum   //Pointer to output variable that
+	int /*long*/[] ppenum   //Pointer to output variable that
 				   // receives the IEnumSTATSTG interface 
 ){
 	return COM.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum);
@@ -83,11 +83,11 @@ public int EnumElements(
 public int OpenStorage(
 	String pwcsName,     //Pointer to the name of the                           
 	                     // storage object to open
-	int pstgPriority,    //Must be NULL.
+	int /*long*/ pstgPriority,    //Must be NULL.
 	int grfMode,         //Access mode for the new storage object
 	String snbExclude[], //Must be NULL.
 	int reserved,        //Reserved; must be zero
-	int[] ppStg          //Pointer to opened storage object
+	int /*long*/[] ppStg          //Pointer to opened storage object
 ){
 
 	// create a null terminated array of char
@@ -104,10 +104,10 @@ public int OpenStorage(
 }
 public int OpenStream(
 	String pwcsName, //Pointer to name of stream to open
-	int reserved1,   //Reserved; must be NULL  
+	int /*long*/ reserved1,   //Reserved; must be NULL  
 	int grfMode,     //Access mode for the new stream  
 	int reserved2,   //Reserved; must be zero
-	int[] ppStm      //Pointer to output variable
+	int /*long*/[] ppStm      //Pointer to output variable
 	                 // that receives the IStream interface pointer
 ) {
   
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
index 919888abe3..517e7acb42 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
@@ -11,11 +11,11 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class IStream extends IUnknown {
-public IStream(int address) {
+public IStream(int /*long*/ address) {
 	super(address);
 }
 public int Clone(
-	int[] ppstm  //Pointer to location for pointer to the new stream object
+	int /*long*/[] ppstm  //Pointer to location for pointer to the new stream object
 ){
 	return COM.VtblCall(13, address, ppstm);
 }
@@ -23,13 +23,13 @@ public int Commit( int grfCommitFlags  //Specifies how changes are committed
 ){
 	return COM.VtblCall(8, address, grfCommitFlags);
 }
-public int Read(int pv, int cb, int[] pcbWritten) {
+public int Read(int /*long*/ pv, int cb, int[] pcbWritten) {
 	return COM.VtblCall(3, address, pv, cb, pcbWritten);
 }
 public int Revert(){
 	return COM.VtblCall(9, address);
 }
-public int Write(int pv, int cb, int[] pcbWritten) {
+public int Write(int /*long*/ pv, int cb, int[] pcbWritten) {
 	return COM.VtblCall(4, address, pv, cb, pcbWritten);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
index 1ef15dee7b..cd0a1b2f3e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
@@ -16,16 +16,16 @@ import org.eclipse.swt.internal.win32.OS;
 public class ITypeInfo extends IUnknown
 {
 	
-public ITypeInfo(int address) {
+public ITypeInfo(int /*long*/ address) {
 	super(address);
 }
 public int GetDocumentation(int index, String[] name, String[] docString, int[] pdwHelpContext, String[] helpFile ) {
-	int[] pBstrName = null;
-	if (name != null) pBstrName = new int[1];
-	int[] pBstrDocString = null;
-	if (docString != null) pBstrDocString = new int[1];
-	int[] pBstrHelpFile  = null;
-	if (helpFile != null) pBstrHelpFile = new int[1];
+	int /*long*/[] pBstrName = null;
+	if (name != null) pBstrName = new int /*long*/[1];
+	int /*long*/[] pBstrDocString = null;
+	if (docString != null) pBstrDocString = new int /*long*/[1];
+	int /*long*/[] pBstrHelpFile  = null;
+	if (helpFile != null) pBstrHelpFile = new int /*long*/[1];
 	int rc = COM.VtblCall(12, address, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
 	if (name != null && pBstrName[0] != 0) {
 		int size = COM.SysStringByteLen(pBstrName[0]);
@@ -68,7 +68,7 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[]
 	}
 	return rc;
 }
-public int GetFuncDesc(int index, int[] ppFuncDesc) {
+public int GetFuncDesc(int index, int /*long*/[] ppFuncDesc) {
 	return COM.VtblCall(5, address, index, ppFuncDesc);
 }
 public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
@@ -77,9 +77,9 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
 	int size = rgszNames.length;
 
 	// create an array to hold the addresses
-	int hHeap = OS.GetProcessHeap();
-	int ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size*4);
-	int[] memTracker = new int[size];
+	int /*long*/ hHeap = OS.GetProcessHeap();
+	int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
+	int /*long*/[] memTracker = new int /*long*/[size];
 	
 	try {	
 		// add the address of each string to the array
@@ -90,10 +90,10 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
 			buffer = new char[nameSize +1];
 			rgszNames[i].getChars(0, nameSize, buffer, 0);
 			// get the address of the start of the array of char
-			int pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
+			int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
 			OS.MoveMemory(pName, buffer, buffer.length * 2);
 			// copy the address to the array of addresses
-			COM.MoveMemory(ppNames + 4*i, new int[]{pName}, 4);
+			COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF);
 			// keep track of the Global Memory so we can free it
 			memTracker[i] = pName;
 		}
@@ -115,7 +115,7 @@ public int GetImplTypeFlags(int index, int[] pImplTypeFlags) {
 public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){
 	
 	int nameSize = names.length;
-	int[] rgBstrNames = new int[nameSize];
+	int /*long*/[] rgBstrNames = new int /*long*/[nameSize];
 	int rc = COM.VtblCall(7, address, memid, rgBstrNames, nameSize, pcNames);
 	
 	if (rc == COM.S_OK) {
@@ -136,25 +136,25 @@ public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){
 	
 	return rc;
 }
-public int GetRefTypeInfo(int hRefType, int[] ppTInfo) {
+public int GetRefTypeInfo(int hRefType, int /*long*/[] ppTInfo) {
 	return COM.VtblCall(14, address, hRefType, ppTInfo);
 }
 public int GetRefTypeOfImplType(int index, int[] pRefType) {
 	return COM.VtblCall(8, address, index, pRefType);
 }
-public int GetTypeAttr(int[] ppTypeAttr) {
+public int GetTypeAttr(int /*long*/[] ppTypeAttr) {
 	return COM.VtblCall(3, address, ppTypeAttr);
 }
-public int GetVarDesc(int index, int[] ppVarDesc ) {
+public int GetVarDesc(int index, int /*long*/[] ppVarDesc ) {
 	return COM.VtblCall(6, address, index, ppVarDesc);
 }
-public int ReleaseFuncDesc(int pFuncDesc ) {
+public int ReleaseFuncDesc(int /*long*/ pFuncDesc ) {
 	return COM.VtblCall(20, address, pFuncDesc);
 }
-public int ReleaseTypeAttr(int pTypeAttr) {
+public int ReleaseTypeAttr(int /*long*/ pTypeAttr) {
 	return COM.VtblCall(19, address, pTypeAttr);
 }
-public int ReleaseVarDesc(int pVarDesc ) {
+public int ReleaseVarDesc(int /*long*/ pVarDesc ) {
 	return COM.VtblCall(21, address, pVarDesc);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
index 5ad4f47e26..f4806ea8b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
@@ -12,17 +12,17 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class IUnknown
 {
-	int address;
-public IUnknown(int address) {
+	int /*long*/ address;
+public IUnknown(int /*long*/ address) {
 	this.address = address;
 }
 public int AddRef() {
 	return COM.VtblCall(1, address);
 }
-public int getAddress() {
+public int /*long*/ getAddress() {
 	return address;
 }
-public int QueryInterface(GUID riid, int ppvObject[]) {
+public int QueryInterface(GUID riid, int /*long*/[] ppvObject) {
 	return COM.VtblCall(0, address, riid, ppvObject);
 }
 public int Release() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
index 50ff4033d3..2d6c0f5600 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
@@ -14,13 +14,13 @@ import org.eclipse.swt.internal.win32.*;
 
 public class IViewObject2 extends IUnknown
 {
-public IViewObject2(int address) {
+public IViewObject2(int /*long*/ address) {
 	super(address);
 }
 public int GetExtent(int dwAspect, int lindex, DVTARGETDEVICE ptd, SIZE lpsizel) {
 	return COM.VtblCall(9, address, dwAspect, lindex, ptd, lpsizel);
 }
-public int SetAdvise(int dwAspects, int dwAdvf, int pIAdviseSink) {
+public int SetAdvise(int dwAspects, int dwAdvf, int /*long*/ pIAdviseSink) {
 	return COM.VtblCall(7, address, dwAspects, dwAdvf, pIAdviseSink);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
index 267336b5a9..e66aa2e9fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
@@ -14,5 +14,5 @@ public final class LICINFO {
 	public int cbLicInfo;
 	public boolean fRuntimeKeyAvail;
 	public boolean fLicVerified;
-	public static final int sizeof = 12;
+	public static final int sizeof = COM.LICINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
index 16c3165159..a4910e7ae9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.ole.win32;
 public class OLECMD {
 	public int cmdID;    
 	public int cmdf;
-	public static final int sizeof = 8;
+	public static final int sizeof = COM.OLECMD_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
index a6b6b8be41..a04cab83e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
@@ -13,8 +13,8 @@ package org.eclipse.swt.internal.ole.win32;
 public final class OLEINPLACEFRAMEINFO {
 	public int cb;
 	public int fMDIApp;
-	public int hwndFrame;
-	public int haccel;
+	public int /*long*/ hwndFrame;
+	public int /*long*/ haccel;
 	public int cAccelEntries;
-	public static final int sizeof = 20;
+	public static final int sizeof = COM.OLEINPLACEFRAMEINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
index cc2cf49fe5..56edd608be 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.ole.win32;
 
 public class STATSTG {
-	public int pwcsName;
+	public int /*long*/ pwcsName;
 	public int type; 
 	public long cbSize;
 //	FILETIME mtime;
@@ -32,5 +32,5 @@ public class STATSTG {
 	public byte[] clsid_Data4 = new byte[8];
 	public int grfStateBits; 
 	public int reserved;
-	public static final int sizeof = 72;
+	public static final int sizeof = COM.STATSTG_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
index 773b8c5d6a..bc83a275d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
 
 public final class STGMEDIUM {
 	public int tymed;
-	public int unionField;
-	public int pUnkForRelease;
-	public static final int sizeof = 12;
+	public int /*long*/ unionField;
+	public int /*long*/ pUnkForRelease;
+	public static final int sizeof = COM.STGMEDIUM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
index a57d57fa36..1b3f724d30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
@@ -20,7 +20,7 @@ public final class TYPEATTR {
 	public int dwReserved;
 	public int memidConstructor;
 	public int memidDestructor;
-	public int lpstrSchema;
+	public int /*long*/ lpstrSchema;
 	public int cbSizeInstance;
 	public int typekind;
 	public short cFuncs;
@@ -32,10 +32,10 @@ public final class TYPEATTR {
 	public short wMajorVerNum;
 	public short wMinorVerNum;
 //	TYPEDESC tdescAlias
-	public int tdescAlias_unionField;
+	public int /*long*/ tdescAlias_unionField;
 	public short tdescAlias_vt;
 //	IDLDESC idldesctype
 	public int idldescType_dwReserved;
 	public short idldescType_wIDLFlags;
-	public static final int sizeof = 74;
+	public static final int sizeof = COM.TYPEATTR_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
index 6c72460ed1..a54bd2656d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
@@ -12,16 +12,16 @@ package org.eclipse.swt.internal.ole.win32;
 
 public class VARDESC {
 	public int memid;
-	public int lpstrSchema;
-	public int oInst;
+	public int /*long*/ lpstrSchema;
+	public int /*long*/ oInst;
 //	ELEMDESC elemdescVar
 //	TYPEDESC elemdescVar.tdesc
-	public int elemdescVar_tdesc_union;
+	public int /*long*/ elemdescVar_tdesc_union;
 	public short elemdescVar_tdesc_vt;
 //	PARAMDESC elemdescFunc.paramdesc
-	public int elemdescVar_paramdesc_pparamdescex;
+	public int /*long*/ elemdescVar_paramdesc_pparamdescex;
 	public short elemdescVar_paramdesc_wParamFlags;
 	public short wVarFlags;
 	public int varkind;
-	public static final int sizeof = 36;
+	public static final int sizeof = COM.VARDESC_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java
new file mode 100644
index 0000000000..1f5f1b857f
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.ole.win32;
+
+public class VARIANT {
+	public short vt;
+	public short wReserved1;
+	public short wReserved2;
+	public short wReserved3;
+	public int /*long*/ lVal;
+	public static final int sizeof = COM.VARIANT_sizeof();
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java
index 5bc2590897..fc150bf2dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java
@@ -14,5 +14,5 @@ public class ACCEL {
 	public byte fVirt;
 	public short key;
 	public short cmd;
-	public static final int sizeof = OS.IsWinCE ? 8 : 6;
+	public static final int sizeof = OS.ACCEL_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
index 407d4b7d6a..609613f213 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
@@ -13,12 +13,12 @@ package org.eclipse.swt.internal.win32;
 public class ACTCTX {
 	public int cbSize;
 	public int dwFlags;
-	public int lpSource;
+	public int /*long*/ lpSource;
 	public short wProcessorArchitecture;
 	public short wLangId;
-	public int lpAssemblyDirectory;
-	public int lpResourceName;
-	public int lpApplicationName;
-	public int hModule;
-	public static final int sizeof = 32;
+	public int /*long*/ lpAssemblyDirectory;
+	public int /*long*/ lpResourceName;
+	public int /*long*/ lpApplicationName;
+	public int /*long*/ hModule;
+	public static final int sizeof = OS.ACTCTX_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
index ed0808f6b0..a16894b015 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
@@ -17,6 +17,6 @@ public class BITMAP {
 	public int bmWidthBytes;
 	public short bmPlanes;
 	public short bmBitsPixel;
-	public int bmBits;
-	public static final int sizeof = 24;
+	public int /*long*/ bmBits;
+	public static final int sizeof = OS.BITMAP_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAPINFOHEADER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAPINFOHEADER.java
index 77e0603320..c5e184215b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAPINFOHEADER.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAPINFOHEADER.java
@@ -22,5 +22,5 @@ public class BITMAPINFOHEADER {
 	public int biYPelsPerMeter;
 	public int biClrUsed;
 	public int biClrImportant;
-	public static final int sizeof = 40;
+	public static final int sizeof = OS.BITMAPINFOHEADER_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BLENDFUNCTION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BLENDFUNCTION.java
index cabf8e8980..b0fad19523 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BLENDFUNCTION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BLENDFUNCTION.java
@@ -15,5 +15,5 @@ public class BLENDFUNCTION {
 	public byte BlendFlags;
 	public byte SourceConstantAlpha;
 	public byte AlphaFormat;
-	public static final int sizeof = 4;
+	public static final int sizeof = OS.BLENDFUNCTION_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
index 85de37fcf0..737379abea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
@@ -11,13 +11,13 @@
 package org.eclipse.swt.internal.win32;
 
 public class BROWSEINFO {
-	public int hwndOwner;
-	public int pidlRoot;
-	public int pszDisplayName;
-	public int lpszTitle;
+	public int /*long*/ hwndOwner;
+	public int /*long*/ pidlRoot;
+	public int /*long*/ pszDisplayName;
+	public int /*long*/ lpszTitle;
 	public int ulFlags;
-	public int lpfn;
-	public int lParam;
+	public int /*long*/ lpfn;
+	public int /*long*/ lParam;
 	public int iImage;
-	public static final int sizeof = 32;
+	public static final int sizeof = OS.BROWSEINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
index 0af648a9b0..4eeb62718a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
@@ -11,11 +11,11 @@
 package org.eclipse.swt.internal.win32;
 
 public class BUTTON_IMAGELIST {
-	public int himl; 
+	public int /*long*/ himl; 
 	public int margin_left;
 	public int margin_top; 
 	public int margin_right;
 	public int margin_bottom; 
 	public int uAlign;
-	public static final int sizeof = 24;
+	public static final int sizeof = OS.BUTTON_IMAGELIST_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
index ef5efdd6e9..a7dfca7656 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
@@ -12,13 +12,13 @@ package org.eclipse.swt.internal.win32;
 
 public class CHOOSECOLOR {
 	public int lStructSize; 
-	public int hwndOwner;
-	public int hInstance; 
+	public int /*long*/ hwndOwner;
+	public int /*long*/ hInstance; 
 	public int rgbResult;
-	public int lpCustColors; 
+	public int /*long*/ lpCustColors; 
 	public int Flags;
-	public int lCustData;
-	public int lpfnHook; 
-	public int lpTemplateName;
-	public static final int sizeof = 36;
+	public int /*long*/ lCustData;
+	public int /*long*/ lpfnHook; 
+	public int /*long*/ lpTemplateName;
+	public static final int sizeof = OS.CHOOSECOLOR_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
index c9a23bd43f..8c061ad509 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
@@ -11,20 +11,20 @@
 package org.eclipse.swt.internal.win32;
 
 public class CHOOSEFONT {
-	public int lStructSize;     
-	public int hwndOwner; 
-	public int hDC;     
-	public int lpLogFont;     
-	public int iPointSize; 
-	public int Flags;     
-	public int rgbColors;     
-	public int lCustData; 
-	public int lpfnHook;     
-	public int lpTemplateName; 
-	public int hInstance;     
-	public int lpszStyle; 
+	public int lStructSize;
+	public int /*long*/ hwndOwner;
+	public int /*long*/ hDC;
+	public int /*long*/ lpLogFont;
+	public int iPointSize;
+	public int Flags;
+	public int rgbColors;
+	public int /*long*/ lCustData;
+	public int /*long*/ lpfnHook;
+	public int /*long*/ lpTemplateName;
+	public int /*long*/ hInstance;
+	public int /*long*/ lpszStyle;
 	public short nFontType;
-	public int nSizeMin;     
-	public int nSizeMax; 
-	public static final int sizeof = 60;
+	public int nSizeMin;
+	public int nSizeMax;
+	public static final int sizeof = OS.CHOOSEFONT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
index 0295afde3f..95d1d2ec58 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
@@ -21,8 +21,8 @@ public class COMBOBOXINFO {
 	public int buttonRight;
 	public int buttonBottom;
 	public int stateButton;
-	public int hwndCombo;
-	public int hwndItem;
-	public int hwndList;
-	public static final int sizeof = 52;    
+	public int /*long*/ hwndCombo;
+	public int /*long*/ hwndItem;
+	public int /*long*/ hwndList;
+	public static final int sizeof = OS.COMBOBOXINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
index 5cd90c86bb..476ccb976b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
@@ -11,10 +11,10 @@
 package org.eclipse.swt.internal.win32;
 
 public class COMPOSITIONFORM {
-	public int dwStyle;       
+	public int dwStyle;
 //	POINT ptCurrentPos;
 	public int x, y;
 //	RECT rcArea;  
 	public int left, top, right, bottom;
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.COMPOSITIONFORM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
index 1a2d7ef10d..2969a5ea69 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
@@ -11,17 +11,17 @@
 package org.eclipse.swt.internal.win32;
 
 public class CREATESTRUCT {
-	public int lpCreateParams; 
-	public int hInstance; 
-	public int hMenu; 
-	public int hwndParent; 
+	public int /*long*/ lpCreateParams; 
+	public int /*long*/ hInstance; 
+	public int /*long*/ hMenu; 
+	public int /*long*/ hwndParent; 
 	public int cy; 
 	public int cx; 
 	public int y; 
 	public int x; 
 	public int style; 
-	public int lpszName; 
-	public int lpszClass; 
+	public int /*long*/ lpszName; 
+	public int /*long*/ lpszClass; 
 	public int dwExStyle;
-	public static final int sizeof = 48;
+	public static final int sizeof = OS.CREATESTRUCT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
index 1dfd2c5b34..b497e8887a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
@@ -25,7 +25,7 @@ public class DIBSECTION extends BITMAP {
 	public int dsBitfields0;
 	public int dsBitfields1;
 	public int dsBitfields2;
-	public int dshSection;
+	public int /*long*/ dshSection;
 	public int dsOffset;
-	public static final int sizeof = 84;
+	public static final int sizeof = OS.DIBSECTION_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
index 3b33d75914..7428adfa85 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
@@ -16,5 +16,5 @@ public class DLLVERSIONINFO {
 	public int dwMinorVersion;
 	public int dwBuildNumber;
 	public int dwPlatformID;
-	public static final int sizeof = 20;
+	public static final int sizeof = OS.DLLVERSIONINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
index 5615fa4a23..eb7f7202bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.win32;
 
 public class DOCINFO {
 	public int cbSize; 
-	public int lpszDocName; // LPCTSTR
-	public int lpszOutput; // LPCTSTR
-	public int lpszDatatype;// LPCTSTR
+	public int /*long*/ lpszDocName; // LPCTSTR
+	public int /*long*/ lpszOutput; // LPCTSTR
+	public int /*long*/ lpszDatatype;// LPCTSTR
 	public int fwType; // DWORD
-	public static final int sizeof = 20;
+	public static final int sizeof = OS.DOCINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
index a3b5c47c74..55b1cf28a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
@@ -16,10 +16,10 @@ public class DRAWITEMSTRUCT {
 	public int itemID;
 	public int itemAction;
 	public int itemState;
-	public int hwndItem;
-	public int hDC;
+	public int /*long*/ hwndItem;
+	public int /*long*/ hDC;
 // 	RECT rcItem;
 	public int left, top, bottom, right;
-	public int itemData;
-	public static final int sizeof = 48;
+	public int /*long*/ itemData;
+	public static final int sizeof = OS.DRAWITEMSTRUCT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java
index 1f5c1e4ffc..b67a244bd6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java
@@ -21,5 +21,5 @@ public class DROPFILES {
 	public int fWide; // Value that indicates whether the file contains ANSI or Unicode 
 					  // characters. If it is zero, it contains ANSI characters. Otherwise, it 
 				      // contains Unicode characters.
-	public static final int sizeof = 20;
+	public static final int sizeof = OS.DROPFILES_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
index 1a01a184d4..e3b8e0cc6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
@@ -15,8 +15,8 @@ public class EXTLOGPEN {
 	public int elpWidth;
 	public int elpBrushStyle;
 	public int elpColor;
-	public int elpHatch;
+	public int /*long*/ elpHatch;
 	public int elpNumEntries;
 	public int[] elpStyleEntry = new int[1];
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.EXTLOGPEN_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
index 8994f41b6e..118b748871 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
 public class FILETIME {
 	public int dwLowDateTime;
 	public int dwHighDateTime;
-	static final public int sizeof = 8;
+	static final public int sizeof = OS.FILETIME_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
index d1557a13a6..8471dd86f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
@@ -12,14 +12,14 @@ package org.eclipse.swt.internal.win32;
 
 public class GCP_RESULTS {
 	public int lStructSize;
-	public int lpOutString;
-	public int lpOrder;
-	public int lpDx;
-	public int lpCaretPos;
-	public int lpClass;
-	public int lpGlyphs;
+	public int /*long*/ lpOutString;
+	public int /*long*/ lpOrder;
+	public int /*long*/ lpDx;
+	public int /*long*/ lpCaretPos;
+	public int /*long*/ lpClass;
+	public int /*long*/ lpGlyphs;
 	public int nGlyphs;
 	public int nMaxFit;
-	public static final int sizeof = 36;
+	public static final int sizeof = OS.GCP_RESULTS_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
index 8ec1a8d97b..628d4d9faa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
 public class GRADIENT_RECT {
 	public int UpperLeft;
 	public int LowerRight;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.GRADIENT_RECT_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
index 543be4a92e..a3dbc55604 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
@@ -13,13 +13,13 @@ package org.eclipse.swt.internal.win32;
 public class GUITHREADINFO {
 	public int cbSize;
 	public int flags;
-	public int hwndActive;
-	public int hwndFocus;
-	public int hwndCapture;
-	public int hwndMenuOwner;
-	public int hwndMoveSize; 
-	public int hwndCaret;
+	public int /*long*/ hwndActive;
+	public int /*long*/ hwndFocus;
+	public int /*long*/ hwndCapture;
+	public int /*long*/ hwndMenuOwner;
+	public int /*long*/ hwndMoveSize; 
+	public int /*long*/ hwndCaret;
 //	RECT rcCaret;
 	public int left, top, right, bottom;
-	public static int sizeof = 48;
+	public static int sizeof = OS.GUITHREADINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDHITTESTINFO.java
index 359fd02a1d..2ddcc50ee0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDHITTESTINFO.java
@@ -16,5 +16,5 @@ public class HDHITTESTINFO {
 	public int y;
 	public int flags;
 	public int iItem;
-	public static int sizeof = 16;
+	public static int sizeof = OS.HDHITTESTINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
index 600b3990a1..53a16f5fcd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
@@ -13,12 +13,14 @@ package org.eclipse.swt.internal.win32;
 public class HDITEM {
 	public int mask;
 	public int cxy;
-	public int pszText;
-	public int hbm;
+	public int /*long*/ pszText;
+	public int /*long*/ hbm;
 	public int cchTextMax;
 	public int fmt;
-	public int lParam; 
+	public int /*long*/ lParam; 
 	public int iImage;
 	public int iOrder;
-	public static int sizeof = 36;
+	public int type;
+	public int /*long*/ pvFilter; 
+	public static int sizeof = OS.HDITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
index 72fd181686..5202010a88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.win32;
 
 public class HDLAYOUT {
-	public int prc;
-	public int pwpos;
-	public static final int sizeof = 8;
+	public int /*long*/ prc;
+	public int /*long*/ pwpos;
+	public static final int sizeof = OS.HDLAYOUT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
index dfe0511898..9b92464980 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
@@ -14,10 +14,10 @@ public class HELPINFO {
 	public int cbSize;
 	public int iContextType;
 	public int iCtrlId;
-	public int hItemHandle;
+	public int /*long*/ hItemHandle;
 	public int dwContextId;
 //	POINT MousePos
 	public int x;
 	public int y;
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.HELPINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
index a2210197bb..53a9889f98 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
 public class HIGHCONTRAST {
 	public int cbSize;
 	public int dwFlags;
-	public int lpszDefaultScheme;
-	public static final int sizeof = 12;
+	public int /*long*/ lpszDefaultScheme;
+	public static final int sizeof = OS.HIGHCONTRAST_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
index 80736396ab..62c55bef6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
@@ -14,7 +14,7 @@ public class ICONINFO {
 	public boolean fIcon;
 	public int xHotspot; 
 	public int yHotspot;
-	public int hbmMask;
-	public int hbmColor;
-	public static final int sizeof = 20;
+	public int /*long*/ hbmMask;
+	public int /*long*/ hbmColor;
+	public static final int sizeof = OS.ICONINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
index 05dbd1a9fc..fc5b0fc70a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class INITCOMMONCONTROLSEX {
 	public int dwSize; 
 	public int dwICC;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.INITCOMMONCONTROLSEX_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INPUT.java
index 982aaddd87..be86740d79 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INPUT.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class INPUT {
 	public int type;
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.INPUT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
index 7d2cec9d8e..fd870de79b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
@@ -15,6 +15,6 @@ public class KEYBDINPUT {
 	public short wScan;
 	public int dwFlags;
 	public int time;
-	public int dwExtraInfo;
-	public static final int sizeof = 16;
+	public int /*long*/ dwExtraInfo;
+	public static final int sizeof = OS.KEYBDINPUT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LITEM.java
index a76b6421b0..682ffa6350 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LITEM.java
@@ -17,5 +17,5 @@ public class LITEM {
 	public int stateMask;
 	public char[] szID = new char[OS.MAX_LINKID_TEXT];
 	public char[] szUrl = new char[OS.L_MAX_URL_LENGTH];
-	public static final int sizeof = 4280;
+	public static final int sizeof = OS.LITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
index ff3aa11c6c..49ca5e0dea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
 public class LOGBRUSH {
 	public int lbStyle;
 	public int lbColor;
-	public int lbHatch;
-	public static final int sizeof = 12;
+	public int /*long*/ lbHatch;
+	public static final int sizeof = OS.LOGBRUSH_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java
index 617bbebc34..0736fde841 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java
@@ -11,18 +11,18 @@
 package org.eclipse.swt.internal.win32;
 
 public abstract class LOGFONT {
-	public int lfHeight;    
-	public int lfWidth;    
+	public int lfHeight;
+	public int lfWidth;
 	public int lfEscapement; 
-	public int lfOrientation;    
-	public int lfWeight;    
-	public byte lfItalic;    
+	public int lfOrientation;
+	public int lfWeight;
+	public byte lfItalic;
 	public byte lfUnderline; 
-	public byte lfStrikeOut;    
-	public byte lfCharSet;    
+	public byte lfStrikeOut;
+	public byte lfCharSet;
 	public byte lfOutPrecision; 
-	public byte lfClipPrecision;    
-	public byte lfQuality;    
+	public byte lfClipPrecision;
+	public byte lfQuality;
 	public byte lfPitchAndFamily;
-	public static final int sizeof = OS.IsUnicode ? 92 : 60;	
+	public static final int sizeof = OS.IsUnicode ? OS.LOGFONTW_sizeof () : OS.LOGFONTA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTA.java
index abd65288c2..1531ec697e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTA.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class LOGFONTA extends LOGFONT {
 	public byte[] lfFaceName = new byte[OS.LF_FACESIZE];
-	public static final int sizeof = 60;
+	public static final int sizeof = OS.LOGFONTA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTW.java
index da2035adc8..f65452c115 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTW.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class LOGFONTW extends LOGFONT {
 	public char[] lfFaceName = new char[OS.LF_FACESIZE];
-	public static final int sizeof = 92;
+	public static final int sizeof = OS.LOGFONTW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
index 939d2ef7fb..d2e56a65bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
@@ -16,5 +16,5 @@ public class LOGPEN {
 	public int x;
 	public int y;
 	public int lopnColor;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.LOGPEN_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LONG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LONG.java
new file mode 100644
index 0000000000..3729531902
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LONG.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * The contents of this file are made available under the terms
+ * of the GNU Lesser General Public License (LGPL) Version 2.1 that
+ * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+ * available at http://www.gnu.org/licenses/lgpl.html.  If the version
+ * of the LGPL at http://www.gnu.org is different to the version of
+ * the LGPL accompanying this distribution and there is any conflict
+ * between the two license versions, the terms of the LGPL accompanying
+ * this distribution shall govern.
+ *******************************************************************************/
+package org.eclipse.swt.internal.win32;
+
+public class LONG {
+	public int /*long*/ value;
+
+	public LONG(int /*long*/ value) {
+		this.value = value;
+	}
+
+	public boolean equals (Object object) {
+		if (object == this) return true;
+		if (!(object instanceof LONG)) return false;
+		LONG obj = (LONG)object;
+		return obj.value == this.value;
+	}
+
+	public int hashCode () {
+		return (int)/*64*/value;
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
index 228f7d1173..29106215fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
@@ -11,11 +11,11 @@
 package org.eclipse.swt.internal.win32;
 
 public class LRESULT {
-	public int value;
+	public int /*long*/ value;
 	public static final LRESULT ONE = new LRESULT (1);
 	public static final LRESULT ZERO = new LRESULT (0);
 	
-public LRESULT (int value) {
+public LRESULT (int /*long*/ value) {
 	this.value = value;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
index 09f8dbce1e..81062de367 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
@@ -14,10 +14,10 @@ public class LVCOLUMN {
 	public int mask;
 	public int fmt;
 	public int cx;
-	public int pszText;
+	public int /*long*/ pszText;
 	public int cchTextMax;
 	public int iSubItem;
 	public int iImage;
 	public int iOrder;
-	public static final int sizeof = 24;
+	public static final int sizeof = OS.LVCOLUMN_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
index 9e7cf2a82d..4090f0fc39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
@@ -17,5 +17,5 @@ public class LVHITTESTINFO {
 	public int flags;
 	public int iItem;
 	public int iSubItem;
-	public static int sizeof = 20;
+	public static int sizeof = OS.LVHITTESTINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
index 19fef35bd1..90b5d1e556 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
@@ -16,10 +16,13 @@ public class LVITEM {
 	public int iSubItem;
 	public int state;
 	public int stateMask;
-	public int pszText;
+	public int /*long*/ pszText;
 	public int cchTextMax;
 	public int iImage;
-	public int lParam;
+	public int /*long*/ lParam;
 	public int iIndent;
-	public static final int sizeof = 40;
+	public int iGroupId;
+	public int cColumns;
+	public int /*long*/ puColumns;
+	public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.LVITEM_sizeof () : 40;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MARGINS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MARGINS.java
index d37bb6ec54..064d7e757f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MARGINS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MARGINS.java
@@ -15,5 +15,5 @@ public class MARGINS {
 	public int cxRightWidth;
 	public int cyTopHeight;
 	public int cyBottomHeight;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.MARGINS_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
index 2f5b7befc4..465d02c6f9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
@@ -16,6 +16,6 @@ public class MEASUREITEMSTRUCT {
   	public int itemID;
 	public int itemWidth;
 	public int itemHeight; 
-	public int itemData;
-	public static final int sizeof = 24;
+	public int /*long*/ itemData;
+	public static final int sizeof = OS.MEASUREITEMSTRUCT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
index b1189003e8..a21a166d81 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
@@ -17,9 +17,9 @@ public class MENUBARINFO {
 	public int top;
 	public int right;
 	public int bottom;
-	public int hMenu;
-	public int hwndMenu;
+	public int /*long*/ hMenu;
+	public int /*long*/ hwndMenu;
 	public boolean fBarFocused;
 	public boolean fFocused;
-	public static final int sizeof = 32;
+	public static final int sizeof = OS.MENUBARINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
index b7d754918b..d5e0eb6ecd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
@@ -15,8 +15,8 @@ public class MENUINFO {
 	public int fMask;
 	public int dwStyle;
 	public int cyMax;
-	public int hbrBack;
+	public int /*long*/ hbrBack;
 	public int dwContextHelpID;
-	public int dwMenuData;
-	public static final int sizeof = 28;
+	public int /*long*/ dwMenuData;
+	public static final int sizeof = OS.MENUINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
index 03d752bf7c..1ee05bdd09 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
@@ -16,15 +16,13 @@ public class MENUITEMINFO {
 	public int fType;
 	public int fState;
 	public int wID;
-	public int hSubMenu;
-	public int hbmpChecked;
-	public int hbmpUnchecked;
-	public int dwItemData;
-	public int dwTypeData;
+	public int /*long*/ hSubMenu;
+	public int /*long*/ hbmpChecked;
+	public int /*long*/ hbmpUnchecked;
+	public int /*long*/ dwItemData;
+	public int /*long*/ dwTypeData;
 	public int cch;
-	public int hbmpItem;
-	public static final int sizeof;
-
+	public int /*long*/ hbmpItem;
 	/*
 	* Feature in Windows.  The hbmpItem field requires Windows 4.10
 	* or greater.  On Windows NT 4.0, passing in a larger struct size
@@ -32,7 +30,5 @@ public class MENUITEMINFO {
 	* calls fail when the struct size is too large.  The fix is to ensure
 	* that the correct struct size is used for the Windows platform.
 	*/
-	static {
-		sizeof = OS.WIN32_VERSION < OS.VERSION (4, 10) ? 44 : 48;
-	}
+	public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 0) ? OS.MENUITEMINFO_sizeof () : 44;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MINMAXINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MINMAXINFO.java
index adbc231cb7..026b000d00 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MINMAXINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MINMAXINFO.java
@@ -26,5 +26,5 @@ public class MINMAXINFO {
 //	POINT ptMaxTrackSize;
 	public int ptMaxTrackSize_x;
 	public int ptMaxTrackSize_y;
-	public static final int sizeof = 40;
+	public static final int sizeof = OS.MINMAXINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MONITORINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MONITORINFO.java
index 6a4b1b77d8..3bc34ec06c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MONITORINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MONITORINFO.java
@@ -23,5 +23,5 @@ public class MONITORINFO {
 	public int rcWork_right;
 	public int rcWork_bottom;
 	public int dwFlags;
-	public static final int sizeof = 40;
+	public static final int sizeof = OS.MONITORINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
index 2faa052f3a..f8be9a979a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
@@ -16,6 +16,6 @@ public class MOUSEINPUT {
 	public int mouseData;
 	public int dwFlags;
 	public int time;
-	public int dwExtraInfo;
-	public static final int sizeof = 24;
+	public int /*long*/ dwExtraInfo;
+	public static final int sizeof = OS.MOUSEINPUT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
index ec763d6e46..300bac440c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
@@ -11,12 +11,12 @@
 package org.eclipse.swt.internal.win32;
 
 public class MSG {
-	public int hwnd;     
+	public int /*long*/ hwnd;
 	public int message; 
-	public int wParam; 
-	public int lParam; 
+	public int /*long*/ wParam; 
+	public int /*long*/ lParam; 
 	public int time; 
 //	POINT pt;
 	public int x, y;
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.MSG_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
index 51c5fe09ad..31e151335e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
@@ -11,12 +11,12 @@
 package org.eclipse.swt.internal.win32;
 
 public class NMCUSTOMDRAW extends NMHDR {
-	 public int dwDrawStage; 
-	 public int hdc;      
+	public int dwDrawStage; 
+	public int /*long*/ hdc;
 //	RECT rc;
-	 public int left, top, right, bottom;
-	 public int dwItemSpec;
-	 public int uItemState;
-	 public int lItemlParam;
-	 public static final int sizeof = 48;
+	public int left, top, right, bottom;
+	public int /*long*/ dwItemSpec;
+	public int uItemState;
+	public int /*long*/ lItemlParam;
+	public static final int sizeof = OS.NMCUSTOMDRAW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
index 9b4e53d5cd..ed6bacb29c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class NMHDR {
-	public int hwndFrom; 
-	public int idFrom; 
+	public int /*long*/ hwndFrom; 
+	public int /*long*/ idFrom; 
 	public int code;
-	public static final int sizeof = 12;
+	public static final int sizeof = OS.NMHDR_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
index 6e7897749b..6af9022e60 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
 public class NMHEADER extends NMHDR {
 	public int iItem; 
 	public int iButton; 
-	public int pitem; 
-	public static int sizeof = 24;
+	public int /*long*/ pitem; 
+	public static int sizeof = OS.NMHEADER_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLINK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLINK.java
index aadeee4033..72922e096f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLINK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLINK.java
@@ -18,5 +18,5 @@ public class NMLINK extends NMHDR {
 	public int stateMask;
 	public char[] szID = new char[OS.MAX_LINKID_TEXT];
 	public char[] szUrl = new char[OS.L_MAX_URL_LENGTH];
-	public static final int sizeof = 4292;
+	public static final int sizeof = OS.NMLINK_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
index 7d653369a2..bd5e31ac48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
@@ -18,6 +18,6 @@ public class NMLISTVIEW extends NMHDR {
 	public int uChanged;
 //	POINT ptAction;
 	public int x, y;
-	public int lParam;
-	public static int sizeof = 44;
+	public int /*long*/ lParam;
+	public static int sizeof = OS.NMLISTVIEW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCUSTOMDRAW.java
index 7f5d6f88e3..5cc6222e1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCUSTOMDRAW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVCUSTOMDRAW.java
@@ -14,5 +14,14 @@ public class NMLVCUSTOMDRAW extends NMCUSTOMDRAW {
 	public int clrText;
 	public int clrTextBk;
 	public int iSubItem;
-	public static final int sizeof = 60;
+	public int dwItemType;
+	public int clrFace;
+	public int iIconEffect;
+	public int iIconPhase;
+	public int iPartId;
+	public int iStateId;
+//	RECT rcText;
+	public int left, top, right, bottom;
+	public int uAlign; 
+	public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.NMLVCUSTOMDRAW_sizeof () : 60;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
index 330554c814..669cbeb1a9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
@@ -17,10 +17,13 @@ public class NMLVDISPINFO extends NMHDR {
 	public int iSubItem;
 	public int state;
 	public int stateMask;
-	public int pszText;
+	public int /*long*/ pszText;
 	public int cchTextMax;
 	public int iImage;
-	public int lParam;
+	public int /*long*/ lParam;
 	public int iIndent;
-	public static final int sizeof = 52;
+	public int iGroupId;
+	public int cColumns;
+	public int /*long*/ puColumns;
+	public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.NMLVDISPINFO_sizeof () : 52;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
index 08f8d1c352..245754e953 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
@@ -14,11 +14,11 @@ public class NMLVFINDITEM extends NMHDR {
 	public int iStart;
 //	LVFINDINFO lvfi;
 	public int flags;
-	public int psz;
-	public int lParam;
+	public int /*long*/ psz;
+	public int /*long*/ lParam;
 //	POINT pt;
 	public int x;
 	public int y;
 	public int vkDirection;
-	public static final int sizeof = 40;
+	public static final int sizeof = OS.NMLVFINDITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
index d3921532e5..e1e6603f8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.win32;
 public class NMREBARCHEVRON extends NMHDR {
 	public int uBand;
 	public int wID;
-	public int lParam;
+	public int /*long*/ lParam;
 //	RECT rc;
 	public int left, top, right, bottom;
-	public int lParamNM;
-	public static int sizeof = 44;
+	public int /*long*/ lParamNM;
+	public static int sizeof = OS.NMREBARCHEVRON_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHILDSIZE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHILDSIZE.java
index cb199b22a2..a2f92da605 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHILDSIZE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHILDSIZE.java
@@ -23,5 +23,5 @@ public class NMREBARCHILDSIZE extends NMHDR {
 	public int rcBand_top;
 	public int rcBand_right;
 	public int rcBand_bottom;
-	public static final int sizeof = 52;
+	public static final int sizeof = OS.NMREBARCHILDSIZE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMRGINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMRGINFO.java
index 39ceda905a..b8f44d8910 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMRGINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMRGINFO.java
@@ -15,5 +15,5 @@ public class NMRGINFO extends NMHDR {
 	public int x;
 	public int y;
 	public int dwItemSpec;
-	public static int sizeof = 24;
+	public static int sizeof = OS.NMRGINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBHOTITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBHOTITEM.java
index 32fa120898..66d53a7c3b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBHOTITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBHOTITEM.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class NMTBHOTITEM extends NMHDR {
-	 public int idOld;
-	 public int idNew;
-	 public int dwFlags;
-	 public static final int sizeof = 24;
+	public int idOld;
+	public int idNew;
+	public int dwFlags;
+	public static final int sizeof = OS.NMTBHOTITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
index 120d9ff9bb..651418649c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
@@ -17,12 +17,12 @@ public class NMTOOLBAR extends NMHDR {
 	public int idCommand;
 	public byte fsState;
 	public byte fsStyle;
-	public int dwData;
-	public int iString;
+	public int /*long*/ dwData;
+	public int /*long*/ iString;
 	public int cchText;
-	public int pszText;
+	public int /*long*/ pszText;
 //	RECT rcButton;
 	public int left, top, right, bottom;
 	/* Note in WinCE.  The field rcButton is not defined. */
-	public static final int sizeof = OS.IsWinCE ? 44 : 60;
+	public static final int sizeof = OS.NMTOOLBAR_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
index a4bc085268..618e986ccf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
@@ -11,9 +11,9 @@
 package org.eclipse.swt.internal.win32;
 
 public abstract class NMTTDISPINFO extends NMHDR {
-	public int lpszText;
-	public int hinst;   
+	public int /*long*/ lpszText;
+	public int /*long*/ hinst;   
 	public int uFlags;
-	public int lParam;
-	public static final int sizeof = OS.IsUnicode ? 188 : 108;
+	public int /*long*/ lParam;
+	public static final int sizeof = OS.IsUnicode ? OS.NMTTDISPINFOW_sizeof () : OS.NMTTDISPINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOA.java
index 59bb94b4a9..592a1fce2c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOA.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class NMTTDISPINFOA extends NMTTDISPINFO {
 	public byte[] szText = new byte[80];
-	public static final int sizeof = 108;
+	public static final int sizeof = OS.NMTTDISPINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOW.java
index 6010e3c535..6c6b26456e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOW.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class NMTTDISPINFOW extends NMTTDISPINFO {
 	public char[] szText = new char[80];
-	public static final int sizeof = 188;
+	public static final int sizeof = OS.NMTTDISPINFOW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVCUSTOMDRAW.java
index 9cc3f42c42..1a6a941c55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVCUSTOMDRAW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVCUSTOMDRAW.java
@@ -14,5 +14,5 @@ public class NMTVCUSTOMDRAW extends NMCUSTOMDRAW {
 	public int clrText;
 	public int clrTextBk;
 	public int iLevel; // the iLevel field does not appear on WinCE
-	public static final int sizeof = OS.IsWinCE ? 56 : 60;
+	public static final int sizeof = OS.NMTVCUSTOMDRAW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
index cf1efff516..a94a40cbed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
@@ -13,14 +13,14 @@ package org.eclipse.swt.internal.win32;
 public class NMTVDISPINFO extends NMHDR {
 //	TVITEM item;
 	public int mask;
-	public int hItem;
+	public int /*long*/ hItem;
 	public int state;
 	public int stateMask;
-	public int pszText;
+	public int /*long*/ pszText;
   	public int cchTextMax;
   	public int iImage;
   	public int iSelectedImage;
 	public int cChildren;
-	public int lParam;
-	public static final int sizeof = 52;
+	public int /*long*/ lParam;
+	public static final int sizeof = OS.NMTVDISPINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
index 13484f1840..8d3b6f3d3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.win32;
 
 public class NMTVITEMCHANGE extends NMHDR {
 	public int uChanged;
-	public int hItem;
+	public int /*long*/ hItem;
 	public int uStateNew;
 	public int uStateOld;
-	public int lParam;
-	public static int sizeof = 32;
+	public int /*long*/ lParam;
+	public static int sizeof = OS.NMTVITEMCHANGE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMUPDOWN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMUPDOWN.java
index 1f2bde56ed..aecc81195c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMUPDOWN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMUPDOWN.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class NMUPDOWN extends NMHDR {
 	public int iPos;
 	public int iDelta;
-	public static final int sizeof = 20;
+	public static final int sizeof = OS.NMUPDOWN_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICS.java
index efc03d570b..d08f9c6300 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICS.java
@@ -21,6 +21,6 @@ public abstract class NONCLIENTMETRICS {
 	public int iSmCaptionHeight;
 	public int iMenuWidth; 
 	public int iMenuHeight;
-	public static final int sizeof = OS.IsUnicode ? 500 : 340;
+	public static final int sizeof = OS.IsUnicode ? OS.NONCLIENTMETRICSW_sizeof () : OS.NONCLIENTMETRICSA_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSA.java
index af39a1b47c..26853d41b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSA.java
@@ -16,6 +16,6 @@ public class NONCLIENTMETRICSA extends NONCLIENTMETRICS {
 	public LOGFONTA lfMenuFont = new LOGFONTA ();
 	public LOGFONTA lfStatusFont = new LOGFONTA ();
 	public LOGFONTA lfMessageFont = new LOGFONTA ();
-	public static final int sizeof = 340;
+	public static final int sizeof = OS.NONCLIENTMETRICSA_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSW.java
index c231a9678c..59080d1026 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSW.java
@@ -16,6 +16,6 @@ public class NONCLIENTMETRICSW extends NONCLIENTMETRICS {
 	public LOGFONTW lfMenuFont = new LOGFONTW ();
 	public LOGFONTW lfStatusFont = new LOGFONTW ();
 	public LOGFONTW lfMessageFont = new LOGFONTW ();
-	public static final int sizeof = 500;
+	public static final int sizeof = OS.NONCLIENTMETRICSW_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
index 6e46807179..a6c3d00f23 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.win32;
 
 public abstract class NOTIFYICONDATA {
 	public int cbSize;
-	public int hWnd;
+	public int /*long*/ hWnd;
 	public int uID;
 	public int uFlags;
 	public int uCallbackMessage;
-	public int hIcon;
+	public int /*long*/ hIcon;
 	public int dwState;
 	public int dwStateMask;
 	public int uVersion;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
index ac210ce9b1..0ddcd77858 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.win32;
 
 public class OFNOTIFY extends NMHDR {
-	public int lpOFN;
-	public int pszFile;
-	public static int sizeof = 20;
+	public int /*long*/ lpOFN;
+	public int /*long*/ pszFile;
+	public static int sizeof = OS.OFNOTIFY_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
index 53c1150c7d..c0e2255f2b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
@@ -12,24 +12,27 @@ package org.eclipse.swt.internal.win32;
 
 public class OPENFILENAME {
 	public int lStructSize;
-	public int hwndOwner;
-	public int hInstance;
-	public int lpstrFilter;
-	public int lpstrCustomFilter;
+	public int /*long*/ hwndOwner;
+	public int /*long*/ hInstance;
+	public int /*long*/ lpstrFilter;
+	public int /*long*/ lpstrCustomFilter;
 	public int nMaxCustFilter;
 	public int nFilterIndex;
-	public int lpstrFile;
+	public int /*long*/ lpstrFile;
 	public int nMaxFile;
-	public int lpstrFileTitle;
+	public int /*long*/ lpstrFileTitle;
 	public int nMaxFileTitle;
-	public int lpstrInitialDir;
-	public int lpstrTitle;
+	public int /*long*/ lpstrInitialDir;
+	public int /*long*/ lpstrTitle;
 	public int Flags;
 	public short nFileOffset;
 	public short nFileExtension;
-	public int lpstrDefExt;
-	public int lCustData;
-	public int lpfnHook;
-	public int lpTemplateName;
-	public static final int sizeof = 76;
+	public int /*long*/ lpstrDefExt;
+	public int /*long*/ lCustData;
+	public int /*long*/ lpfnHook;
+	public int /*long*/ lpTemplateName;
+	public int /*long*/ pvReserved;
+	public int dwReserved;
+	public int FlagsEx;   
+	public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 0) ? OS.OPENFILENAME_sizeof () : 76;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index b1ad081cfb..c2307acec8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -84,22 +84,22 @@ public class OS extends Platform {
 		if (System.getProperty (NO_MANIFEST) == null) {
 			if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
 				TCHAR buffer = new TCHAR (0, OS.MAX_PATH);
-				int hModule = OS.GetLibraryHandle ();
+				int /*long*/ hModule = OS.GetLibraryHandle ();
 				while (OS.GetModuleFileName (hModule, buffer, buffer.length ()) == buffer.length ()) {
 					buffer = new TCHAR (0, buffer.length () + OS.MAX_PATH);
 				}
-				int hHeap = OS.GetProcessHeap ();
+				int /*long*/ hHeap = OS.GetProcessHeap ();
 				int byteCount = buffer.length () * TCHAR.sizeof;
-				int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+				int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
 				OS.MoveMemory (pszText, buffer, byteCount);	
 				ACTCTX pActCtx = new ACTCTX ();
 				pActCtx.cbSize = ACTCTX.sizeof;
-				pActCtx.dwFlags = OS.ACTCTX_FLAG_RESOURCE_NAME_VALID | OS.ACTCTX_FLAG_SET_PROCESS_DEFAULT;
+				pActCtx.dwFlags = OS.ACTCTX_FLAG_RESOURCE_NAME_VALID;
 				pActCtx.lpSource = pszText;
 				pActCtx.lpResourceName = OS.MANIFEST_RESOURCE_ID;
-				int hActCtx = OS.CreateActCtx (pActCtx);
+				int /*long*/ hActCtx = OS.CreateActCtx (pActCtx);
 				if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
-				int [] lpCookie = new int [1];
+				int /*long*/ [] lpCookie = new int /*long*/ [1];
 				OS.ActivateActCtx (hActCtx, lpCookie);
 				/*
 				* NOTE:  A single activation context is created and activated
@@ -144,14 +144,14 @@ public class OS extends Platform {
 		dvi.dwMajorVersion = 4;
 		dvi.dwMinorVersion = 0;
 		TCHAR lpLibFileName = new TCHAR (0, "comctl32.dll", true); //$NON-NLS-1$
-		int hModule = OS.LoadLibrary (lpLibFileName);
+		int /*long*/ hModule = OS.LoadLibrary (lpLibFileName);
 		if (hModule != 0) {
 			String name = "DllGetVersion\0"; //$NON-NLS-1$
 			byte [] lpProcName = new byte [name.length ()];
 			for (int i=0; i<lpProcName.length; i++) {
 				lpProcName [i] = (byte) name.charAt (i);
 			}
-			int DllGetVersion = OS.GetProcAddress (hModule, lpProcName);
+			int /*long*/ DllGetVersion = OS.GetProcAddress (hModule, lpProcName);
 			if (DllGetVersion != 0) OS.Call (DllGetVersion, dvi);
 			OS.FreeLibrary (hModule);
 		}
@@ -166,14 +166,14 @@ public class OS extends Platform {
 		dvi.cbSize = DLLVERSIONINFO.sizeof;
 		dvi.dwMajorVersion = 4;
 		TCHAR lpLibFileName = new TCHAR (0, "Shell32.dll", true); //$NON-NLS-1$
-		int hModule = OS.LoadLibrary (lpLibFileName);
+		int /*long*/ hModule = OS.LoadLibrary (lpLibFileName);
 		if (hModule != 0) {
 			String name = "DllGetVersion\0"; //$NON-NLS-1$
 			byte [] lpProcName = new byte [name.length ()];
 			for (int i=0; i<lpProcName.length; i++) {
 				lpProcName [i] = (byte) name.charAt (i);
 			}
-			int DllGetVersion = OS.GetProcAddress (hModule, lpProcName);
+			int /*long*/ DllGetVersion = OS.GetProcAddress (hModule, lpProcName);
 			if (DllGetVersion != 0) OS.Call (DllGetVersion, dvi);
 			OS.FreeLibrary (hModule);
 		}
@@ -619,9 +619,12 @@ public class OS extends Platform {
 	public static final int GUI_SYSTEMMENUMODE = 0x8;
 	public static final int GWL_EXSTYLE = 0xffffffec;
 	public static final int GWL_ID = -12;
+	public static final int GWLP_ID = -12;
 	public static final int GWL_STYLE = 0xfffffff0;
 	public static final int GWL_USERDATA = 0xffffffeb;
+	public static final int GWLP_USERDATA = 0xffffffeb;
 	public static final int GWL_WNDPROC = 0xfffffffc;
+	public static final int GWLP_WNDPROC = 0xfffffffc;
 	public static final int GW_CHILD = 0x5;
 	public static final int GW_HWNDFIRST = 0x0;
 	public static final int GW_HWNDLAST = 0x1;
@@ -706,7 +709,7 @@ public class OS extends Platform {
 	public static final int HTHSCROLL = 0x6;
 	public static final int HTMENU = 0x5;
 	public static final int HTNOWHERE = 0x0;
-	public static final int HTSYSMENU = 0x3;        
+	public static final int HTSYSMENU = 0x3;
 	public static final int HTTRANSPARENT = 0xffffffff;
 	public static final int HTVSCROLL = 0x7;
 	public static final int HWND_BOTTOM = 0x1;
@@ -1054,8 +1057,8 @@ public class OS extends Platform {
 	public static final int NM_RECOGNIZEGESTURE = NM_FIRST - 16;
 	public static final int NM_RELEASEDCAPTURE = NM_FIRST - 16;
 	public static final int NM_RETURN = 0xfffffffc;
-	public static final int NOTIFYICONDATAA_V2_SIZE = 488;
-	public static final int NOTIFYICONDATAW_V2_SIZE = 936;
+	public static final int NOTIFYICONDATAA_V2_SIZE = NOTIFYICONDATAA_V2_SIZE ();
+	public static final int NOTIFYICONDATAW_V2_SIZE = NOTIFYICONDATAW_V2_SIZE ();
 	public static final int NOTIFYICONDATA_V2_SIZE = IsUnicode ? NOTIFYICONDATAW_V2_SIZE : NOTIFYICONDATAA_V2_SIZE;
 	public static final int NOTSRCCOPY = 0x330008;
 	public static final int NULLREGION = 0x1;
@@ -1911,9 +1914,129 @@ public static int VERSION (int major, int minor) {
 	return major << 16 | minor;
 }
 
+/** 64 bit */
+public static final int PTR_SIZEOF = PTR_sizeof ();
+public static final native int PTR_sizeof ();
+public static final native int ACCEL_sizeof ();
+public static final native int ACTCTX_sizeof ();
+public static final native int BITMAP_sizeof ();
+public static final native int BITMAPINFOHEADER_sizeof ();
+public static final native int BLENDFUNCTION_sizeof ();
+public static final native int BROWSEINFO_sizeof ();
+public static final native int BUTTON_IMAGELIST_sizeof ();
+public static final native int CHOOSECOLOR_sizeof ();
+public static final native int CHOOSEFONT_sizeof ();
+public static final native int COMBOBOXINFO_sizeof ();
+public static final native int COMPOSITIONFORM_sizeof ();
+public static final native int CREATESTRUCT_sizeof ();
+public static final native int DIBSECTION_sizeof ();
+public static final native int DLLVERSIONINFO_sizeof ();
+public static final native int DOCINFO_sizeof ();
+public static final native int DRAWITEMSTRUCT_sizeof ();
+public static final native int DROPFILES_sizeof ();
+public static final native int EXTLOGPEN_sizeof ();
+public static final native int FILETIME_sizeof ();
+public static final native int GCP_RESULTS_sizeof ();
+public static final native int GRADIENT_RECT_sizeof ();
+public static final native int GUITHREADINFO_sizeof ();
+public static final native int HDITEM_sizeof ();
+public static final native int HDLAYOUT_sizeof ();
+public static final native int HDHITTESTINFO_sizeof ();
+public static final native int HELPINFO_sizeof ();
+public static final native int HIGHCONTRAST_sizeof ();
+public static final native int ICONINFO_sizeof ();
+public static final native int INITCOMMONCONTROLSEX_sizeof ();
+public static final native int INPUT_sizeof ();
+public static final native int KEYBDINPUT_sizeof ();
+public static final native int LITEM_sizeof ();
+public static final native int LOGBRUSH_sizeof ();
+public static final native int LOGFONTA_sizeof ();
+public static final native int LOGFONTW_sizeof ();
+public static final native int LOGPEN_sizeof ();
+public static final native int LVCOLUMN_sizeof ();
+public static final native int LVHITTESTINFO_sizeof ();
+public static final native int LVITEM_sizeof ();
+public static final native int MARGINS_sizeof ();
+public static final native int MEASUREITEMSTRUCT_sizeof ();
+public static final native int MENUBARINFO_sizeof ();
+public static final native int MENUINFO_sizeof ();
+public static final native int MENUITEMINFO_sizeof ();
+public static final native int MINMAXINFO_sizeof ();
+public static final native int MOUSEINPUT_sizeof ();
+public static final native int MONITORINFO_sizeof ();
+public static final native int MSG_sizeof ();
+public static final native int NMCUSTOMDRAW_sizeof ();
+public static final native int NMHDR_sizeof ();
+public static final native int NMHEADER_sizeof ();
+public static final native int NMLINK_sizeof ();
+public static final native int NMLISTVIEW_sizeof ();
+public static final native int NMLVCUSTOMDRAW_sizeof ();
+public static final native int NMLVDISPINFO_sizeof ();
+public static final native int NMLVFINDITEM_sizeof ();
+public static final native int NMREBARCHEVRON_sizeof ();
+public static final native int NMREBARCHILDSIZE_sizeof ();
+public static final native int NMRGINFO_sizeof ();
+public static final native int NMTBHOTITEM_sizeof ();
+public static final native int NMTOOLBAR_sizeof ();
+public static final native int NMTTDISPINFOA_sizeof ();
+public static final native int NMTTDISPINFOW_sizeof ();
+public static final native int NMTVCUSTOMDRAW_sizeof ();
+public static final native int NMTVDISPINFO_sizeof ();
+public static final native int NMTVITEMCHANGE_sizeof ();
+public static final native int NMUPDOWN_sizeof ();
+public static final native int NONCLIENTMETRICSA_sizeof ();
+public static final native int NONCLIENTMETRICSW_sizeof ();
+public static final native int NOTIFYICONDATAA_V2_SIZE ();
+public static final native int NOTIFYICONDATAW_V2_SIZE ();
+public static final native int OFNOTIFY_sizeof ();
+public static final native int OPENFILENAME_sizeof ();
+public static final native int OSVERSIONINFOA_sizeof ();
+public static final native int OSVERSIONINFOW_sizeof ();
+public static final native int PAINTSTRUCT_sizeof ();
+public static final native int POINT_sizeof ();
+public static final native int PRINTDLG_sizeof ();
+public static final native int PROCESS_INFORMATION_sizeof ();
+public static final native int REBARBANDINFO_sizeof ();
+public static final native int RECT_sizeof ();
+public static final native int SCRIPT_ANALYSIS_sizeof ();
+public static final native int SCRIPT_CONTROL_sizeof ();
+public static final native int SCRIPT_DIGITSUBSTITUTE_sizeof ();
+public static final native int SCRIPT_FONTPROPERTIES_sizeof ();
+public static final native int SCRIPT_ITEM_sizeof ();
+public static final native int SCRIPT_LOGATTR_sizeof ();
+public static final native int SCRIPT_PROPERTIES_sizeof ();
+public static final native int SCRIPT_STATE_sizeof ();
+public static final native int SCROLLINFO_sizeof ();
+public static final native int SHACTIVATEINFO_sizeof ();
+public static final native int SHELLEXECUTEINFO_sizeof ();
+public static final native int SHFILEINFOA_sizeof ();
+public static final native int SHFILEINFOW_sizeof ();
+public static final native int SHMENUBARINFO_sizeof ();
+public static final native int SHRGINFO_sizeof ();
+public static final native int SIPINFO_sizeof ();
+public static final native int SIZE_sizeof ();
+public static final native int STARTUPINFO_sizeof ();
+public static final native int SYSTEMTIME_sizeof ();
+public static final native int TBBUTTON_sizeof ();
+public static final native int TBBUTTONINFO_sizeof ();
+public static final native int TCITEM_sizeof ();
+public static final native int TEXTMETRICA_sizeof ();
+public static final native int TEXTMETRICW_sizeof ();
+public static final native int TOOLINFO_sizeof ();
+public static final native int TRACKMOUSEEVENT_sizeof ();
+public static final native int TRIVERTEX_sizeof ();
+public static final native int TVHITTESTINFO_sizeof ();
+public static final native int TVINSERTSTRUCT_sizeof ();
+public static final native int TVITEM_sizeof ();
+public static final native int TVITEMEX_sizeof ();
+public static final native int UDACCEL_sizeof ();
+public static final native int WINDOWPLACEMENT_sizeof ();
+public static final native int WINDOWPOS_sizeof ();
+public static final native int WNDCLASS_sizeof ();
+
 /** Ansi/Unicode wrappers */
 
-public static final int CallWindowProc (int lpPrevWndFunc, int hWnd, int Msg, int wParam, int lParam) {
+public static final int /*long*/ CallWindowProc (int /*long*/ lpPrevWndFunc, int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return CallWindowProcW (lpPrevWndFunc, hWnd, Msg, wParam, lParam);
 	return CallWindowProcA (lpPrevWndFunc, hWnd, Msg, wParam, lParam);
 }
@@ -1938,17 +2061,17 @@ public static final boolean ChooseFont (CHOOSEFONT chooseFont) {
 	return ChooseFontA (chooseFont);
 }
 
-public static final int CreateActCtx (ACTCTX pActCtx) {
+public static final int /*long*/ CreateActCtx (ACTCTX pActCtx) {
 	if (IsUnicode) return CreateActCtxW (pActCtx);
 	return CreateActCtxA (pActCtx);
 }
 
-public static final int CreateAcceleratorTable (byte [] lpaccl, int cEntries) {
+public static final int /*long*/ CreateAcceleratorTable (byte [] lpaccl, int cEntries) {
 	if (IsUnicode) return CreateAcceleratorTableW (lpaccl, cEntries);
 	return CreateAcceleratorTableA (lpaccl, cEntries);
 }
 
-public static final int CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, int lpszOutput, int lpInitData) {
+public static final int /*long*/ CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, int /*long*/ lpszOutput, int /*long*/ lpInitData) {
 	if (IsUnicode) {
 		char [] lpszDriver1 = lpszDriver == null ? null : lpszDriver.chars;
 		char [] lpszDevice1 = lpszDevice == null ? null : lpszDevice.chars;
@@ -1959,22 +2082,22 @@ public static final int CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, int lpszOu
 	return CreateDCA (lpszDriver1, lpszDevice1, lpszOutput, lpInitData);
 }
 
-public static final int CreateFontIndirect (int lplf) {
+public static final int /*long*/ CreateFontIndirect (int /*long*/ lplf) {
 	if (IsUnicode) return CreateFontIndirectW (lplf);
 	return CreateFontIndirectA (lplf);
 }
 
-public static final int CreateFontIndirect (LOGFONT lplf) {
+public static final int /*long*/ CreateFontIndirect (LOGFONT lplf) {
 	if (IsUnicode) return CreateFontIndirectW ((LOGFONTW)lplf);
 	return CreateFontIndirectA ((LOGFONTA)lplf);
 }
 
-public static final boolean CreateProcess (int lpApplicationName, int lpCommandLine, int lpProcessAttributes, int lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int lpEnvironment, int lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation) {
+public static final boolean CreateProcess (int /*long*/ lpApplicationName, int /*long*/ lpCommandLine, int /*long*/ lpProcessAttributes, int /*long*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int /*long*/ lpEnvironment, int /*long*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation) {
 	if (IsUnicode) return CreateProcessW (lpApplicationName, lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation);
 	return CreateProcessA (lpApplicationName, lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation);
 }
 
-public static final int CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int hWndParent, int hMenu, int hInstance, CREATESTRUCT lpParam) {
+public static final int /*long*/ CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int /*long*/ hWndParent, int /*long*/ hMenu, int /*long*/ hInstance, CREATESTRUCT lpParam) {
 	if (IsUnicode) {
 		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 		char [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.chars;
@@ -1985,26 +2108,26 @@ public static final int CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR
 	return CreateWindowExA (dwExStyle, lpClassName1, lpWindowName1, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
 }
 
-public static final int DefMDIChildProc (int hWnd, int Msg, int wParam, int lParam) {
+public static final int /*long*/ DefMDIChildProc (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return DefMDIChildProcW (hWnd, Msg, wParam, lParam);
 	return DefMDIChildProcA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int DefFrameProc (int hWnd, int hWndMDIClient, int Msg, int wParam, int lParam) {
+public static final int /*long*/ DefFrameProc (int /*long*/ hWnd, int /*long*/ hWndMDIClient, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return DefFrameProcW (hWnd, hWndMDIClient, Msg, wParam, lParam);
 	return DefFrameProcA (hWnd, hWndMDIClient, Msg, wParam, lParam);
 }
-public static final int DefWindowProc (int hWnd, int Msg, int wParam, int lParam) {
+public static final int /*long*/ DefWindowProc (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return DefWindowProcW (hWnd, Msg, wParam, lParam);
 	return DefWindowProcA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int DispatchMessage (MSG lpmsg) {
+public static final int /*long*/ DispatchMessage (MSG lpmsg) {
 	if (IsUnicode) return DispatchMessageW (lpmsg);
 	return DispatchMessageA (lpmsg);
 }
 
-public static final int DragQueryFile (int hDrop, int iFile, TCHAR lpszFile, int cch) {
+public static final int DragQueryFile (int /*long*/ hDrop, int iFile, TCHAR lpszFile, int cch) {
 	if (IsUnicode) {
 		char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;
 		return DragQueryFileW (hDrop, iFile, lpszFile1, cch);
@@ -2013,12 +2136,12 @@ public static final int DragQueryFile (int hDrop, int iFile, TCHAR lpszFile, int
 	return DragQueryFileA (hDrop, iFile, lpszFile1, cch);
 }
 
-public static final boolean DrawState (int hdc, int hbr, int lpOutputFunc, int lData, int wData, int x, int y, int cx, int cy, int fuFlags) {
+public static final boolean DrawState (int /*long*/ hdc, int /*long*/ hbr, int /*long*/ lpOutputFunc, int /*long*/ lData, int /*long*/ wData, int x, int y, int cx, int cy, int fuFlags) {
 	if (IsUnicode) return DrawStateW (hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags);
 	return DrawStateA (hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags);
 }
 
-public static final int DrawText (int hDC, TCHAR lpString, int nCount, RECT lpRect, int uFormat) {
+public static final int DrawText (int /*long*/ hDC, TCHAR lpString, int nCount, RECT lpRect, int uFormat) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return DrawTextW (hDC, lpString1, nCount, lpRect, uFormat);
@@ -2027,7 +2150,7 @@ public static final int DrawText (int hDC, TCHAR lpString, int nCount, RECT lpRe
 	return DrawTextA (hDC, lpString1, nCount, lpRect, uFormat);
 }
 
-public static final int EnumFontFamilies (int hdc, TCHAR lpszFamily, int lpEnumFontFamProc, int lParam) {
+public static final int EnumFontFamilies (int /*long*/ hdc, TCHAR lpszFamily, int /*long*/ lpEnumFontFamProc, int /*long*/ lParam) {
 	if (IsUnicode) {
 		char [] lpszFamily1 = lpszFamily == null ? null : lpszFamily.chars;
 		return EnumFontFamiliesW (hdc, lpszFamily1, lpEnumFontFamProc, lParam);
@@ -2036,17 +2159,17 @@ public static final int EnumFontFamilies (int hdc, TCHAR lpszFamily, int lpEnumF
 	return EnumFontFamiliesA (hdc, lpszFamily1, lpEnumFontFamProc, lParam);
 }
 
-public static final int EnumFontFamiliesEx (int hdc, LOGFONT lpLogfont, int lpEnumFontFamExProc, int lParam, int dwFlags) {
+public static final int EnumFontFamiliesEx (int /*long*/ hdc, LOGFONT lpLogfont, int /*long*/ lpEnumFontFamExProc, int /*long*/ lParam, int dwFlags) {
 	if (IsUnicode) return EnumFontFamiliesExW (hdc, (LOGFONTW)lpLogfont, lpEnumFontFamExProc, lParam, dwFlags);
 	return EnumFontFamiliesExA (hdc, (LOGFONTA)lpLogfont, lpEnumFontFamExProc, lParam, dwFlags);
 }
 
-public static final boolean EnumSystemLocales (int lpLocaleEnumProc, int dwFlags) {
+public static final boolean EnumSystemLocales (int /*long*/ lpLocaleEnumProc, int dwFlags) {
 	if (IsUnicode) return EnumSystemLocalesW (lpLocaleEnumProc, dwFlags);
 	return EnumSystemLocalesA (lpLocaleEnumProc, dwFlags);
 }
 
-public static final boolean EnumSystemLanguageGroups (int pLangGroupEnumProc, int dwFlags, int lParam) {
+public static final boolean EnumSystemLanguageGroups (int /*long*/ pLangGroupEnumProc, int dwFlags, int /*long*/ lParam) {
 	if (IsUnicode) return EnumSystemLanguageGroupsW (pLangGroupEnumProc, dwFlags, lParam);
 	return EnumSystemLanguageGroupsA (pLangGroupEnumProc, dwFlags, lParam);
 }
@@ -2062,7 +2185,7 @@ public static final int ExpandEnvironmentStrings (TCHAR lpSrc, TCHAR lpDst, int
 	return ExpandEnvironmentStringsA (lpSrc1, lpDst1, nSize);
 }
 
-public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, int [] phiconLarge, int [] phiconSmall, int nIcons) {
+public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, int /*long*/ [] phiconLarge, int /*long*/ [] phiconSmall, int nIcons) {
 	if (IsUnicode) {
 		char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;
 		return ExtractIconExW (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
@@ -2071,7 +2194,7 @@ public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, int [] ph
 	return ExtractIconExA (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 
-public static final boolean ExtTextOut(int hdc, int X, int Y, int fuOptions, RECT lprc, TCHAR lpString, int cbCount, int[] lpDx) {
+public static final boolean ExtTextOut(int /*long*/ hdc, int X, int Y, int fuOptions, RECT lprc, TCHAR lpString, int cbCount, int[] lpDx) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return ExtTextOutW (hdc, X, Y, fuOptions, lprc, lpString1, cbCount, lpDx);
@@ -2080,7 +2203,7 @@ public static final boolean ExtTextOut(int hdc, int X, int Y, int fuOptions, REC
 	return ExtTextOutA (hdc, X, Y, fuOptions, lprc, lpString1, cbCount, lpDx);
 }
 
-public static final int FindWindow (TCHAR lpClassName, TCHAR lpWindowName) {
+public static final int /*long*/ FindWindow (TCHAR lpClassName, TCHAR lpWindowName) {
 	if (IsUnicode) {
 		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 		char [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.chars;
@@ -2091,19 +2214,19 @@ public static final int FindWindow (TCHAR lpClassName, TCHAR lpWindowName) {
 	return FindWindowA (lpClassName1, lpWindowName1);
 }
 
-public static final int FormatMessage (int dwFlags, int lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int Arguments) {
+public static final int FormatMessage (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments) {
 	if (IsUnicode) {
 		return FormatMessageW (dwFlags, lpSource, dwMessageId, dwLanguageId, lpBuffer, nSize, Arguments); 
 	}
 	return FormatMessageA (dwFlags, lpSource, dwMessageId, dwLanguageId, lpBuffer, nSize, Arguments);
 }
 
-public static final boolean GetCharABCWidths (int hdc, int iFirstChar, int iLastChar, int [] lpabc) {
+public static final boolean GetCharABCWidths (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpabc) {
 	if (IsUnicode) return GetCharABCWidthsW (hdc,iFirstChar, iLastChar, lpabc);
 	return GetCharABCWidthsA (hdc,iFirstChar, iLastChar, lpabc);
 }
 
-public static final int GetCharacterPlacement (int hdc, TCHAR lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags) {
+public static final int GetCharacterPlacement (int /*long*/ hdc, TCHAR lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return GetCharacterPlacementW (hdc, lpString1, nCount, nMaxExtent, lpResults, dwFlags);
@@ -2112,12 +2235,12 @@ public static final int GetCharacterPlacement (int hdc, TCHAR lpString, int nCou
 	return GetCharacterPlacementA (hdc, lpString1, nCount, nMaxExtent, lpResults, dwFlags);	
 }
 
-public static final boolean GetCharWidth (int hdc, int iFirstChar, int iLastChar, int [] lpabc) {
+public static final boolean GetCharWidth (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpabc) {
 	if (IsUnicode) return GetCharWidthW (hdc,iFirstChar, iLastChar, lpabc);
 	return GetCharWidthA (hdc,iFirstChar, iLastChar, lpabc);
 }
 
-public static final boolean GetClassInfo (int hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) {
+public static final boolean GetClassInfo (int /*long*/ hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) {
 	if (IsUnicode) {
 		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 		return GetClassInfoW (hInstance, lpClassName1, lpWndClass);
@@ -2126,7 +2249,7 @@ public static final boolean GetClassInfo (int hInstance, TCHAR lpClassName, WNDC
 	return GetClassInfoA (hInstance, lpClassName1, lpWndClass);
 }
 
-public static final int GetClassName (int hWnd, TCHAR lpClassName, int nMaxCount) {
+public static final int GetClassName (int /*long*/ hWnd, TCHAR lpClassName, int nMaxCount) {
 	if (IsUnicode) {
 		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 		return GetClassNameW (hWnd, lpClassName1, nMaxCount);
@@ -2162,17 +2285,17 @@ public static final int GetLocaleInfo (int Locale, int LCType, TCHAR lpLCData, i
 	return GetLocaleInfoA (Locale, LCType, lpLCData1, cchData);
 }
 
-public static final boolean GetMenuItemInfo (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
+public static final boolean GetMenuItemInfo (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
 	if (IsUnicode) return GetMenuItemInfoW (hMenu, uItem, fByPosition, lpmii);
 	return GetMenuItemInfoA (hMenu, uItem, fByPosition, lpmii);
 }
 
-public static final boolean GetMessage (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax) {	
+public static final boolean GetMessage (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax) {
 	if (IsUnicode) return GetMessageW (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
 	return GetMessageA (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
 }
 
-public static final int GetModuleFileName (int hModule, TCHAR lpFilename, int inSize) {
+public static final int GetModuleFileName (int /*long*/ hModule, TCHAR lpFilename, int inSize) {
 	if (IsUnicode) {
 		char [] lpFilename1 = lpFilename == null ? null : lpFilename.chars;
 		return GetModuleFileNameW (hModule, lpFilename1, inSize);
@@ -2181,7 +2304,7 @@ public static final int GetModuleFileName (int hModule, TCHAR lpFilename, int in
 	return GetModuleFileNameA (hModule, lpFilename1, inSize);
 }
 
-public static final int GetModuleHandle (TCHAR lpModuleName) {
+public static final int /*long*/ GetModuleHandle (TCHAR lpModuleName) {
 	if (IsUnicode) {
 		char [] lpModuleName1 = lpModuleName == null ? null : lpModuleName.chars;
 		return GetModuleHandleW (lpModuleName1);
@@ -2190,42 +2313,42 @@ public static final int GetModuleHandle (TCHAR lpModuleName) {
 	return GetModuleHandleA (lpModuleName1);
 }
 
-public static final boolean GetMonitorInfo (int hmonitor, MONITORINFO lpmi) {
+public static final boolean GetMonitorInfo (int /*long*/ hmonitor, MONITORINFO lpmi) {
 	if (IsUnicode) return GetMonitorInfoW (hmonitor, lpmi);
 	return GetMonitorInfoA (hmonitor, lpmi);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, BITMAP lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, BITMAP lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, DIBSECTION lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, EXTLOGPEN lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, EXTLOGPEN lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, LOGBRUSH lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, LOGFONT lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, LOGFONT lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, (LOGFONTW)lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, (LOGFONTA)lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, LOGPEN lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, LOGPEN lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
-public static final int GetObject (int hgdiobj, int cbBuffer, int lpvObject) {
+public static final int GetObject (int /*long*/ hgdiobj, int cbBuffer, int /*long*/ lpvObject) {
 	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
@@ -2250,7 +2373,7 @@ public static final int GetProfileString (TCHAR lpAppName, TCHAR lpKeyName, TCHA
 	return GetProfileStringA (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize);
 }
 
-public static int GetProp (int hWnd, int lpString) {
+public static int /*long*/ GetProp (int /*long*/ hWnd, int /*long*/ lpString) {
 	if (IsUnicode) return GetPropW (hWnd, lpString);
 	return GetPropA (hWnd, lpString);
 }
@@ -2268,7 +2391,7 @@ public static final void GetStartupInfo (STARTUPINFO lpStartupInfo) {
 	}
 }
 
-public static final boolean GetTextExtentPoint32 (int hdc, TCHAR lpString, int cbString, SIZE lpSize) {
+public static final boolean GetTextExtentPoint32 (int /*long*/ hdc, TCHAR lpString, int cbString, SIZE lpSize) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return GetTextExtentPoint32W (hdc, lpString1, cbString, lpSize);
@@ -2277,7 +2400,7 @@ public static final boolean GetTextExtentPoint32 (int hdc, TCHAR lpString, int c
 	return GetTextExtentPoint32A (hdc, lpString1, cbString, lpSize);	
 }
 
-public static final boolean GetTextMetrics (int hdc, TEXTMETRIC lptm) {
+public static final boolean GetTextMetrics (int /*long*/ hdc, TEXTMETRIC lptm) {
 	if (IsUnicode) return GetTextMetricsW (hdc, (TEXTMETRICW)lptm);
 	return GetTextMetricsA (hdc, (TEXTMETRICA)lptm);
 }
@@ -2287,12 +2410,17 @@ public static final boolean GetVersionEx (OSVERSIONINFO lpVersionInfo) {
 	return GetVersionExA ((OSVERSIONINFOA)lpVersionInfo);
 }
 
-public static final int GetWindowLong (int hWnd, int nIndex) {
+public static final int GetWindowLong (int /*long*/ hWnd, int nIndex) {
 	if (IsUnicode) return GetWindowLongW (hWnd, nIndex);
 	return GetWindowLongA (hWnd, nIndex);
 }
 
-public static final int GetWindowText (int hWnd, TCHAR lpString, int nMaxCount) {
+public static final int /*long*/ GetWindowLongPtr (int /*long*/ hWnd, int nIndex) {
+	if (IsUnicode) return GetWindowLongPtrW (hWnd, nIndex);
+	return GetWindowLongPtrA (hWnd, nIndex);
+}
+
+public static final int GetWindowText (int /*long*/ hWnd, TCHAR lpString, int nMaxCount) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return GetWindowTextW (hWnd, lpString1, nMaxCount);
@@ -2301,7 +2429,7 @@ public static final int GetWindowText (int hWnd, TCHAR lpString, int nMaxCount)
 	return GetWindowTextA (hWnd, lpString1, nMaxCount);
 }
 
-public static final int GetWindowTextLength (int hWnd) {
+public static final int GetWindowTextLength (int /*long*/ hWnd) {
 	if (IsUnicode) return GetWindowTextLengthW (hWnd);
 	return GetWindowTextLengthA (hWnd);
 }
@@ -2315,17 +2443,17 @@ public static final int GlobalAddAtom (TCHAR lpString) {
 	return GlobalAddAtomA (lpString1);
 }
 
-public static final boolean ImmGetCompositionFont (int hIMC, LOGFONT lplf) {
+public static final boolean ImmGetCompositionFont (int /*long*/ hIMC, LOGFONT lplf) {
 	if (IsUnicode) return ImmGetCompositionFontW (hIMC, (LOGFONTW)lplf);
 	return ImmGetCompositionFontA (hIMC, (LOGFONTA)lplf);
 }
 
-public static final boolean ImmSetCompositionFont (int hIMC, LOGFONT lplf) {
+public static final boolean ImmSetCompositionFont (int /*long*/ hIMC, LOGFONT lplf) {
 	if (IsUnicode) return ImmSetCompositionFontW (hIMC, (LOGFONTW)lplf);
 	return ImmSetCompositionFontA (hIMC, (LOGFONTA)lplf);
 }
 
-public static final int ImmGetCompositionString (int hIMC, int dwIndex, TCHAR lpBuf, int dwBufLen) {
+public static final int ImmGetCompositionString (int /*long*/ hIMC, int dwIndex, TCHAR lpBuf, int dwBufLen) {
 	if (IsUnicode) {
 		char [] lpBuf1 = lpBuf == null ? null : lpBuf.chars;
 		return ImmGetCompositionStringW (hIMC, dwIndex, lpBuf1, dwBufLen);
@@ -2334,7 +2462,7 @@ public static final int ImmGetCompositionString (int hIMC, int dwIndex, TCHAR lp
 	return ImmGetCompositionStringA (hIMC, dwIndex, lpBuf1, dwBufLen);
 }
 
-public static final boolean InsertMenu (int hMenu, int uPosition, int uFlags, int uIDNewItem, TCHAR lpNewItem) {
+public static final boolean InsertMenu (int /*long*/ hMenu, int uPosition, int uFlags, int /*long*/ uIDNewItem, TCHAR lpNewItem) {
 	if (IsUnicode) {
 		char [] lpNewItem1 = lpNewItem == null ? null : lpNewItem.chars;
 		return InsertMenuW (hMenu, uPosition, uFlags, uIDNewItem, lpNewItem1);
@@ -2343,27 +2471,27 @@ public static final boolean InsertMenu (int hMenu, int uPosition, int uFlags, in
 	return InsertMenuA (hMenu, uPosition, uFlags, uIDNewItem, lpNewItem1);	
 }
 
-public static final boolean InsertMenuItem (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
+public static final boolean InsertMenuItem (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
 	if (IsUnicode) return InsertMenuItemW (hMenu, uItem, fByPosition, lpmii);
 	return InsertMenuItemA (hMenu, uItem, fByPosition, lpmii);
 }
 
-public static final int LoadBitmap (int hInstance, int lpBitmapName) {
+public static final int /*long*/ LoadBitmap (int /*long*/ hInstance, int /*long*/ lpBitmapName) {
 	if (IsUnicode) return LoadBitmapW (hInstance, lpBitmapName);
 	return LoadBitmapA (hInstance, lpBitmapName);
 }
 
-public static final int LoadCursor (int hInstance, int lpCursorName) {
+public static final int /*long*/ LoadCursor (int /*long*/ hInstance, int /*long*/ lpCursorName) {
 	if (IsUnicode) return LoadCursorW (hInstance, lpCursorName);
 	return LoadCursorA (hInstance, lpCursorName);
 }
 
-public static final int LoadIcon (int hInstance, int lpIconName) {
+public static final int /*long*/ LoadIcon (int /*long*/ hInstance, int /*long*/ lpIconName) {
 	if (IsUnicode) return LoadIconW (hInstance, lpIconName);
 	return LoadIconA (hInstance, lpIconName);
 }
 
-public static final int LoadImage (int hinst, TCHAR lpszName, int uType, int cxDesired, int cyDesired, int fuLoad) {
+public static final int /*long*/ LoadImage (int /*long*/ hinst, TCHAR lpszName, int uType, int cxDesired, int cyDesired, int fuLoad) {
 	if (IsUnicode) {
 		char [] lpszName1 = lpszName == null ? null : lpszName.chars;
 		return LoadImageW (hinst, lpszName1, uType, cxDesired, cyDesired, fuLoad);
@@ -2372,12 +2500,12 @@ public static final int LoadImage (int hinst, TCHAR lpszName, int uType, int cxD
 	return LoadImageA (hinst, lpszName1, uType, cxDesired, cyDesired, fuLoad);
 }
 
-public static final int LoadImage (int hinst, int lpszName, int uType, int cxDesired, int cyDesired, int fuLoad) {
+public static final int /*long*/ LoadImage (int /*long*/ hinst, int /*long*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad) {
 	if (IsUnicode) return LoadImageW (hinst, lpszName, uType, cxDesired, cyDesired, fuLoad);
 	return LoadImageA (hinst, lpszName, uType, cxDesired, cyDesired, fuLoad);
 }
 
-public static final int LoadLibrary (TCHAR lpLibFileName) {
+public static final int /*long*/ LoadLibrary (TCHAR lpLibFileName) {
 	if (IsUnicode) {
 		char [] lpLibFileName1 = lpLibFileName == null ? null : lpLibFileName.chars;
 		return LoadLibraryW (lpLibFileName1);
@@ -2386,7 +2514,7 @@ public static final int LoadLibrary (TCHAR lpLibFileName) {
 	return LoadLibraryA (lpLibFileName1);
 }
 
-public static final int LoadString (int hinst, int uID, TCHAR lpBuffer, int nBufferMax) {
+public static final int LoadString (int /*long*/ hinst, int uID, TCHAR lpBuffer, int nBufferMax) {
 	if (IsUnicode) {
 		char [] lpBuffer1 = lpBuffer == null ? null : lpBuffer.chars;
 		return LoadStringW (hinst, uID, lpBuffer1, nBufferMax);
@@ -2400,7 +2528,7 @@ public static final int MapVirtualKey (int uCode, int uMapType) {
 	return MapVirtualKeyA (uCode, uMapType);
 }
 
-public static final int MessageBox (int hWnd, TCHAR lpText, TCHAR lpCaption, int uType) {
+public static final int MessageBox (int /*long*/ hWnd, TCHAR lpText, TCHAR lpCaption, int uType) {
 	if (IsUnicode) {
 		char [] lpText1 = lpText == null ? null : lpText.chars;
 		char [] lpCaption1 = lpCaption == null ? null : lpCaption.chars;
@@ -2411,7 +2539,7 @@ public static final int MessageBox (int hWnd, TCHAR lpText, TCHAR lpCaption, int
 	return MessageBoxA (hWnd, lpText1, lpCaption1, uType);
 }
 
-public static final void MoveMemory (int Destination, TCHAR Source, int Length) {
+public static final void MoveMemory (int /*long*/ Destination, TCHAR Source, int Length) {
 	if (IsUnicode) {
 		char [] Source1 = Source == null ? null : Source.chars;
 		MoveMemory (Destination, Source1, Length);
@@ -2421,7 +2549,7 @@ public static final void MoveMemory (int Destination, TCHAR Source, int Length)
 	}
 }
 
-public static final void MoveMemory (TCHAR Destination, int Source, int Length) {
+public static final void MoveMemory (TCHAR Destination, int /*long*/ Source, int Length) {
 	if (IsUnicode) {
 		char [] Destination1 = Destination == null ? null : Destination.chars;
 		MoveMemory (Destination1, Source, Length);
@@ -2431,7 +2559,7 @@ public static final void MoveMemory (TCHAR Destination, int Source, int Length)
 	}
 }
 
-public static final void MoveMemory (int Destination, LOGFONT Source, int Length) {
+public static final void MoveMemory (int /*long*/ Destination, LOGFONT Source, int Length) {
 	if (IsUnicode) {
 		MoveMemory (Destination, (LOGFONTW)Source, Length);
 	} else {
@@ -2439,7 +2567,7 @@ public static final void MoveMemory (int Destination, LOGFONT Source, int Length
 	}
 }
 
-public static final void MoveMemory (LOGFONT Destination, int Source, int Length) {
+public static final void MoveMemory (LOGFONT Destination, int /*long*/ Source, int Length) {
 	if (IsUnicode) {
 		MoveMemory ((LOGFONTW)Destination, Source, Length);
 	} else {
@@ -2447,7 +2575,7 @@ public static final void MoveMemory (LOGFONT Destination, int Source, int Length
 	}
 }
 
-public static final void MoveMemory (int Destination, NMTTDISPINFO Source, int Length) {
+public static final void MoveMemory (int /*long*/ Destination, NMTTDISPINFO Source, int Length) {
 	if (IsUnicode) {
 		MoveMemory (Destination, (NMTTDISPINFOW)Source, Length);
 	} else {
@@ -2455,7 +2583,7 @@ public static final void MoveMemory (int Destination, NMTTDISPINFO Source, int L
 	}
 }
 
-public static final void MoveMemory (NMTTDISPINFO Destination, int Source, int Length) {
+public static final void MoveMemory (NMTTDISPINFO Destination, int /*long*/ Source, int Length) {
 	if (IsUnicode) {
 		MoveMemory ((NMTTDISPINFOW)Destination, Source, Length);
 	} else {
@@ -2463,7 +2591,7 @@ public static final void MoveMemory (NMTTDISPINFO Destination, int Source, int L
 	}
 }
 
-public static final void MoveMemory (TEXTMETRIC Destination, int Source, int Length) {
+public static final void MoveMemory (TEXTMETRIC Destination, int /*long*/ Source, int Length) {
 	if (IsUnicode) {
 		MoveMemory ((TEXTMETRICW)Destination, Source, Length);
 	} else {
@@ -2471,17 +2599,17 @@ public static final void MoveMemory (TEXTMETRIC Destination, int Source, int Len
 	}
 }
 
-public static final boolean PeekMessage (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg) {
+public static final boolean PeekMessage (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg) {
 	if (IsUnicode) return PeekMessageW (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
 	return PeekMessageA (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
 }
 
-public static final boolean PostMessage (int hWnd, int Msg, int wParam, int lParam) {
+public static final boolean PostMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return PostMessageW (hWnd, Msg, wParam, lParam);
 	return PostMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final boolean PostThreadMessage (int idThread, int Msg, int wParam, int lParam) {
+public static final boolean PostThreadMessage (int idThread, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return PostThreadMessageW (idThread, Msg, wParam, lParam);
 	return PostThreadMessageA (idThread, Msg, wParam, lParam);
 }
@@ -2491,7 +2619,7 @@ public static final boolean PrintDlg (PRINTDLG lppd) {
 	return PrintDlgA (lppd);
 }
 
-public static final int RegEnumKeyEx (int hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, FILETIME lpftLastWriteTime) {
+public static final int RegEnumKeyEx (int /*long*/ hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, FILETIME lpftLastWriteTime) {
 	if (IsUnicode) {
 		char [] lpName1 = lpName == null ? null : lpName.chars;
 		char [] lpClass1 = lpClass == null ? null : lpClass.chars;
@@ -2525,7 +2653,7 @@ public static final int RegisterWindowMessage (TCHAR lpString) {
 	return RegisterWindowMessageA (lpString1);
 }
 
-public static final int RegOpenKeyEx (int hKey, TCHAR lpSubKey, int ulOptions, int samDesired, int[] phkResult) {
+public static final int RegOpenKeyEx (int /*long*/ hKey, TCHAR lpSubKey, int ulOptions, int samDesired, int /*long*/[] phkResult) {
 	if (IsUnicode) {
 		char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars;
 		return RegOpenKeyExW (hKey, lpSubKey1, ulOptions, samDesired, phkResult);
@@ -2534,12 +2662,12 @@ public static final int RegOpenKeyEx (int hKey, TCHAR lpSubKey, int ulOptions, i
 	return RegOpenKeyExA (hKey, lpSubKey1, ulOptions, samDesired, phkResult);
 }
 
-public static final int RegQueryInfoKey (int hKey, int lpClass, int[] lpcbClass, int lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int lpftLastWriteTime){
+public static final int RegQueryInfoKey (int /*long*/ hKey, int /*long*/ lpClass, int[] lpcbClass, int /*long*/ lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int /*long*/ lpftLastWriteTime){
 	if (IsUnicode) return RegQueryInfoKeyW (hKey, lpClass, lpcbClass, lpReserved, lpSubKeys, lpcbMaxSubKeyLen, lpcbMaxClassLen, lpcValues, lpcbMaxValueNameLen, lpcbMaxValueLen, lpcbSecurityDescriptor, lpftLastWriteTime);
 	return RegQueryInfoKeyA (hKey, lpClass, lpcbClass, lpReserved, lpSubKeys, lpcbMaxSubKeyLen, lpcbMaxClassLen, lpcValues, lpcbMaxValueNameLen, lpcbMaxValueLen, lpcbSecurityDescriptor, lpftLastWriteTime);
 }
 
-public static final int RegQueryValueEx (int hKey, TCHAR lpValueName, int lpReserved, int[] lpType, TCHAR lpData, int[] lpcbData) {
+public static final int RegQueryValueEx (int /*long*/ hKey, TCHAR lpValueName, int /*long*/ lpReserved, int[] lpType, TCHAR lpData, int[] lpcbData) {
 	if (IsUnicode) {
 		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
 		char [] lpData1 = lpData == null ? null : lpData.chars;
@@ -2550,7 +2678,7 @@ public static final int RegQueryValueEx (int hKey, TCHAR lpValueName, int lpRese
 	return RegQueryValueExA (hKey, lpValueName1, lpReserved, lpType, lpData1, lpcbData);
 }
 
-public static final int RegQueryValueEx (int hKey, TCHAR lpValueName, int lpReserved, int[] lpType, int [] lpData, int[] lpcbData) {
+public static final int RegQueryValueEx (int /*long*/ hKey, TCHAR lpValueName, int /*long*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData) {
 	if (IsUnicode) {
 		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
 		return RegQueryValueExW (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData);
@@ -2559,12 +2687,12 @@ public static final int RegQueryValueEx (int hKey, TCHAR lpValueName, int lpRese
 	return RegQueryValueExA (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData);
 }
 
-public static final int RemoveProp  (int hWnd, int lpString){
+public static final int /*long*/ RemoveProp  (int /*long*/ hWnd, int /*long*/ lpString){
 	if (IsUnicode) return RemovePropW (hWnd, lpString);
 	return RemovePropA (hWnd, lpString);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TCHAR lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TCHAR lParam) {
 	if (IsUnicode) {
 		char [] lParam1 = lParam == null ? null : lParam.chars;
 		return SendMessageW (hWnd, Msg, wParam, lParam1);
@@ -2573,162 +2701,167 @@ public static final int SendMessage (int hWnd, int Msg, int wParam, TCHAR lParam
 	return SendMessageA (hWnd, Msg, wParam, lParam1);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int [] wParam, int [] lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int [] wParam, int [] lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, SIZE lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SIZE lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int [] wParam, int lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ [] wParam, int /*long*/ lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, int [] lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int [] lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, short [] lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, short [] lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, int lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, LITEM lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LITEM lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, LVCOLUMN lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVCOLUMN lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, LVHITTESTINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVHITTESTINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, LVITEM lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVITEM lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, MARGINS lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, MARGINS lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, POINT lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, POINT lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, REBARBANDINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, REBARBANDINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, RECT lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, RECT lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, SYSTEMTIME lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SYSTEMTIME lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TBBUTTON lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTON lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TBBUTTONINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTONINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TCITEM lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TCITEM lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TOOLINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TOOLINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TVHITTESTINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVHITTESTINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TVINSERTSTRUCT lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVINSERTSTRUCT lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, TVITEM lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVITEM lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, UDACCEL lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, UDACCEL lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, HDHITTESTINFO lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDHITTESTINFO lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, HDITEM lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDITEM lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, HDLAYOUT lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDLAYOUT lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final int SendMessage (int hWnd, int Msg, int wParam, BUTTON_IMAGELIST lParam) {
+public static final int /*long*/ SendMessage (int /*long*/ hWnd, int Msg, int /*long*/ wParam, BUTTON_IMAGELIST lParam) {
 	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
 	return SendMessageA (hWnd, Msg, wParam, lParam);
 }
 
-public static final boolean SetMenuItemInfo (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
+public static final boolean SetMenuItemInfo (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
 	if (IsUnicode) return SetMenuItemInfoW (hMenu, uItem, fByPosition, lpmii);
 	return SetMenuItemInfoA (hMenu, uItem, fByPosition, lpmii);
 }
 
-public static boolean SetProp (int hWnd, int lpString, int hData) {
+public static boolean SetProp (int /*long*/ hWnd, int /*long*/ lpString, int /*long*/ hData) {
 	if (IsUnicode) return SetPropW (hWnd, lpString, hData);
 	return SetPropA (hWnd, lpString, hData);
 }
 
-public static final int SetWindowLong (int hWnd, int nIndex, int dwNewLong) {
+public static final int SetWindowLong (int /*long*/ hWnd, int nIndex, int dwNewLong) {
 	if (IsUnicode) return SetWindowLongW (hWnd, nIndex, dwNewLong);
 	return SetWindowLongA (hWnd, nIndex, dwNewLong);
 }
 
-public static final int SetWindowsHookEx (int idHook, int lpfn, int hMod, int dwThreadId) {
+public static final int /*long*/ SetWindowLongPtr (int /*long*/ hWnd, int nIndex, int /*long*/ dwNewLong) {
+	if (IsUnicode) return SetWindowLongPtrW (hWnd, nIndex, dwNewLong);
+	return SetWindowLongPtrA (hWnd, nIndex, dwNewLong);
+}
+
+public static final int /*long*/ SetWindowsHookEx (int idHook, int /*long*/ lpfn, int /*long*/ hMod, int dwThreadId) {
 	if (IsUnicode) return SetWindowsHookExW (idHook, lpfn, hMod, dwThreadId);
 	return SetWindowsHookExA (idHook, lpfn, hMod, dwThreadId);
 }
 
-public static final boolean SetWindowText (int hWnd, TCHAR lpString) {
+public static final boolean SetWindowText (int /*long*/ hWnd, TCHAR lpString) {
 	if (IsUnicode) {
 		char [] lpString1 = lpString == null ? null : lpString.chars;
 		return SetWindowTextW (hWnd, lpString1);
@@ -2737,7 +2870,7 @@ public static final boolean SetWindowText (int hWnd, TCHAR lpString) {
 	return SetWindowTextA (hWnd, lpString1);
 }
 
-public static final int SHBrowseForFolder (BROWSEINFO lpbi) {
+public static final int /*long*/ SHBrowseForFolder (BROWSEINFO lpbi) {
 	if (IsUnicode) return SHBrowseForFolderW (lpbi);
 	return SHBrowseForFolderA (lpbi);
 }
@@ -2747,7 +2880,7 @@ public static final boolean ShellExecuteEx (SHELLEXECUTEINFO lpExecInfo) {
 	return ShellExecuteExA (lpExecInfo);
 }
 
-public static int SHGetFileInfo (TCHAR pszPath, int dwFileAttributes, SHFILEINFO psfi, int cbFileInfo, int uFlags) {
+public static int /*long*/ SHGetFileInfo (TCHAR pszPath, int dwFileAttributes, SHFILEINFO psfi, int cbFileInfo, int uFlags) {
 	if (IsUnicode) {
 		char [] pszPath1 = pszPath == null ? null : pszPath.chars;
 		return SHGetFileInfoW (pszPath1, dwFileAttributes, (SHFILEINFOW) psfi, cbFileInfo, uFlags);
@@ -2761,7 +2894,7 @@ public static final boolean Shell_NotifyIcon (int dwMessage, NOTIFYICONDATA lpDa
 	return Shell_NotifyIconA (dwMessage, (NOTIFYICONDATAA)lpData);
 }
 
-public static final boolean SHGetPathFromIDList (int pidl, TCHAR pszPath) {
+public static final boolean SHGetPathFromIDList (int /*long*/ pidl, TCHAR pszPath) {
 	if (IsUnicode) {
 		char [] pszPath1 = pszPath == null ? null : pszPath.chars;
 		return SHGetPathFromIDListW (pidl, pszPath1);
@@ -2770,7 +2903,7 @@ public static final boolean SHGetPathFromIDList (int pidl, TCHAR pszPath) {
 	return SHGetPathFromIDListA (pidl, pszPath1);
 }
 
-public static final int StartDoc (int hdc, DOCINFO lpdi) {
+public static final int StartDoc (int /*long*/ hdc, DOCINFO lpdi) {
 	if (IsUnicode) return StartDocW (hdc, lpdi);
 	return StartDocA (hdc, lpdi);
 }
@@ -2790,17 +2923,17 @@ public static final boolean SystemParametersInfo (int uiAction, int uiParam, NON
 	return SystemParametersInfoA (uiAction, uiParam, (NONCLIENTMETRICSA)pvParam, fWinIni);
 }
 
-public static final boolean SystemParametersInfo (int uiAction, int uiParam, int[] pvParam, int fWinIni) {
+public static final boolean SystemParametersInfo (int uiAction, int uiParam, int [] pvParam, int fWinIni) {
 	if (IsUnicode) return SystemParametersInfoW (uiAction, uiParam, pvParam, fWinIni);
 	return SystemParametersInfoA (uiAction, uiParam, pvParam, fWinIni);
 }
 
-public static final int TranslateAccelerator (int hWnd, int hAccTable, MSG lpMsg) {
+public static final int TranslateAccelerator (int /*long*/ hWnd, int /*long*/ hAccTable, MSG lpMsg) {
 	if (IsUnicode) return TranslateAcceleratorW (hWnd, hAccTable, lpMsg);
 	return TranslateAcceleratorA (hWnd, hAccTable, lpMsg);
 }
 
-public static final boolean UnregisterClass (TCHAR lpClassName, int hInstance) {
+public static final boolean UnregisterClass (TCHAR lpClassName, int /*long*/ hInstance) {
 	if (IsUnicode) {
 		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 		return UnregisterClassW (lpClassName1, hInstance);
@@ -2815,722 +2948,736 @@ public static final short VkKeyScan (short ch) {
 }
 
 /** Natives */
-public static final native int AbortDoc (int hdc);
-public static final native boolean ActivateActCtx (int hActCtx, int [] lpCookie);
-public static final native int ActivateKeyboardLayout(int hkl, int Flags);
+public static final native int AbortDoc (int /*long*/ hdc);
+public static final native boolean ActivateActCtx (int /*long*/ hActCtx, int /*long*/ [] lpCookie);
+public static final native int /*long*/ ActivateKeyboardLayout(int /*long*/ hkl, int Flags);
 public static final native boolean AdjustWindowRectEx (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle);
-public static final native boolean AlphaBlend(int hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
-public static final native boolean AnimateWindow(int hwnd, int dwTime, int dwFlags);
-public static final native boolean Arc (int hdc,int nLeftRect,int nTopRect,int nRightRect,int nBottomRect,int nXStartArc,int nYStartArc,int nXEndArc,int nYEndArc);
+public static final native boolean AlphaBlend(int /*long*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int /*long*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
+public static final native boolean AnimateWindow(int /*long*/ hwnd, int dwTime, int dwFlags);
+public static final native boolean Arc (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
 public static final native boolean AttachThreadInput (int idAttach, int idAttachTo, boolean fAttach);
-public static final native int BeginDeferWindowPos (int nNumWindows);
-public static final native int BeginPaint (int hWnd, PAINTSTRUCT lpPaint);
-public static final native boolean BeginPath(int hdc);
-public static final native boolean BitBlt (int hdcDest,int nXDest,int nYDest,int nWidth,int nHeight,int hdcSrc,int nXSrc,int nYSrc,int dwRop);
-public static final native boolean BringWindowToTop (int hWnd);
-public static final native int Call (int address, DLLVERSIONINFO arg0);
-public static final native int CallNextHookEx(int hhk, int nCode, int wParam, int lParam);
-public static final native int CallWindowProcW (int lpPrevWndFunc, int hWnd, int Msg, int wParam, int lParam);
-public static final native int CallWindowProcA (int lpPrevWndFunc, int hWnd, int Msg, int wParam, int lParam);
+public static final native int /*long*/ BeginDeferWindowPos (int nNumWindows);
+public static final native int /*long*/ BeginPaint (int /*long*/ hWnd, PAINTSTRUCT lpPaint);
+public static final native boolean BeginPath(int /*long*/ hdc);
+public static final native boolean BitBlt (int /*long*/ hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int /*long*/ hdcSrc, int nXSrc, int nYSrc, int dwRop);
+public static final native boolean BringWindowToTop (int /*long*/ hWnd);
+public static final native int Call (int /*long*/ address, DLLVERSIONINFO arg0);
+public static final native int /*long*/ CallNextHookEx(int /*long*/ hhk, int nCode, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ CallWindowProcW (int /*long*/ lpPrevWndFunc, int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ CallWindowProcA (int /*long*/ lpPrevWndFunc, int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
 public static final native short CharLowerW (short ch);
 public static final native short CharLowerA (short ch);
 public static final native short CharUpperW (short ch);
 public static final native short CharUpperA (short ch);
-public static final native boolean CheckMenuItem (int hmenu, int uIDCheckItem, int uCheck); 
+public static final native boolean CheckMenuItem (int /*long*/ hmenu, int uIDCheckItem, int uCheck); 
 public static final native boolean ChooseColorW (CHOOSECOLOR lpcc);
 public static final native boolean ChooseColorA (CHOOSECOLOR lpcc);
 public static final native boolean ChooseFontW (CHOOSEFONT chooseFont);
 public static final native boolean ChooseFontA (CHOOSEFONT chooseFont);
-public static final native boolean ClientToScreen (int hWnd, POINT lpPoint);
+public static final native boolean ClientToScreen (int /*long*/ hWnd, POINT lpPoint);
 public static final native boolean CloseClipboard ();
-public static final native boolean CloseHandle (int hObject);
-public static final native int CloseThemeData (int hTheme);
-public static final native int CoCreateInstance(byte[] rclsid, int pUnkOuter, int dwClsContext, byte[] riid, int[] ppv);
-public static final native int CombineRgn (int hrgnDest, int hrgnSrc1, int hrgnSrc2, int fnCombineMode);
-public static final native boolean CommandBar_AddAdornments (int hwndCB, int dwFlags, int dwReserved);
-public static final native int CommandBar_Create (int hInst, int hwndParent, int idCmdBar);
-public static final native void CommandBar_Destroy (int hwndCB);
-public static final native boolean CommandBar_DrawMenuBar (int hwndCB, int iButton);
-public static final native int CommandBar_Height (int hdnwCB);
-public static final native boolean CommandBar_InsertMenubarEx (int hwndCB, int hInst, int pszMenu, int iButton);
-public static final native boolean CommandBar_Show (int hwndCB, boolean fShow);
+public static final native boolean CloseHandle (int /*long*/ hObject);
+public static final native int CloseThemeData (int /*long*/ hTheme);
+public static final native int CoCreateInstance (byte[] rclsid, int /*long*/ pUnkOuter, int dwClsContext, byte[] riid, int /*long*/[] ppv);
+public static final native int CombineRgn (int /*long*/ hrgnDest, int /*long*/ hrgnSrc1, int /*long*/ hrgnSrc2, int fnCombineMode);
+public static final native boolean CommandBar_AddAdornments (int /*long*/ hwndCB, int dwFlags, int dwReserved);
+public static final native int /*long*/ CommandBar_Create (int /*long*/ hInst, int /*long*/ hwndParent, int idCmdBar);
+public static final native void CommandBar_Destroy (int /*long*/ hwndCB);
+public static final native boolean CommandBar_DrawMenuBar (int /*long*/ hwndCB, int iButton);
+public static final native int CommandBar_Height (int /*long*/ hdnwCB);
+public static final native boolean CommandBar_InsertMenubarEx (int /*long*/ hwndCB, int /*long*/ hInst, int /*long*/ pszMenu, int iButton);
+public static final native boolean CommandBar_Show (int /*long*/ hwndCB, boolean fShow);
 public static final native int CommDlgExtendedError ();
-public static final native int CopyImage (int hImage, int uType, int cxDesired, int cyDesired, int fuFlags);
-public static final native int CreateAcceleratorTableW (byte [] lpaccl, int cEntries); 
-public static final native int CreateAcceleratorTableA (byte [] lpaccl, int cEntries);
-public static final native int CreateActCtxW (ACTCTX pActCtx);
-public static final native int CreateActCtxA (ACTCTX pActCtx);
-public static final native int CreateBitmap (int nWidth, int nHeight, int cPlanes, int cBitsPerPel, byte [] lpvBits);
-public static final native boolean CreateCaret (int hWnd, int hBitmap, int nWidth, int nHeight);
-public static final native int CreateCompatibleBitmap (int hdc, int nWidth, int nHeight);
-public static final native int CreateCompatibleDC (int hdc);
-public static final native int CreateCursor (int hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, byte [] pvANDPlane, byte [] pvXORPlane);
-public static final native int CreateDCW (char [] lpszDriver, char [] lpszDevice, int lpszOutput, int lpInitData);  
-public static final native int CreateDCA (byte [] lpszDriver, byte [] lpszDevice, int lpszOutput, int lpInitData);  
-public static final native int CreateDIBSection(int hdc, byte[] pbmi, int iUsage, int[] ppvBits, int hSection, int dwOffset);
-public static final native int CreateFontIndirectW (int lplf);
-public static final native int CreateFontIndirectA (int lplf);
-public static final native int CreateFontIndirectW (LOGFONTW lplf);
-public static final native int CreateFontIndirectA (LOGFONTA lplf);
-public static final native int CreateIconIndirect (ICONINFO lplf);
-public static final native int CreateMenu ();
-public static final native int CreatePalette (byte[] logPalette);
-public static final native int CreatePatternBrush (int colorRef);
-public static final native int CreatePen (int fnPenStyle, int nWidth, int crColor);
-public static final native int CreatePolygonRgn(int[] lppt, int cPoints, int fnPolyFillMode);
-public static final native int CreatePopupMenu ();
-public static final native boolean CreateProcessW (int lpApplicationName, int lpCommandLine, int lpProcessAttributes, int lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int lpEnvironment, int lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
-public static final native boolean CreateProcessA (int lpApplicationName, int lpCommandLine, int lpProcessAttributes, int lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int lpEnvironment, int lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
-public static final native int CreateRectRgn (int left, int top, int right, int bottom);
-public static final native int CreateSolidBrush (int colorRef);
-public static final native int CreateStreamOnHGlobal(int hGlobal, boolean fDeleteOnRelease, int[] ppstm);
-public static final native int CreateWindowExW (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int hWndParent, int hMenu, int hInstance, CREATESTRUCT lpParam);
-public static final native int CreateWindowExA (int dwExStyle, byte [] lpClassName, byte [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int hWndParent, int hMenu, int hInstance, CREATESTRUCT lpParam);
-public static final native int DeferWindowPos (int hWinPosInfo, int hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
-public static final native int DefMDIChildProcW (int hWnd, int Msg, int wParam, int lParam);
-public static final native int DefMDIChildProcA (int hWnd, int Msg, int wParam, int lParam);
-public static final native int DefFrameProcW (int hWnd, int hWndMDIClient, int Msg, int wParam, int lParam);
-public static final native int DefFrameProcA (int hWnd, int hWndMDIClient, int Msg, int wParam, int lParam);
-public static final native int DefWindowProcW (int hWnd, int Msg, int wParam, int lParam);
-public static final native int DefWindowProcA (int hWnd, int Msg, int wParam, int lParam);
-public static final native boolean DeleteDC (int hdc);
-public static final native boolean DeleteMenu (int hMenu, int uPosition, int uFlags);
-public static final native boolean DeleteObject (int hGdiObj);
-public static final native boolean DestroyAcceleratorTable (int hAccel);
+public static final native int /*long*/ CopyImage (int /*long*/ hImage, int uType, int cxDesired, int cyDesired, int fuFlags);
+public static final native int /*long*/ CreateAcceleratorTableW (byte [] lpaccl, int cEntries); 
+public static final native int /*long*/ CreateAcceleratorTableA (byte [] lpaccl, int cEntries);
+public static final native int /*long*/ CreateActCtxW (ACTCTX pActCtx);
+public static final native int /*long*/ CreateActCtxA (ACTCTX pActCtx);
+public static final native int /*long*/ CreateBitmap (int nWidth, int nHeight, int cPlanes, int cBitsPerPel, byte [] lpvBits);
+public static final native boolean CreateCaret (int /*long*/ hWnd, int /*long*/ hBitmap, int nWidth, int nHeight);
+public static final native int /*long*/ CreateCompatibleBitmap (int /*long*/ hdc, int nWidth, int nHeight);
+public static final native int /*long*/ CreateCompatibleDC (int /*long*/ hdc);
+public static final native int /*long*/ CreateCursor (int /*long*/ hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, byte [] pvANDPlane, byte [] pvXORPlane);
+public static final native int /*long*/ CreateDCW (char [] lpszDriver, char [] lpszDevice, int /*long*/ lpszOutput, int /*long*/ lpInitData);  
+public static final native int /*long*/ CreateDCA (byte [] lpszDriver, byte [] lpszDevice, int /*long*/ lpszOutput, int /*long*/ lpInitData);  
+public static final native int /*long*/ CreateDIBSection(int /*long*/ hdc, byte[] pbmi, int iUsage, int /*long*/[] ppvBits, int /*long*/ hSection, int dwOffset);
+public static final native int /*long*/ CreateFontIndirectW (int /*long*/ lplf);
+public static final native int /*long*/ CreateFontIndirectA (int /*long*/ lplf);
+public static final native int /*long*/ CreateFontIndirectW (LOGFONTW lplf);
+public static final native int /*long*/ CreateFontIndirectA (LOGFONTA lplf);
+public static final native int /*long*/ CreateIconIndirect (ICONINFO lplf);
+public static final native int /*long*/ CreateMenu ();
+public static final native int /*long*/ CreatePalette (byte[] logPalette);
+public static final native int /*long*/ CreatePatternBrush (int /*long*/ colorRef);
+public static final native int /*long*/ CreatePen (int fnPenStyle, int nWidth, int crColor);
+public static final native int /*long*/ CreatePolygonRgn(int[] lppt, int cPoints, int fnPolyFillMode);
+public static final native int /*long*/ CreatePopupMenu ();
+public static final native boolean CreateProcessW (int /*long*/ lpApplicationName, int /*long*/ lpCommandLine, int /*long*/ lpProcessAttributes, int /*long*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int /*long*/ lpEnvironment, int /*long*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
+public static final native boolean CreateProcessA (int /*long*/ lpApplicationName, int /*long*/ lpCommandLine, int /*long*/ lpProcessAttributes, int /*long*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, int /*long*/ lpEnvironment, int /*long*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
+public static final native int /*long*/ CreateRectRgn (int left, int top, int right, int bottom);
+public static final native int /*long*/ CreateSolidBrush (int colorRef);
+public static final native int CreateStreamOnHGlobal(int /*long*/ hGlobal, boolean fDeleteOnRelease, int /*long*/[] ppstm);
+public static final native int /*long*/ CreateWindowExW (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int /*long*/ hWndParent, int /*long*/ hMenu, int /*long*/ hInstance, CREATESTRUCT lpParam);
+public static final native int /*long*/ CreateWindowExA (int dwExStyle, byte [] lpClassName, byte [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, int /*long*/ hWndParent, int /*long*/ hMenu, int /*long*/ hInstance, CREATESTRUCT lpParam);
+public static final native int /*long*/ DeferWindowPos (int /*long*/ hWinPosInfo, int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
+public static final native int /*long*/ DefMDIChildProcW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ DefMDIChildProcA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ DefFrameProcW (int /*long*/ hWnd, int /*long*/ hWndMDIClient, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ DefFrameProcA (int /*long*/ hWnd, int /*long*/ hWndMDIClient, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ DefWindowProcW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ DefWindowProcA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native boolean DeleteDC (int /*long*/ hdc);
+public static final native boolean DeleteMenu (int /*long*/ hMenu, int uPosition, int uFlags);
+public static final native boolean DeleteObject (int /*long*/ hGdiObj);
+public static final native boolean DestroyAcceleratorTable (int /*long*/ hAccel);
 public static final native boolean DestroyCaret ();
-public static final native boolean DestroyCursor (int hCursor);
-public static final native boolean DestroyIcon (int hIcon);
-public static final native boolean DestroyMenu (int hMenu);
-public static final native boolean DestroyWindow (int hWnd);
-public static final native int DispatchMessageW (MSG lpmsg);
-public static final native int DispatchMessageA (MSG lpmsg);
-public static final native boolean DragDetect (int hwnd, POINT pt);
-public static final native void DragFinish (int hDrop);
-public static final native int DragQueryFileA (int hDrop, int iFile, byte[] lpszFile, int cch);
-public static final native int DragQueryFileW (int hDrop, int iFile, char[] lpszFile, int cch);
-public static final native boolean DrawEdge (int hdc, RECT qrc, int edge, int grfFlags);
-public static final native boolean DrawFocusRect (int hDC, RECT lpRect);
-public static final native boolean DrawFrameControl (int hdc, RECT lprc, int uType, int uState);
-public static final native boolean DrawIconEx (int hdc, int xLeft, int yTop, int hIcon, int cxWidth, int cyWidth, int istepIfAniCur, int hbrFlickerFreeDraw, int diFlags);
-public static final native boolean DrawMenuBar (int hWnd);
-public static final native boolean DrawStateW (int hdc, int hbr, int lpOutputFunc, int lData, int wData, int x, int y, int cx, int cy, int fuFlags);
-public static final native boolean DrawStateA (int hdc, int hbr, int lpOutputFunc, int lData, int wData, int x, int y, int cx, int cy, int fuFlags);
-public static final native int DrawTextW (int hDC, char [] lpString, int nCount, RECT lpRect, int uFormat);
-public static final native int DrawTextA (int hDC, byte [] lpString, int nCount, RECT lpRect, int uFormat);
-public static final native int DrawThemeBackground(int hTheme, int hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect);
-public static final native int DrawThemeEdge(int hTheme, int hdc, int iPartId, int iStateId, RECT pDestRect, int uEdge, int uFlags, RECT pContentRect);
-public static final native int DrawThemeIcon(int hTheme, int hdc, int iPartId, int iStateId, RECT pRect, int himl, int iImageIndex);
-public static final native int DrawThemeParentBackground(int hwnd, int hdc, RECT prc);
-public static final native int DrawThemeText(int hTheme, int hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect);
-public static final native boolean Ellipse (int hdc,int nLeftRect,int nTopRect,int nRightRect,int nBottomRect);
-public static final native boolean EnableMenuItem (int hMenu, int uIDEnableItem, int uEnable);
-public static final native boolean EnableScrollBar (int hWnd, int wSBflags, int wArrows);
-public static final native boolean EnableWindow (int hWnd, boolean bEnable);
-public static final native boolean EnumSystemLanguageGroupsW(int pLangGroupEnumProc, int dwFlags, int lParam);
-public static final native boolean EnumSystemLanguageGroupsA(int pLangGroupEnumProc, int dwFlags, int lParam);
-public static final native boolean EnumSystemLocalesW (int lpLocaleEnumProc, int dwFlags);
-public static final native boolean EnumSystemLocalesA (int lpLocaleEnumProc, int dwFlags);
-public static final native boolean EndDeferWindowPos (int hWinPosInfo);
-public static final native int EndDoc (int hdc);
-public static final native int EndPage (int hdc);
-public static final native int EndPaint (int hWnd, PAINTSTRUCT lpPaint);
-public static final native boolean EndPath(int hdc);
-public static final native boolean EnumDisplayMonitors (int hdc, RECT lprcClip, int lpfnEnum, int dwData);
-public static final native int EnumFontFamiliesW (int hdc, char [] lpszFamily, int lpEnumFontFamProc, int lParam);
-public static final native int EnumFontFamiliesA (int hdc, byte [] lpszFamily, int lpEnumFontFamProc, int lParam);
-public static final native int EnumFontFamiliesExW (int hdc, LOGFONTW lpLogfont, int lpEnumFontFamExProc, int lParam, int dwFlags);
-public static final native int EnumFontFamiliesExA (int hdc, LOGFONTA lpLogfont, int lpEnumFontFamExProc, int lParam, int dwFlags);
+public static final native boolean DestroyCursor (int /*long*/ hCursor);
+public static final native boolean DestroyIcon (int /*long*/ hIcon);
+public static final native boolean DestroyMenu (int /*long*/ hMenu);
+public static final native boolean DestroyWindow (int /*long*/ hWnd);
+public static final native int /*long*/ DispatchMessageW (MSG lpmsg);
+public static final native int /*long*/ DispatchMessageA (MSG lpmsg);
+public static final native boolean DragDetect (int /*long*/ hwnd, POINT pt);
+public static final native void DragFinish (int /*long*/ hDrop);
+public static final native int DragQueryFileA (int /*long*/ hDrop, int iFile, byte[] lpszFile, int cch);
+public static final native int DragQueryFileW (int /*long*/ hDrop, int iFile, char[] lpszFile, int cch);
+public static final native boolean DrawEdge (int /*long*/ hdc, RECT qrc, int edge, int grfFlags);
+public static final native boolean DrawFocusRect (int /*long*/ hDC, RECT lpRect);
+public static final native boolean DrawFrameControl (int /*long*/ hdc, RECT lprc, int uType, int uState);
+public static final native boolean DrawIconEx (int /*long*/ hdc, int xLeft, int yTop, int /*long*/ hIcon, int cxWidth, int cyWidth, int istepIfAniCur, int /*long*/ hbrFlickerFreeDraw, int diFlags);
+public static final native boolean DrawMenuBar (int /*long*/ hWnd);
+public static final native boolean DrawStateW (int /*long*/ hdc, int /*long*/ hbr, int /*long*/ lpOutputFunc, int /*long*/ lData, int /*long*/ wData, int x, int y, int cx, int cy, int fuFlags);
+public static final native boolean DrawStateA (int /*long*/ hdc, int /*long*/ hbr, int /*long*/ lpOutputFunc, int /*long*/ lData, int /*long*/ wData, int x, int y, int cx, int cy, int fuFlags);
+public static final native int DrawTextW (int /*long*/ hDC, char [] lpString, int nCount, RECT lpRect, int uFormat);
+public static final native int DrawTextA (int /*long*/ hDC, byte [] lpString, int nCount, RECT lpRect, int uFormat);
+public static final native int DrawThemeBackground (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect);
+public static final native int DrawThemeEdge (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT pDestRect, int uEdge, int uFlags, RECT pContentRect);
+public static final native int DrawThemeIcon (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT pRect, int /*long*/ himl, int iImageIndex);
+public static final native int DrawThemeParentBackground (int /*long*/ hwnd, int /*long*/ hdc, RECT prc);
+public static final native int DrawThemeText (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect);
+public static final native boolean Ellipse (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+public static final native boolean EnableMenuItem (int /*long*/ hMenu, int uIDEnableItem, int uEnable);
+public static final native boolean EnableScrollBar (int /*long*/ hWnd, int wSBflags, int wArrows);
+public static final native boolean EnableWindow (int /*long*/ hWnd, boolean bEnable);
+public static final native boolean EnumSystemLanguageGroupsW(int /*long*/ pLangGroupEnumProc, int dwFlags, int /*long*/ lParam);
+public static final native boolean EnumSystemLanguageGroupsA(int /*long*/ pLangGroupEnumProc, int dwFlags, int /*long*/ lParam);
+public static final native boolean EnumSystemLocalesW (int /*long*/ lpLocaleEnumProc, int dwFlags);
+public static final native boolean EnumSystemLocalesA (int /*long*/ lpLocaleEnumProc, int dwFlags);
+public static final native boolean EndDeferWindowPos (int /*long*/ hWinPosInfo);
+public static final native int EndDoc (int /*long*/ hdc);
+public static final native int EndPage (int /*long*/ hdc);
+public static final native int EndPaint (int /*long*/ hWnd, PAINTSTRUCT lpPaint);
+public static final native boolean EndPath(int /*long*/ hdc);
+public static final native boolean EnumDisplayMonitors (int /*long*/ hdc, RECT lprcClip, int /*long*/ lpfnEnum, int dwData);
+public static final native int EnumFontFamiliesW (int /*long*/ hdc, char [] lpszFamily, int /*long*/ lpEnumFontFamProc, int /*long*/ lParam);
+public static final native int EnumFontFamiliesA (int /*long*/ hdc, byte [] lpszFamily, int /*long*/ lpEnumFontFamProc, int /*long*/ lParam);
+public static final native int EnumFontFamiliesExW (int /*long*/ hdc, LOGFONTW lpLogfont, int /*long*/ lpEnumFontFamExProc, int /*long*/ lParam, int dwFlags);
+public static final native int EnumFontFamiliesExA (int /*long*/ hdc, LOGFONTA lpLogfont, int /*long*/ lpEnumFontFamExProc, int /*long*/ lParam, int dwFlags);
 public static final native boolean EqualRect (RECT lprc1, RECT lprc2);
-public static final native boolean EqualRgn (int hSrcRgn1, int hSrcRgn2);
-public static final native int ExcludeClipRect (int hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+public static final native boolean EqualRgn (int /*long*/ hSrcRgn1, int /*long*/ hSrcRgn2);
+public static final native int ExcludeClipRect (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 public static final native int ExpandEnvironmentStringsW (char [] lpSrc, char [] lsDst, int nSize);
 public static final native int ExpandEnvironmentStringsA (byte [] lpSrc, byte [] lsDst, int nSize);
-public static final native int ExtCreatePen(int dwPenStyle, int dwWidth, LOGBRUSH lplb, int dwStyleCount, int[] lpStyle);
-public static final native int ExtCreateRegion(float[] lpXform, int nCount, int[] lpRgnData);
-public static final native boolean ExtTextOutW(int hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx);
-public static final native boolean ExtTextOutA(int hdc, int X, int Y, int fuOptions, RECT lprc, byte[] lpString, int cbCount, int[] lpDx);
-public static final native int ExtractIconExW (char [] lpszFile, int nIconIndex, int [] phiconLarge, int [] phiconSmall, int nIcons);
-public static final native int ExtractIconExA (byte [] lpszFile, int nIconIndex, int [] phiconLarge, int [] phiconSmall, int nIcons);
-public static final native int FillRect(int hDC, RECT lprc, int hbr);
-public static final native boolean FillPath(int hdc);
-public static final native int FindWindowA (byte [] lpClassName, byte [] lpWindowName);
-public static final native int FindWindowW (char [] lpClassName, char [] lpWindowName);
-public static final native int FormatMessageA(int dwFlags, int lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int Arguments);
-public static final native int FormatMessageW(int dwFlags, int lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int Arguments);
-public static final native boolean FreeLibrary (int hLibModule);
+public static final native int /*long*/ ExtCreatePen (int dwPenStyle, int dwWidth, LOGBRUSH lplb, int dwStyleCount, int[] lpStyle);
+public static final native int /*long*/ ExtCreateRegion (float[] lpXform, int nCount, int[] lpRgnData);
+public static final native boolean ExtTextOutW (int /*long*/ hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx);
+public static final native boolean ExtTextOutA (int /*long*/ hdc, int X, int Y, int fuOptions, RECT lprc, byte[] lpString, int cbCount, int[] lpDx);
+public static final native int ExtractIconExW (char [] lpszFile, int nIconIndex, int /*long*/ [] phiconLarge, int /*long*/ [] phiconSmall, int nIcons);
+public static final native int ExtractIconExA (byte [] lpszFile, int nIconIndex, int /*long*/ [] phiconLarge, int /*long*/ [] phiconSmall, int nIcons);
+public static final native int FillRect (int /*long*/ hDC, RECT lprc, int /*long*/ hbr);
+public static final native boolean FillPath (int /*long*/ hdc);
+public static final native int /*long*/ FindWindowA (byte [] lpClassName, byte [] lpWindowName);
+public static final native int /*long*/ FindWindowW (char [] lpClassName, char [] lpWindowName);
+public static final native int FormatMessageA (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments);
+public static final native int FormatMessageW (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments);
+public static final native boolean FreeLibrary (int /*long*/ hLibModule);
 public static final native int GdiSetBatchLimit (int dwLimit);
 public static final native int GetACP ();
-public static final native int GetActiveWindow ();
-public static final native int GetBkColor (int hDC);
-public static final native int GetCapture ();
+public static final native int /*long*/ GetActiveWindow ();
+public static final native int GetBkColor (int /*long*/ hDC);
+public static final native int /*long*/ GetCapture ();
 public static final native boolean GetCaretPos (POINT lpPoint);
-public static final native boolean GetCharABCWidthsA (int hdc, int iFirstChar, int iLastChar, int [] lpabc);
-public static final native boolean GetCharABCWidthsW (int hdc, int iFirstChar, int iLastChar, int [] lpabc);
-public static final native int GetCharacterPlacementW(int hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
-public static final native int GetCharacterPlacementA(int hdc, byte[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
-public static final native boolean GetCharWidthA (int hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
-public static final native boolean GetCharWidthW (int hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
-public static final native boolean GetClassInfoW (int hInstance, char [] lpClassName, WNDCLASS lpWndClass);
-public static final native boolean GetClassInfoA (int hInstance, byte [] lpClassName, WNDCLASS lpWndClass);
-public static final native int GetClassNameW (int hWnd, char [] lpClassName, int nMaxCount);
-public static final native int GetClassNameA (int hWnd, byte [] lpClassName, int nMaxCount);
-public static final native boolean GetClientRect (int hWnd, RECT lpRect);
-public static final native int GetClipboardData (int uFormat);
+public static final native boolean GetCharABCWidthsA (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpabc);
+public static final native boolean GetCharABCWidthsW (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpabc);
+public static final native int GetCharacterPlacementW (int /*long*/ hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
+public static final native int GetCharacterPlacementA (int /*long*/ hdc, byte[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
+public static final native boolean GetCharWidthA (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
+public static final native boolean GetCharWidthW (int /*long*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
+public static final native boolean GetClassInfoW (int /*long*/ hInstance, char [] lpClassName, WNDCLASS lpWndClass);
+public static final native boolean GetClassInfoA (int /*long*/ hInstance, byte [] lpClassName, WNDCLASS lpWndClass);
+public static final native int GetClassNameW (int /*long*/ hWnd, char [] lpClassName, int nMaxCount);
+public static final native int GetClassNameA (int /*long*/ hWnd, byte [] lpClassName, int nMaxCount);
+public static final native boolean GetClientRect (int /*long*/ hWnd, RECT lpRect);
+public static final native int /*long*/ GetClipboardData (int uFormat);
 public static final native int GetClipboardFormatNameA (int format, byte[] lpszFormatName, int cchMaxCount);
 public static final native int GetClipboardFormatNameW (int format, char[] lpszFormatName, int cchMaxCount);
-public static final native int GetClipBox (int hdc, RECT lprc);
-public static final native int GetClipRgn (int hdc, int hrgn);
-public static final native boolean GetComboBoxInfo (int hwndCombo, COMBOBOXINFO pcbi);
-public static final native int GetCurrentObject (int hdc, int uObjectType);
+public static final native int GetClipBox (int /*long*/ hdc, RECT lprc);
+public static final native int GetClipRgn (int /*long*/ hdc, int /*long*/ hrgn);
+public static final native boolean GetComboBoxInfo (int /*long*/ hwndCombo, COMBOBOXINFO pcbi);
+public static final native int /*long*/ GetCurrentObject (int /*long*/ hdc, int uObjectType);
 public static final native int GetCurrentProcessId ();
 public static final native int GetCurrentThreadId ();
-public static final native int GetCursor ();
+public static final native int /*long*/ GetCursor ();
 public static final native boolean GetCursorPos (POINT lpPoint);
-public static final native int GetDC (int hwnd);
-public static final native int GetDCEx (int hWnd, int hrgnClip, int flags);
-public static final native int GetDesktopWindow ();
-public static final native int GetDeviceCaps (int hdc, int nIndex);
+public static final native int /*long*/ GetDC (int /*long*/ hwnd);
+public static final native int /*long*/ GetDCEx (int /*long*/ hWnd, int /*long*/ hrgnClip, int flags);
+public static final native int /*long*/ GetDesktopWindow ();
+public static final native int GetDeviceCaps (int /*long*/ hdc, int nIndex);
 public static final native int GetDialogBaseUnits ();
-public static final native int GetDIBColorTable (int hdc, int uStartIndex, int cEntries, byte[] pColors);
-public static final native int GetDIBits (int hdc, int hbmp, int uStartScan, int cScanLines, int lpvBits, byte[] lpbi, int uUsage);
-public static final native int GetDlgItem (int hDlg, int nIDDlgItem);
+public static final native int GetDIBColorTable (int /*long*/ hdc, int uStartIndex, int cEntries, byte[] pColors);
+public static final native int GetDIBits (int /*long*/ hdc, int /*long*/ hbmp, int uStartScan, int cScanLines, int /*long*/ lpvBits, byte[] lpbi, int uUsage);
+public static final native int /*long*/ GetDlgItem (int /*long*/ hDlg, int nIDDlgItem);
 public static final native int GetDoubleClickTime ();
-public static final native int GetFocus ();
-public static final native int GetFontLanguageInfo(int hdc);
-public static final native int GetForegroundWindow ();
-public static final native boolean GetGUIThreadInfo(int idThread, GUITHREADINFO lpgui);
-public static final native boolean GetIconInfo (int hIcon, ICONINFO piconinfo);
-public static final native int GetKeyboardLayoutList(int nBuff, int[] lpList);
-public static final native int GetKeyboardLayout(int idThread);
+public static final native int /*long*/ GetFocus ();
+public static final native int GetFontLanguageInfo (int /*long*/ hdc);
+public static final native int /*long*/ GetForegroundWindow ();
+public static final native boolean GetGUIThreadInfo (int idThread, GUITHREADINFO lpgui);
+public static final native boolean GetIconInfo (int /*long*/ hIcon, ICONINFO piconinfo);
+public static final native int GetKeyboardLayoutList (int nBuff, int /*long*/ [] lpList);
+public static final native int /*long*/ GetKeyboardLayout (int idThread);
 public static final native short GetKeyState (int nVirtKey);
 public static final native boolean GetKeyboardState (byte [] lpKeyState);
-public static final native int GetKeyNameTextW(int lParam, char [] lpString, int nSize);
-public static final native int GetKeyNameTextA(int lParam, byte [] lpString, int nSize);
-public static final native int GetLastActivePopup (int hWnd);
+public static final native int GetKeyNameTextW (int lParam, char [] lpString, int nSize);
+public static final native int GetKeyNameTextA (int lParam, byte [] lpString, int nSize);
+public static final native int /*long*/ GetLastActivePopup (int /*long*/ hWnd);
 public static final native int GetLastError ();
-public static final native int GetLayout (int hdc);
+public static final native int GetLayout (int /*long*/ hdc);
 /* returns the instance handle to the swt library */
-public static final native int GetLibraryHandle ();
+public static final native int /*long*/ GetLibraryHandle ();
 public static final native int GetLocaleInfoW (int Locale, int LCType, char [] lpLCData, int cchData);
 public static final native int GetLocaleInfoA (int Locale, int LCType, byte [] lpLCData, int cchData);
-public static final native int GetMenu (int hWnd);
-public static final native boolean GetMenuBarInfo (int hWnd, int idObject, int idItem, MENUBARINFO pmbi);
-public static final native int GetMenuDefaultItem (int hMenu, int fByPos, int gmdiFlags);
-public static final native boolean GetMenuInfo (int hmenu, MENUINFO lpcmi);
-public static final native int GetMenuItemCount (int hMenu);
-public static final native boolean GetMenuItemInfoW (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native boolean GetMenuItemInfoA (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native boolean GetMenuItemRect (int hWnd, int hMenu, int uItem, RECT lprcItem);
-public static final native boolean GetMessageW (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax);
-public static final native boolean GetMessageA (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax);
+public static final native int /*long*/ GetMenu (int /*long*/ hWnd);
+public static final native boolean GetMenuBarInfo (int /*long*/ hWnd, int idObject, int idItem, MENUBARINFO pmbi);
+public static final native int GetMenuDefaultItem (int /*long*/ hMenu, int fByPos, int gmdiFlags);
+public static final native boolean GetMenuInfo (int /*long*/ hmenu, MENUINFO lpcmi);
+public static final native int GetMenuItemCount (int /*long*/ hMenu);
+public static final native boolean GetMenuItemInfoW (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean GetMenuItemInfoA (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean GetMenuItemRect (int /*long*/ hWnd, int /*long*/ hMenu, int uItem, RECT lprcItem);
+public static final native boolean GetMessageW (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax);
+public static final native boolean GetMessageA (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax);
 public static final native int GetMessagePos ();
 public static final native int GetMessageTime ();
-public static final native int GetMetaRgn(int hdc, int hrgn);
-public static final native int GetThemeColor(int hTheme, int iPartId, int iStateId, int iPropId, int[] pColor);
-public static final native int GetThemeTextExtent(int hTheme, int hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect);
-public static final native int GetTextCharset(int hdc);
+public static final native int GetMetaRgn (int /*long*/ hdc, int /*long*/ hrgn);
+public static final native int GetThemeColor (int /*long*/ hTheme, int iPartId, int iStateId, int iPropId, int[] pColor);
+public static final native int GetThemeTextExtent (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect);
+public static final native int GetTextCharset (int /*long*/ hdc);
 public static final native int GetTickCount ();
-public static final native int GetModuleFileNameW (int hModule, char [] lpFilename, int inSize);
-public static final native int GetModuleFileNameA (int hModule, byte [] lpFilename, int inSize);
-public static final native int GetModuleHandleW (char [] lpModuleName);
-public static final native int GetModuleHandleA (byte [] lpModuleName);
-public static final native boolean GetMonitorInfoW (int hmonitor, MONITORINFO lpmi);
-public static final native boolean GetMonitorInfoA (int hmonitor, MONITORINFO lpmi);
-public static final native int GetNearestPaletteIndex(int hPal, int crColor);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, BITMAP lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, BITMAP lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, DIBSECTION lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, DIBSECTION lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, EXTLOGPEN lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, EXTLOGPEN lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, LOGFONTA lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, LOGFONTW lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, LOGPEN lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, LOGPEN lpvObject);
-public static final native int GetObjectA (int hgdiobj, int cbBuffer, int lpvObject);
-public static final native int GetObjectW (int hgdiobj, int cbBuffer, int lpvObject);
+public static final native int GetModuleFileNameW (int /*long*/ hModule, char [] lpFilename, int inSize);
+public static final native int GetModuleFileNameA (int /*long*/ hModule, byte [] lpFilename, int inSize);
+public static final native int /*long*/ GetModuleHandleW (char [] lpModuleName);
+public static final native int /*long*/ GetModuleHandleA (byte [] lpModuleName);
+public static final native boolean GetMonitorInfoW (int /*long*/ hmonitor, MONITORINFO lpmi);
+public static final native boolean GetMonitorInfoA (int /*long*/ hmonitor, MONITORINFO lpmi);
+public static final native int GetNearestPaletteIndex (int /*long*/ hPal, int crColor);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, BITMAP lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, BITMAP lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, EXTLOGPEN lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, EXTLOGPEN lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, LOGFONTA lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, LOGFONTW lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, LOGPEN lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, LOGPEN lpvObject);
+public static final native int GetObjectA (int /*long*/ hgdiobj, int cbBuffer, int /*long*/ lpvObject);
+public static final native int GetObjectW (int /*long*/ hgdiobj, int cbBuffer, int /*long*/ lpvObject);
 public static final native boolean GetOpenFileNameW (OPENFILENAME lpofn);
 public static final native boolean GetOpenFileNameA (OPENFILENAME lpofn);
-public static final native int GetPath(int hdc, int[] lpPoints, byte[] lpTypes, int nSize);
-public static final native int GetPaletteEntries (int hPalette, int iStartIndex, int nEntries, byte[] logPalette);
-public static final native int GetParent (int hWnd);
-public static final native int GetPixel (int hdc, int x, int y);
-public static final native int GetPolyFillMode(int hdc);
-public static final native int GetProcAddress (int hModule, byte [] lpProcName);
-public static final native int GetProcessHeap ();
-public static final native int GetProcessHeaps (int NumberOfHeaps, int [] ProcessHeaps);
+public static final native int GetPath (int /*long*/ hdc, int[] lpPoints, byte[] lpTypes, int nSize);
+public static final native int GetPaletteEntries (int /*long*/ hPalette, int iStartIndex, int nEntries, byte[] logPalette);
+public static final native int /*long*/ GetParent (int /*long*/ hWnd);
+public static final native int GetPixel (int /*long*/ hdc, int x, int y);
+public static final native int GetPolyFillMode (int /*long*/ hdc);
+public static final native int /*long*/ GetProcAddress (int /*long*/ hModule, byte [] lpProcName);
+public static final native int /*long*/ GetProcessHeap ();
+public static final native int GetProcessHeaps (int NumberOfHeaps, int /*long*/[] ProcessHeaps);
 public static final native int GetProfileStringW (char [] lpAppName, char [] lpKeyName, char [] lpDefault, char [] lpReturnedString, int nSize);
 public static final native int GetProfileStringA (byte [] lpAppName, byte [] lpKeyName, byte [] lpDefault, byte [] lpReturnedString, int nSize);
-public static final native int GetPropW (int hWnd, int lpString);
-public static final native int GetPropA (int hWnd, int lpString);
-public static final native int GetRandomRgn (int hdc, int hrgn, int iNum);
-public static final native int GetRegionData (int hRgn, int dwCount, int [] lpRgnData);
-public static final native int GetRgnBox (int hrgn, RECT lprc);
-public static final native int GetROP2 (int hdc);
+public static final native int /*long*/ GetPropW (int /*long*/ hWnd, int /*long*/ lpString);
+public static final native int /*long*/ GetPropA (int /*long*/ hWnd, int /*long*/ lpString);
+public static final native int GetRandomRgn (int /*long*/ hdc, int /*long*/ hrgn, int iNum);
+public static final native int GetRegionData (int /*long*/ hRgn, int dwCount, int [] lpRgnData);
+public static final native int GetRgnBox (int /*long*/ hrgn, RECT lprc);
+public static final native int GetROP2 (int /*long*/ hdc);
 public static final native boolean GetSaveFileNameW (OPENFILENAME lpofn);
 public static final native boolean GetSaveFileNameA (OPENFILENAME lpofn);
-public static final native boolean GetScrollInfo (int hwnd, int flags, SCROLLINFO info);
+public static final native boolean GetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info);
 public static final native void GetStartupInfoW (STARTUPINFO lpStartupInfo);
 public static final native void GetStartupInfoA (STARTUPINFO lpStartupInfo);
-public static final native int GetStockObject (int fnObject);
+public static final native int /*long*/ GetStockObject (int fnObject);
 public static final native int GetSysColor (int nIndex);
-public static final native int GetSysColorBrush (int nIndex);
+public static final native int /*long*/ GetSysColorBrush (int nIndex);
 public static final native short GetSystemDefaultUILanguage ();
-public static final native int GetSystemMenu (int hWnd, boolean bRevert);
+public static final native int /*long*/ GetSystemMenu (int /*long*/ hWnd, boolean bRevert);
 public static final native int GetSystemMetrics (int nIndex);
-public static final native int GetSystemPaletteEntries(int hdc, int iStartIndex, int nEntries, byte[] lppe);
-public static final native int GetTextColor (int hDC);
-public static final native boolean GetTextExtentPoint32W (int hdc, char [] lpString, int cbString, SIZE lpSize);
-public static final native boolean GetTextExtentPoint32A (int hdc, byte [] lpString, int cbString, SIZE lpSize);
-public static final native boolean GetTextMetricsW (int hdc, TEXTMETRICW lptm);
-public static final native boolean GetTextMetricsA (int hdc, TEXTMETRICA lptm);
-public static final native int GetThemeInt(int hTheme, int iPartId, int iStateId, int iPropId, int[] piVal);
-public static final native int GetThemeMargins(int hTheme, int hdc, int iPartId, int iStateId, int iPropId, RECT prc, MARGINS pMargins);
-public static final native int GetThemeBackgroundContentRect(int hTheme, int hdc, int iPartId, int iStateId, RECT pBoundingRect, RECT pContentRect);
-public static final native int GetThemeBackgroundExtent(int hTheme, int hdc, int iPartId, int iStateId, RECT pContentRect, RECT pExtentRect);
-public static final native int GetThemePartSize(int hTheme, int hdc, int iPartId, int iStateId, RECT prc, int eSize, SIZE psz);
-public static final native int GetThemeMetric(int hTheme, int hdc, int iPartId, int iStateId, int iPropId, int[] piVal);
-public static final native int GetThemeRect(int hTheme, int iPartId, int iStateId, int iPropId, RECT pRect);
-public static final native int GetThemeSysSize(int hTheme, int iSizeID);
-public static final native boolean GetUpdateRect (int hWnd, RECT lpRect, boolean bErase);
-public static final native int GetUpdateRgn (int hWnd, int hRgn, boolean bErase);
+public static final native int GetSystemPaletteEntries (int /*long*/ hdc, int iStartIndex, int nEntries, byte[] lppe);
+public static final native int GetTextColor (int /*long*/ hDC);
+public static final native boolean GetTextExtentPoint32W (int /*long*/ hdc, char [] lpString, int cbString, SIZE lpSize);
+public static final native boolean GetTextExtentPoint32A (int /*long*/ hdc, byte [] lpString, int cbString, SIZE lpSize);
+public static final native boolean GetTextMetricsW (int /*long*/ hdc, TEXTMETRICW lptm);
+public static final native boolean GetTextMetricsA (int /*long*/ hdc, TEXTMETRICA lptm);
+public static final native int GetThemeInt (int /*long*/ hTheme, int iPartId, int iStateId, int iPropId, int[] piVal);
+public static final native int GetThemeMargins (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, int iPropId, RECT prc, MARGINS pMargins);
+public static final native int GetThemeBackgroundContentRect (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT pBoundingRect, RECT pContentRect);
+public static final native int GetThemeBackgroundExtent (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT pContentRect, RECT pExtentRect);
+public static final native int GetThemePartSize (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, RECT prc, int eSize, SIZE psz);
+public static final native int GetThemeMetric (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, int iPropId, int[] piVal);
+public static final native int GetThemeRect (int /*long*/ hTheme, int iPartId, int iStateId, int iPropId, RECT pRect);
+public static final native int GetThemeSysSize (int /*long*/ hTheme, int iSizeID);
+public static final native boolean GetUpdateRect (int /*long*/ hWnd, RECT lpRect, boolean bErase);
+public static final native int GetUpdateRgn (int /*long*/ hWnd, int /*long*/ hRgn, boolean bErase);
 public static final native boolean GetVersionExW (OSVERSIONINFOW lpVersionInfo);
 public static final native boolean GetVersionExA (OSVERSIONINFOA lpVersionInfo);
-public static final native int GetWindow (int hWnd, int uCmd);
-public static final native int GetWindowLongW (int hWnd, int nIndex);
-public static final native int GetWindowLongA (int hWnd, int nIndex);
-public static final native int GetWindowDC (int hWnd);
-public static final native boolean GetWindowOrgEx(int hdc, POINT lpPoint);
-public static final native boolean GetWindowPlacement (int hWnd, WINDOWPLACEMENT lpwndpl);
-public static final native boolean GetWindowRect (int hWnd, RECT lpRect);
-public static final native int GetWindowRgn(int hWnd, int hRgn);
-public static final native int GetWindowTextW (int hWnd, char [] lpString, int nMaxCount);
-public static final native int GetWindowTextA (int hWnd, byte [] lpString, int nMaxCount);
-public static final native int GetWindowTextLengthW (int hWnd);
-public static final native int GetWindowTextLengthA (int hWnd);
-public static final native int GetWindowThreadProcessId (int hWnd, int [] lpdwProcessId);
-public static final native boolean GetWorldTransform(int hdc, float[] lpXform);
+public static final native int /*long*/ GetWindow (int /*long*/ hWnd, int uCmd);
+public static final native int GetWindowLongW (int /*long*/ hWnd, int nIndex);
+public static final native int GetWindowLongA (int /*long*/ hWnd, int nIndex);
+public static final native int /*long*/ GetWindowLongPtrW (int /*long*/ hWnd, int nIndex);
+public static final native int /*long*/ GetWindowLongPtrA (int /*long*/ hWnd, int nIndex);
+public static final native int /*long*/ GetWindowDC (int /*long*/ hWnd);
+public static final native boolean GetWindowOrgEx (int /*long*/ hdc, POINT lpPoint);
+public static final native boolean GetWindowPlacement (int /*long*/ hWnd, WINDOWPLACEMENT lpwndpl);
+public static final native boolean GetWindowRect (int /*long*/ hWnd, RECT lpRect);
+public static final native int GetWindowRgn (int /*long*/ hWnd, int /*long*/ hRgn);
+public static final native int GetWindowTextW (int /*long*/ hWnd, char [] lpString, int nMaxCount);
+public static final native int GetWindowTextA (int /*long*/ hWnd, byte [] lpString, int nMaxCount);
+public static final native int GetWindowTextLengthW (int /*long*/ hWnd);
+public static final native int GetWindowTextLengthA (int /*long*/ hWnd);
+public static final native int GetWindowThreadProcessId (int /*long*/ hWnd, int [] lpdwProcessId);
+public static final native boolean GetWorldTransform (int /*long*/ hdc, float[] lpXform);
 public static final native int GlobalAddAtomW (char [] lpString);
 public static final native int GlobalAddAtomA (byte [] lpString);
-public static final native int GlobalAlloc (int uFlags, int dwBytes);
-public static final native int GlobalFree (int hMem);
-public static final native int GlobalLock (int hMem);
-public static final native int GlobalSize (int hMem);
-public static final native boolean GlobalUnlock (int hMem);
-public static final native boolean GradientFill(int hdc, int pVertex, int dwNumVertex, int pMesh, int dwNumMesh, int dwMode);
-public static final native int HeapAlloc (int hHeap, int dwFlags, int dwBytes);
-public static final native boolean HeapFree (int hHeap, int dwFlags, int lpMem);
-public static final native boolean HeapValidate (int hHeap, int dwFlags, int lpMem);
-public static final native boolean HideCaret (int hWnd);
-public static final native int HitTestThemeBackground(int hTheme, int hdc, int iPartId, int iStateId, int dwOptions, RECT pRect, int hrgn, POINT ptTest, short[] pwHitTestCode);
-public static final native int IIDFromString(char[] lpsz, byte[] lpiid);
-public static final native int ImageList_Add (int himl, int hbmImage, int hbmMask);
-public static final native int ImageList_AddMasked (int himl, int hbmImage, int crMask);
-public static final native boolean ImageList_BeginDrag (int himl, int iTrack, int dxHotspot, int dyHotspot);
-public static final native int ImageList_Create (int cx, int cy, int flags, int cInitial, int cGrow);
-public static final native boolean ImageList_Destroy (int himl);
-public static final native boolean ImageList_DragEnter (int hwndLock, int x, int y);
-public static final native boolean ImageList_DragLeave (int hwndLock);
+public static final native int /*long*/ GlobalAlloc (int uFlags, int dwBytes);
+public static final native int /*long*/ GlobalFree (int /*long*/ hMem);
+public static final native int /*long*/ GlobalLock (int /*long*/ hMem);
+public static final native int GlobalSize (int /*long*/ hMem);
+public static final native boolean GlobalUnlock (int /*long*/ hMem);
+public static final native boolean GradientFill (int /*long*/ hdc, int /*long*/ pVertex, int dwNumVertex, int /*long*/ pMesh, int dwNumMesh, int dwMode);
+public static final native int /*long*/ HeapAlloc (int /*long*/ hHeap, int dwFlags, int dwBytes);
+public static final native boolean HeapFree (int /*long*/ hHeap, int dwFlags, int /*long*/ lpMem);
+public static final native boolean HeapValidate (int /*long*/ hHeap, int dwFlags, int /*long*/ lpMem);
+public static final native boolean HideCaret (int /*long*/ hWnd);
+public static final native int HitTestThemeBackground (int /*long*/ hTheme, int /*long*/ hdc, int iPartId, int iStateId, int dwOptions, RECT pRect, int /*long*/ hrgn, POINT ptTest, short[] pwHitTestCode);
+public static final native int IIDFromString (char[] lpsz, byte[] lpiid);
+public static final native int ImageList_Add (int /*long*/ himl, int /*long*/ hbmImage, int /*long*/ hbmMask);
+public static final native int ImageList_AddMasked (int /*long*/ himl, int /*long*/ hbmImage, int crMask);
+public static final native boolean ImageList_BeginDrag (int /*long*/ himl, int iTrack, int dxHotspot, int dyHotspot);
+public static final native int /*long*/ ImageList_Create (int cx, int cy, int flags, int cInitial, int cGrow);
+public static final native boolean ImageList_Destroy (int /*long*/ himl);
+public static final native boolean ImageList_DragEnter (int /*long*/ hwndLock, int x, int y);
+public static final native boolean ImageList_DragLeave (int /*long*/ hwndLock);
 public static final native boolean ImageList_DragMove (int x, int y);
 public static final native boolean ImageList_DragShowNolock (boolean fShow);
-public static final native boolean ImageList_Draw (int himl, int i, int hdcDst, int x, int y, int fStyle);
+public static final native boolean ImageList_Draw (int /*long*/ himl, int i, int /*long*/ hdcDst, int x, int y, int fStyle);
 public static final native void ImageList_EndDrag ();
-public static final native int ImageList_GetDragImage (POINT ppt, POINT pptHotspot);
-public static final native int ImageList_GetIcon (int himl, int i, int flags);
-public static final native boolean ImageList_GetIconSize (int himl, int [] cx, int [] cy);   
-public static final native int ImageList_GetImageCount (int himl);
-public static final native boolean ImageList_Remove (int himl, int i);
-public static final native boolean ImageList_Replace (int himl, int i, int hbmImage, int hbmMask);
-public static final native int ImageList_ReplaceIcon (int himl, int i, int hicon);
-public static final native boolean ImageList_SetIconSize (int himl, int cx, int cy);
-public static final native int ImmAssociateContext (int hWnd, int hIMC);
-public static final native int ImmCreateContext ();
-public static final native boolean ImmDestroyContext (int hIMC);
+public static final native int /*long*/ ImageList_GetDragImage (POINT ppt, POINT pptHotspot);
+public static final native int /*long*/ ImageList_GetIcon (int /*long*/ himl, int i, int flags);
+public static final native boolean ImageList_GetIconSize (int /*long*/ himl, int [] cx, int [] cy);   
+public static final native int ImageList_GetImageCount (int /*long*/ himl);
+public static final native boolean ImageList_Remove (int /*long*/ himl, int i);
+public static final native boolean ImageList_Replace (int /*long*/ himl, int i, int /*long*/ hbmImage, int /*long*/ hbmMask);
+public static final native int ImageList_ReplaceIcon (int /*long*/ himl, int i, int /*long*/ hicon);
+public static final native boolean ImageList_SetIconSize (int /*long*/ himl, int cx, int cy);
+public static final native int /*long*/ ImmAssociateContext (int /*long*/ hWnd, int /*long*/ hIMC);
+public static final native int /*long*/ ImmCreateContext ();
+public static final native boolean ImmDestroyContext (int /*long*/ hIMC);
 public static final native boolean ImmDisableTextFrameService (int idThread);
-public static final native boolean ImmGetCompositionFontW (int hIMC, LOGFONTW lplf);
-public static final native boolean ImmGetCompositionFontA (int hIMC, LOGFONTA lplf);
-public static final native int ImmGetCompositionStringW (int hIMC, int dwIndex, char [] lpBuf, int dwBufLen);
-public static final native int ImmGetCompositionStringA (int hIMC, int dwIndex, byte [] lpBuf, int dwBufLen);
-public static final native int ImmGetContext (int hWnd);
-public static final native boolean ImmGetConversionStatus (int hIMC, int [] lpfdwConversion, int [] lpfdwSentence);
-public static final native int ImmGetDefaultIMEWnd (int hWnd);
-public static final native boolean ImmGetOpenStatus (int hIMC);
-public static final native boolean ImmReleaseContext (int hWnd, int hIMC);
-public static final native boolean ImmSetCompositionFontW (int hIMC, LOGFONTW lplf);
-public static final native boolean ImmSetCompositionFontA (int hIMC, LOGFONTA lplf);
-public static final native boolean ImmSetCompositionWindow (int hIMC, COMPOSITIONFORM lpCompForm);
-public static final native boolean ImmSetConversionStatus (int hIMC, int fdwConversion, int dwSentence);
-public static final native boolean ImmSetOpenStatus (int hIMC, boolean fOpen);
+public static final native boolean ImmGetCompositionFontW (int /*long*/ hIMC, LOGFONTW lplf);
+public static final native boolean ImmGetCompositionFontA (int /*long*/ hIMC, LOGFONTA lplf);
+public static final native int ImmGetCompositionStringW (int /*long*/ hIMC, int dwIndex, char [] lpBuf, int dwBufLen);
+public static final native int ImmGetCompositionStringA (int /*long*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen);
+public static final native int /*long*/ ImmGetContext (int /*long*/ hWnd);
+public static final native boolean ImmGetConversionStatus (int /*long*/ hIMC, int [] lpfdwConversion, int [] lpfdwSentence);
+public static final native int /*long*/ ImmGetDefaultIMEWnd (int /*long*/ hWnd);
+public static final native boolean ImmGetOpenStatus (int /*long*/ hIMC);
+public static final native boolean ImmReleaseContext (int /*long*/ hWnd, int /*long*/ hIMC);
+public static final native boolean ImmSetCompositionFontW (int /*long*/ hIMC, LOGFONTW lplf);
+public static final native boolean ImmSetCompositionFontA (int /*long*/ hIMC, LOGFONTA lplf);
+public static final native boolean ImmSetCompositionWindow (int /*long*/ hIMC, COMPOSITIONFORM lpCompForm);
+public static final native boolean ImmSetConversionStatus (int /*long*/ hIMC, int fdwConversion, int dwSentence);
+public static final native boolean ImmSetOpenStatus (int /*long*/ hIMC, boolean fOpen);
 public static final native void InitCommonControls ();
 public static final native boolean InitCommonControlsEx (INITCOMMONCONTROLSEX lpInitCtrls);
-public static final native boolean InsertMenuW (int hMenu, int uPosition, int uFlags, int uIDNewItem, char [] lpNewItem);
-public static final native boolean InsertMenuA (int hMenu, int uPosition, int uFlags, int uIDNewItem, byte [] lpNewItem);
-public static final native boolean InsertMenuItemW (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native boolean InsertMenuItemA (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native boolean InternetSetOption (int hInternet, int dwOption, int lpBuffer, int dwBufferLength);
-public static final native int IntersectClipRect (int hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+public static final native boolean InsertMenuW (int /*long*/ hMenu, int uPosition, int uFlags, int /*long*/ uIDNewItem, char [] lpNewItem);
+public static final native boolean InsertMenuA (int /*long*/ hMenu, int uPosition, int uFlags, int /*long*/ uIDNewItem, byte [] lpNewItem);
+public static final native boolean InsertMenuItemW (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean InsertMenuItemA (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean InternetSetOption (int /*long*/ hInternet, int dwOption, int /*long*/ lpBuffer, int dwBufferLength);
+public static final native int IntersectClipRect (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 public static final native boolean IntersectRect (RECT lprcDst, RECT lprcSrc1, RECT lprcSrc2);
-public static final native boolean InvalidateRect(int hWnd, RECT lpRect, boolean bErase);
-public static final native boolean InvalidateRgn (int hWnd, int hRgn, boolean bErase);
-public static final native boolean IsAppThemed();
-public static final native boolean IsBadReadPtr (int lp, int ucb);
-public static final native boolean IsBadWritePtr (int lp, int ucb);
+public static final native boolean InvalidateRect (int /*long*/ hWnd, RECT lpRect, boolean bErase);
+public static final native boolean InvalidateRgn (int /*long*/ hWnd, int /*long*/ hRgn, boolean bErase);
+public static final native boolean IsAppThemed ();
+public static final native boolean IsBadReadPtr (int /*long*/ lp, int ucb);
+public static final native boolean IsBadWritePtr (int /*long*/ lp, int ucb);
 public static final native boolean IsDBCSLeadByte (byte TestChar);
-public static final native boolean IsHungAppWindow  (int hWnd);
-public static final native boolean IsIconic (int hWnd);
-public static final native boolean IsPPC();
-public static final native boolean IsSP();
-public static final native boolean IsWindowEnabled (int hWnd);
-public static final native boolean IsWindowVisible (int hWnd);
-public static final native boolean IsZoomed (int hWnd);
-public static final native boolean KillTimer (int hWnd, int uIDEvent);
-public static final native boolean LineTo (int hdc,int x1, int x2);
-public static final native int LoadBitmapW (int hInstance, int lpBitmapName);
-public static final native int LoadBitmapA (int hInstance, int lpBitmapName);
-public static final native int LoadCursorW (int hInstance, int lpCursorName);
-public static final native int LoadCursorA (int hInstance, int lpCursorName);
-public static final native int LoadIconW (int hInstance, int lpIconName);
-public static final native int LoadIconA (int hInstance, int lpIconName);
-public static final native int LoadImageW (int hinst, char [] lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
-public static final native int LoadImageA (int hinst, byte [] lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
-public static final native int LoadImageW (int hinst, int lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
-public static final native int LoadImageA (int hinst, int lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
-public static final native int LoadStringW (int hinst, int uID, char [] lpBuffer, int nBufferMax);
-public static final native int LoadStringA (int hinst, int uID, byte [] lpBuffer, int nBufferMax);
-public static final native int LoadLibraryW (char [] lpLibFileName);
-public static final native int LoadLibraryA (byte [] lpLibFileName);
-public static final native int LocalFree(int hMem);
-public static final native boolean LockWindowUpdate (int hWndLock);
+public static final native boolean IsHungAppWindow (int /*long*/ hWnd);
+public static final native boolean IsIconic (int /*long*/ hWnd);
+public static final native boolean IsPPC ();
+public static final native boolean IsSP ();
+public static final native boolean IsWindowEnabled (int /*long*/ hWnd);
+public static final native boolean IsWindowVisible (int /*long*/ hWnd);
+public static final native boolean IsZoomed (int /*long*/ hWnd);
+public static final native boolean KillTimer (int /*long*/ hWnd, int /*long*/ uIDEvent);
+public static final native boolean LineTo (int /*long*/ hdc, int x1, int x2);
+public static final native int /*long*/ LoadBitmapW (int /*long*/ hInstance, int /*long*/ lpBitmapName);
+public static final native int /*long*/ LoadBitmapA (int /*long*/ hInstance, int /*long*/ lpBitmapName);
+public static final native int /*long*/ LoadCursorW (int /*long*/ hInstance, int /*long*/ lpCursorName);
+public static final native int /*long*/ LoadCursorA (int /*long*/ hInstance, int /*long*/ lpCursorName);
+public static final native int /*long*/ LoadIconW (int /*long*/ hInstance, int /*long*/ lpIconName);
+public static final native int /*long*/ LoadIconA (int /*long*/ hInstance, int /*long*/ lpIconName);
+public static final native int /*long*/ LoadImageW (int /*long*/ hinst, char [] lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
+public static final native int /*long*/ LoadImageA (int /*long*/ hinst, byte [] lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
+public static final native int /*long*/ LoadImageW (int /*long*/ hinst, int /*long*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
+public static final native int /*long*/ LoadImageA (int /*long*/ hinst, int /*long*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
+public static final native int LoadStringW (int /*long*/ hinst, int uID, char [] lpBuffer, int nBufferMax);
+public static final native int LoadStringA (int /*long*/ hinst, int uID, byte [] lpBuffer, int nBufferMax);
+public static final native int /*long*/ LoadLibraryW (char [] lpLibFileName);
+public static final native int /*long*/ LoadLibraryA (byte [] lpLibFileName);
+public static final native int /*long*/ LocalFree (int /*long*/ hMem);
+public static final native boolean LockWindowUpdate (int /*long*/ hWndLock);
 public static final native int MapVirtualKeyW (int uCode, int uMapType);
 public static final native int MapVirtualKeyA (int uCode, int uMapType);
-public static final native int MapWindowPoints (int hWndFrom, int hWndTo, POINT lpPoints, int cPoints);
-public static final native int MapWindowPoints (int hWndFrom, int hWndTo, RECT lpPoints, int cPoints);
+public static final native int MapWindowPoints (int /*long*/ hWndFrom, int /*long*/ hWndTo, POINT lpPoints, int cPoints);
+public static final native int MapWindowPoints (int /*long*/ hWndFrom, int /*long*/ hWndTo, RECT lpPoints, int cPoints);
 public static final native boolean MCIWndRegisterClass ();
 public static final native boolean MessageBeep (int uType);
-public static final native int MessageBoxW (int hWnd, char [] lpText, char [] lpCaption, int uType);
-public static final native int MessageBoxA (int hWnd, byte [] lpText, byte [] lpCaption, int uType);
-public static final native int MonitorFromWindow (int hwnd, int dwFlags);
-public static final native void MoveMemory (char[] Destination, int SourcePtr, int Length);
-public static final native void MoveMemory (byte [] Destination, int Source, int Length);
+public static final native int MessageBoxW (int /*long*/ hWnd, char [] lpText, char [] lpCaption, int uType);
+public static final native int MessageBoxA (int /*long*/ hWnd, byte [] lpText, byte [] lpCaption, int uType);
+public static final native int /*long*/ MonitorFromWindow (int /*long*/ hwnd, int dwFlags);
+public static final native void MoveMemory (char[] Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (byte [] Destination, int /*long*/ Source, int Length);
 public static final native void MoveMemory (byte [] Destination, ACCEL Source, int Length);
 public static final native void MoveMemory (byte [] Destination, BITMAPINFOHEADER Source, int Length);
-public static final native void MoveMemory (int [] Destination, int Source, int Length);
-public static final native void MoveMemory (int Destination, byte [] Source, int Length);
-public static final native void MoveMemory (int Destination, char [] Source, int Length);
-public static final native void MoveMemory (int Destination, int [] Source, int Length);
-public static final native void MoveMemory (int Destination, GRADIENT_RECT Source, int Length);
-public static final native void MoveMemory (int Destination, LOGFONTW Source, int Length);
-public static final native void MoveMemory (int Destination, LOGFONTA Source, int Length);
-public static final native void MoveMemory (int Destination, MEASUREITEMSTRUCT Source, int Length);
-public static final native void MoveMemory (int Destination, MINMAXINFO Source, int Length);
-public static final native void MoveMemory (int Destination, MSG Source, int Length);
-public static final native void MoveMemory (int Destination, UDACCEL Source, int Length);
-public static final native void MoveMemory (int Destination, NMTTDISPINFOW Source, int Length);
-public static final native void MoveMemory (int Destination, NMTTDISPINFOA Source, int Length);
-public static final native void MoveMemory (int Destination, OPENFILENAME Source, int Length);
-public static final native void MoveMemory (int Destination, RECT Source, int Length);
-public static final native void MoveMemory (int Destination, TRIVERTEX Source, int Length);
-public static final native void MoveMemory (int Destination, WINDOWPOS Source, int Length);
+public static final native void MoveMemory (int [] Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (long [] Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (double[] Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (float[] Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (short[] Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, byte [] Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, char [] Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, int [] Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, GRADIENT_RECT Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, LOGFONTW Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, LOGFONTA Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, MEASUREITEMSTRUCT Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, MINMAXINFO Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, MSG Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, UDACCEL Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMTTDISPINFOW Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMTTDISPINFOA Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, OPENFILENAME Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, RECT Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, TRIVERTEX Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, WINDOWPOS Source, int Length);
 public static final native void MoveMemory (BITMAPINFOHEADER Destination, byte [] Source, int Length);
-public static final native void MoveMemory (DRAWITEMSTRUCT Destination, int Source, int Length);
-public static final native void MoveMemory (EXTLOGPEN Destination, int Source, int Length);
-public static final native void MoveMemory (HDITEM Destination, int Source, int Length);
-public static final native void MoveMemory (HELPINFO Destination, int Source, int Length);
-public static final native void MoveMemory (LOGFONTW Destination, int Source, int Length);
-public static final native void MoveMemory (LOGFONTA Destination, int Source, int Length);
-public static final native void MoveMemory (MEASUREITEMSTRUCT Destination, int Source, int Length);
-public static final native void MoveMemory (MINMAXINFO Destination, int Source, int Length);
-public static final native void MoveMemory (OFNOTIFY Destination, int Source, int Length);
-public static final native void MoveMemory (OPENFILENAME Destination, int Source, int Length);
-public static final native void MoveMemory (POINT Destination, int Source, int Length);
-public static final native void MoveMemory (NMHDR Destination, int Source, int Length);
-public static final native void MoveMemory (NMRGINFO Destination, int Source, int Length);
-public static final native void MoveMemory (NMCUSTOMDRAW Destination, int Source, int Length);
-public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, int Source, int Length);
-public static final native void MoveMemory (NMTBHOTITEM Destination, int Source, int Length);
-public static final native void MoveMemory (NMTVCUSTOMDRAW Destination, int Source, int Length);
-public static final native void MoveMemory (NMTVITEMCHANGE Destination, int Source, int Length);
-public static final native void MoveMemory (NMUPDOWN Destination, int Source, int Length);
-public static final native void MoveMemory (int Destination, NMLVCUSTOMDRAW Source, int Length);
-public static final native void MoveMemory (int Destination, NMTVCUSTOMDRAW Source, int Length);
-public static final native void MoveMemory (int Destination, NMLVDISPINFO Source, int Length);
-public static final native void MoveMemory (int Destination, NMTVDISPINFO Source, int Length);
-public static final native void MoveMemory (NMLVDISPINFO Destination, int Source, int Length);
-public static final native void MoveMemory (NMTVDISPINFO Destination, int Source, int Length);
-public static final native void MoveMemory (NMLVFINDITEM Destination, int Source, int Length);
-public static final native void MoveMemory (NMHEADER Destination, int Source, int Length);
-public static final native void MoveMemory (NMLINK Destination, int Source, int Length);
-public static final native void MoveMemory (NMLISTVIEW Destination, int Source, int Length);
-public static final native void MoveMemory (NMREBARCHILDSIZE Destination, int Source, int Length);
-public static final native void MoveMemory (NMREBARCHEVRON Destination, int Source, int Length);
-public static final native void MoveMemory (NMTOOLBAR Destination, int Source, int Length);
-public static final native void MoveMemory (NMTTDISPINFOW Destination, int Source, int Length);
-public static final native void MoveMemory (NMTTDISPINFOA Destination, int Source, int Length);
-public static final native void MoveMemory (TEXTMETRICW Destination, int Source, int Length);
-public static final native void MoveMemory (TEXTMETRICA Destination, int Source, int Length);
-public static final native void MoveMemory (TVITEM Destination, int Source, int Length);
-public static final native void MoveMemory (WINDOWPOS Destination, int Source, int Length);
-public static final native void MoveMemory (MSG Destination, int Source, int Length);
-public static final native void MoveMemory (UDACCEL Destination, int Source, int Length);
-public static final native void MoveMemory(int Destination, DROPFILES Source, int Length);
-public static final native void MoveMemory(double[] Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(float[] Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(long[] Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(short[] Destination, int SourcePtr, int Length);
-public static final native void MoveMemory(int DestinationPtr, double[] Source, int Length);
-public static final native void MoveMemory(int DestinationPtr, float[] Source, int Length);
-public static final native void MoveMemory(int DestinationPtr, long[] Source, int Length);
-public static final native void MoveMemory(int DestinationPtr, short[] Source, int Length);
-public static final native void MoveMemory (SCRIPT_ITEM Destination, int SourcePtr, int Length);
-public static final native void MoveMemory (SCRIPT_LOGATTR Destination, int SourcePtr, int Length);
-public static final native void MoveMemory (SCRIPT_PROPERTIES Destination, int SourcePtr, int Length);
-public static final native void MoveMemory (int Destination, KEYBDINPUT Source, int Length);
-public static final native void MoveMemory (int Destination, MOUSEINPUT Source, int Length);
-public static final native boolean MoveToEx (int hdc,int x1, int x2, int lPoint);
-public static final native int MsgWaitForMultipleObjectsEx (int nCount, int pHandles, int dwMilliseconds, int dwWakeMask, int dwFlags);
+public static final native void MoveMemory (DRAWITEMSTRUCT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (EXTLOGPEN Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (HDITEM Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (HELPINFO Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (LOGFONTW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (LOGFONTA Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (MEASUREITEMSTRUCT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (MINMAXINFO Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (OFNOTIFY Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (OPENFILENAME Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (POINT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMHDR Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMRGINFO Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMCUSTOMDRAW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTBHOTITEM Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTVCUSTOMDRAW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTVITEMCHANGE Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMUPDOWN Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMLVCUSTOMDRAW Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMTVCUSTOMDRAW Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMLVDISPINFO Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, NMTVDISPINFO Source, int Length);
+public static final native void MoveMemory (NMLVDISPINFO Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTVDISPINFO Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMLVFINDITEM Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMHEADER Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMLINK Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMLISTVIEW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMREBARCHILDSIZE Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMREBARCHEVRON Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTOOLBAR Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTTDISPINFOW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (NMTTDISPINFOA Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (RECT Destination, int /*long*/[] Source, int Length);
+public static final native void MoveMemory (TEXTMETRICW Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (TEXTMETRICA Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (TVITEM Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (WINDOWPOS Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (MSG Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (UDACCEL Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, DROPFILES Source, int Length);
+public static final native void MoveMemory (int /*long*/ DestinationPtr, double[] Source, int Length);
+public static final native void MoveMemory (int /*long*/ DestinationPtr, float[] Source, int Length);
+public static final native void MoveMemory (int /*long*/ DestinationPtr, long[] Source, int Length);
+public static final native void MoveMemory (int /*long*/ DestinationPtr, short[] Source, int Length);
+public static final native void MoveMemory (SCRIPT_ITEM Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (SCRIPT_LOGATTR Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (SCRIPT_PROPERTIES Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, KEYBDINPUT Source, int Length);
+public static final native void MoveMemory (int /*long*/ Destination, MOUSEINPUT Source, int Length);
+public static final native boolean MoveToEx (int /*long*/ hdc, int x1, int x2, int /*long*/ lPoint);
+public static final native int MsgWaitForMultipleObjectsEx (int nCount, int /*long*/ pHandles, int dwMilliseconds, int dwWakeMask, int dwFlags);
 public static final native int MultiByteToWideChar (int CodePage, int dwFlags, byte [] lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar);
-public static final native int MultiByteToWideChar (int CodePage, int dwFlags, int lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar);
-public static final native void NotifyWinEvent (int event, int hwnd, int idObject, int idChild);
-public static final native boolean OffsetRect(RECT lprc, int dx, int dy);
-public static final native int OffsetRgn (int hrgn, int nXOffset, int nYOffset);
-public static final native int OleInitialize (int pvReserved);
+public static final native int MultiByteToWideChar (int CodePage, int dwFlags, int /*long*/ lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar);
+public static final native void NotifyWinEvent (int event, int /*long*/ hwnd, int idObject, int idChild);
+public static final native boolean OffsetRect (RECT lprc, int dx, int dy);
+public static final native int OffsetRgn (int /*long*/ hrgn, int nXOffset, int nYOffset);
+public static final native int OleInitialize (int /*long*/ pvReserved);
 public static final native void OleUninitialize ();
-public static final native boolean OpenClipboard (int hWndNewOwner);
-public static final native int OpenThemeData (int hwnd, char[] pszClassList);
-public static final native boolean PatBlt (int hdc,int x1, int x2,int w, int h, int rop);
-public static final native boolean PeekMessageW (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
-public static final native boolean PeekMessageA (MSG lpMsg, int hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
-public static final native boolean Pie (int hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
-public static final native boolean Polygon (int hdc, int [] points, int nPoints);
-public static final native boolean Polyline (int hdc,int[] points, int nPoints);
-public static final native boolean PostMessageW (int hWnd, int Msg, int wParam, int lParam);
-public static final native boolean PostMessageA (int hWnd, int Msg, int wParam, int lParam);
-public static final native boolean PostThreadMessageW (int idThread, int Msg, int wParam, int lParam);
-public static final native boolean PostThreadMessageA (int idThread, int Msg, int wParam, int lParam);
+public static final native boolean OpenClipboard (int /*long*/ hWndNewOwner);
+public static final native int /*long*/ OpenThemeData (int /*long*/ hwnd, char[] pszClassList);
+public static final native boolean PatBlt (int /*long*/ hdc, int x1, int x2, int w, int h, int rop);
+public static final native boolean PeekMessageW (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
+public static final native boolean PeekMessageA (MSG lpMsg, int /*long*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
+public static final native boolean Pie (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
+public static final native boolean Polygon (int /*long*/ hdc, int [] points, int nPoints);
+public static final native boolean Polyline (int /*long*/ hdc, int[] points, int nPoints);
+public static final native boolean PostMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native boolean PostMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native boolean PostThreadMessageW (int idThread, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native boolean PostThreadMessageA (int idThread, int Msg, int /*long*/ wParam, int /*long*/ lParam);
 public static final native short PRIMARYLANGID (short lgid);
 public static final native boolean PrintDlgW (PRINTDLG lppd);
 public static final native boolean PrintDlgA (PRINTDLG lppd);
 public static final native boolean PtInRect (RECT rect, POINT pt);
-public static final native boolean PtInRegion (int hrgn, int X, int Y);
-public static final native int RealizePalette(int hDC);
-public static final native boolean Rectangle (int hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
-public static final native boolean RectInRegion (int hrgn, RECT lprc);
-public static final native boolean RedrawWindow (int hWnd, RECT lprcUpdate, int hrgnUpdate, int flags);
-public static final native int RegCloseKey (int hKey);
+public static final native boolean PtInRegion (int /*long*/ hrgn, int X, int Y);
+public static final native int RealizePalette (int /*long*/ hDC);
+public static final native boolean Rectangle (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+public static final native boolean RectInRegion (int /*long*/ hrgn, RECT lprc);
+public static final native boolean RedrawWindow (int /*long*/ hWnd, RECT lprcUpdate, int /*long*/ hrgnUpdate, int flags);
+public static final native int RegCloseKey (int /*long*/ hKey);
+public static final native int RegEnumKeyExW (int /*long*/ hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
+public static final native int RegEnumKeyExA (int /*long*/ hKey, int dwIndex, byte [] lpName, int [] lpcName, int [] lpReserved, byte [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
 public static final native int RegisterClassW (WNDCLASS lpWndClass);
 public static final native int RegisterClassA (WNDCLASS lpWndClass);
 public static final native int RegisterWindowMessageW (char [] lpString);
 public static final native int RegisterWindowMessageA (byte [] lpString);
-public static final native int RegEnumKeyExW (int hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
 public static final native int RegisterClipboardFormatA (byte[] lpszFormat); 
 public static final native int RegisterClipboardFormatW (char[] lpszFormat); 
-public static final native int RegOpenKeyExW (int hKey, char[] lpSubKey, int ulOptions, int samDesired, int[] phkResult);
-public static final native int RegQueryInfoKeyW (int hKey, int lpClass, int[] lpcbClass, int lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int lpftLastWriteTime);
-public static final native int RegQueryValueExW (int hKey, char[] lpValueName, int lpReserved, int[] lpType, char [] lpData, int[] lpcbData);
-public static final native int RegQueryValueExW (int hKey, char[] lpValueName, int lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
-public static final native int RegEnumKeyExA (int hKey, int dwIndex, byte [] lpName, int [] lpcName, int [] lpReserved, byte [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
-public static final native int RegOpenKeyExA (int hKey, byte[] lpSubKey, int ulOptions, int samDesired, int[] phkResult);
-public static final native int RegQueryInfoKeyA (int hKey, int lpClass, int[] lpcbClass, int lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int lpftLastWriteTime);
-public static final native int RegQueryValueExA (int hKey, byte[] lpValueName, int lpReserved, int[] lpType, byte [] lpData, int[] lpcbData);
-public static final native int RegQueryValueExA (int hKey, byte[] lpValueName, int lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
+public static final native int RegOpenKeyExW (int /*long*/ hKey, char[] lpSubKey, int ulOptions, int samDesired, int /*long*/[] phkResult);
+public static final native int RegOpenKeyExA (int /*long*/ hKey, byte[] lpSubKey, int ulOptions, int samDesired, int /*long*/[] phkResult);
+public static final native int RegQueryInfoKeyW (int /*long*/ hKey, int /*long*/ lpClass, int[] lpcbClass, int /*long*/ lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int /*long*/ lpftLastWriteTime);
+public static final native int RegQueryInfoKeyA (int /*long*/ hKey, int /*long*/ lpClass, int[] lpcbClass, int /*long*/ lpReserved, int[] lpSubKeys, int[] lpcbMaxSubKeyLen, int[] lpcbMaxClassLen, int[] lpcValues, int[] lpcbMaxValueNameLen, int[] lpcbMaxValueLen, int[] lpcbSecurityDescriptor, int /*long*/ lpftLastWriteTime);
+public static final native int RegQueryValueExW (int /*long*/ hKey, char[] lpValueName, int /*long*/ lpReserved, int[] lpType, char [] lpData, int[] lpcbData);
+public static final native int RegQueryValueExW (int /*long*/ hKey, char[] lpValueName, int /*long*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
+public static final native int RegQueryValueExA (int /*long*/ hKey, byte[] lpValueName, int /*long*/ lpReserved, int[] lpType, byte [] lpData, int[] lpcbData);
+public static final native int RegQueryValueExA (int /*long*/ hKey, byte[] lpValueName, int /*long*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
 public static final native boolean ReleaseCapture ();
-public static final native int ReleaseDC (int hWnd, int hDC);
-public static final native boolean RemoveMenu (int hMenu, int uPosition, int uFlags);
-public static final native int RemovePropA (int hWnd, int lpString);
-public static final native int RemovePropW (int hWnd, int lpString);
-public static final native boolean RestoreDC(int hdc, int nSavedDC);
-public static final native boolean RoundRect (int hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidth, int nHeight);
-public static final native int SaveDC(int hdc);
-public static final native boolean ScreenToClient (int hWnd, POINT lpPoint);
-public static final native int ScriptApplyDigitSubstitution(SCRIPT_DIGITSUBSTITUTE psds, SCRIPT_CONTROL psc, SCRIPT_STATE pss);
-public static final native int ScriptBreak(char[] pwcChars, int cChars, SCRIPT_ANALYSIS psa, int psla);
-public static final native int ScriptGetProperties(int[] ppSp, int[] piNumScripts);
-public static final native int ScriptCacheGetHeight(int hdc, int psc, int[] tmHeight);
-public static final native int ScriptCPtoX(int iCP, boolean fTrailing, int cChars, int cGlyphs, int pwLogClust, int psva, int piAdvance, SCRIPT_ANALYSIS psa, int[] piX);
-public static final native int ScriptFreeCache(int psc);
-public static final native int ScriptGetFontProperties(int hdc, int psc, SCRIPT_FONTPROPERTIES sfp);
-public static final native int ScriptGetLogicalWidths (SCRIPT_ANALYSIS psa, int cChars, int cGlyphs, int piGlyphWidth, int pwLogClust, int psva, int[] piDx);
-public static final native int ScriptItemize(char[] pwcInChars, int cInChars, int cMaxItems, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, int pItems, int[] pcItems);
-public static final native int ScriptJustify(int psva, int piAdvance, int cGlyphs, int iDx, int iMinKashida, int piJustify);
-public static final native int ScriptLayout(int cRuns, byte[] pbLevel, int[] piVisualToLogical, int[] piLogicalToVisual);
-public static final native int ScriptPlace(int hdc, int psc, int pwGlyphs, int cGlyphs, int psva, SCRIPT_ANALYSIS psa, int piAdvance, int pGoffset, int[] pABC);
-public static final native int ScriptRecordDigitSubstitution(int Locale, SCRIPT_DIGITSUBSTITUTE psds);
-public static final native int ScriptShape(int hdc, int psc, char[] pwcChars, int cChars, int cMaxGlyphs, SCRIPT_ANALYSIS psa, int pwOutGlyphs, int pwLogClust, int psva, int[] pcGlyphs);
-public static final native int ScriptTextOut(int hdc, int psc, int x, int y, int fuOptions, RECT lprc, SCRIPT_ANALYSIS psa, int pwcReserved, int iReserved, int pwGlyphs, int cGlyphs, int piAdvance, int piJustify, int pGoffset);
-public static final native int ScriptXtoCP(int iX, int cChars, int cGlyphs, int pwLogClust, int psva, int piAdvance, SCRIPT_ANALYSIS psa, int[] piCP, int[] piTrailing);
-public static final native int ScrollWindowEx (int hWnd, int dx, int dy, RECT prcScroll, RECT prcClip, int hrgnUpdate, RECT prcUpdate, int flags);
-public static final native int SelectClipRgn (int hdc, int hrgn);
-public static final native int SelectObject(int hDC, int HGDIObj);
-public static final native int SelectPalette(int hDC, int hpal, boolean bForceBackground);
-public static final native int SendInput (int nInputs, int pInputs, int cbSize);
-public static final native int SendMessageW (int hWnd, int Msg, int [] wParam, int [] lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int [] wParam, int lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, char [] lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, int [] lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, short [] lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, int lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, LVCOLUMN lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, LVHITTESTINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, LITEM lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, LVITEM lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, MARGINS lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, POINT lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, REBARBANDINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, RECT lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, SYSTEMTIME lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TBBUTTON lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TBBUTTONINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TCITEM lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TOOLINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TVHITTESTINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TVINSERTSTRUCT lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, TVITEM lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, UDACCEL lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, HDHITTESTINFO lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, HDITEM lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, HDLAYOUT lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, BUTTON_IMAGELIST lParam);
-public static final native int SendMessageW (int hWnd, int Msg, int wParam, SIZE lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int [] wParam, int [] lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int [] wParam, int lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, byte [] lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, int [] lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, short [] lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, int lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, LVCOLUMN lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, LVHITTESTINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, LITEM lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, LVITEM lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, MARGINS lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, POINT lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, REBARBANDINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, RECT lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, SYSTEMTIME lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TBBUTTON lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TBBUTTONINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TCITEM lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TOOLINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TVHITTESTINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TVINSERTSTRUCT lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, TVITEM lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, UDACCEL lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, HDHITTESTINFO lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, HDITEM lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, HDLAYOUT lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, BUTTON_IMAGELIST lParam);
-public static final native int SendMessageA (int hWnd, int Msg, int wParam, SIZE lParam);
-public static final native int SetActiveWindow (int hWnd);
-public static final native int SetBkColor (int hdc, int colorRef);
-public static final native int SetBkMode (int hdc, int mode);
-public static final native boolean SetBrushOrgEx (int hdc, int nXOrg, int nYOrg, POINT lppt);
-public static final native int SetCapture (int hWnd);
+public static final native int ReleaseDC (int /*long*/ hWnd, int /*long*/ hDC);
+public static final native boolean RemoveMenu (int /*long*/ hMenu, int uPosition, int uFlags);
+public static final native int /*long*/ RemovePropA (int /*long*/ hWnd, int /*long*/ lpString);
+public static final native int /*long*/ RemovePropW (int /*long*/ hWnd, int /*long*/ lpString);
+public static final native boolean RestoreDC (int /*long*/ hdc, int nSavedDC);
+public static final native boolean RoundRect (int /*long*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidth, int nHeight);
+public static final native int SaveDC (int /*long*/ hdc);
+public static final native boolean ScreenToClient (int /*long*/ hWnd, POINT lpPoint);
+public static final native int ScriptApplyDigitSubstitution (SCRIPT_DIGITSUBSTITUTE psds, SCRIPT_CONTROL psc, SCRIPT_STATE pss);
+public static final native int ScriptBreak (char[] pwcChars, int cChars, SCRIPT_ANALYSIS psa, int /*long*/ psla);
+public static final native int ScriptGetProperties (int /*long*/[] ppSp, int[] piNumScripts);
+public static final native int ScriptCacheGetHeight (int /*long*/ hdc, int /*long*/ psc, int[] tmHeight);
+public static final native int ScriptCPtoX (int iCP, boolean fTrailing, int cChars, int cGlyphs, int /*long*/ pwLogClust, int /*long*/ psva, int /*long*/ piAdvance, SCRIPT_ANALYSIS psa, int[] piX);
+public static final native int ScriptFreeCache (int /*long*/ psc);
+public static final native int ScriptGetFontProperties (int /*long*/ hdc, int /*long*/ psc, SCRIPT_FONTPROPERTIES sfp);
+public static final native int ScriptGetLogicalWidths (SCRIPT_ANALYSIS psa, int cChars, int cGlyphs, int /*long*/ piGlyphWidth, int /*long*/ pwLogClust, int /*long*/ psva, int[] piDx);
+public static final native int ScriptItemize (char[] pwcInChars, int cInChars, int cMaxItems, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, int /*long*/ pItems, int[] pcItems);
+public static final native int ScriptJustify (int /*long*/ psva, int /*long*/ piAdvance, int cGlyphs, int iDx, int iMinKashida, int /*long*/ piJustify);
+public static final native int ScriptLayout (int cRuns, byte[] pbLevel, int[] piVisualToLogical, int[] piLogicalToVisual);
+public static final native int ScriptPlace (int /*long*/ hdc, int /*long*/ psc, int /*long*/ pwGlyphs, int cGlyphs, int /*long*/ psva, SCRIPT_ANALYSIS psa, int /*long*/ piAdvance, int /*long*/ pGoffset, int[] pABC);
+public static final native int ScriptRecordDigitSubstitution (int Locale, SCRIPT_DIGITSUBSTITUTE psds);
+public static final native int ScriptShape (int /*long*/ hdc, int /*long*/ psc, char[] pwcChars, int cChars, int cMaxGlyphs, SCRIPT_ANALYSIS psa, int /*long*/ pwOutGlyphs, int /*long*/ pwLogClust, int /*long*/ psva, int[] pcGlyphs);
+public static final native int ScriptTextOut (int /*long*/ hdc, int /*long*/ psc, int x, int y, int fuOptions, RECT lprc, SCRIPT_ANALYSIS psa, int /*long*/ pwcReserved, int iReserved, int /*long*/ pwGlyphs, int cGlyphs, int /*long*/ piAdvance, int /*long*/ piJustify, int /*long*/ pGoffset);
+public static final native int ScriptXtoCP (int iX, int cChars, int cGlyphs, int /*long*/ pwLogClust, int /*long*/ psva, int /*long*/ piAdvance, SCRIPT_ANALYSIS psa, int[] piCP, int[] piTrailing);
+public static final native int ScrollWindowEx (int /*long*/ hWnd, int dx, int dy, RECT prcScroll, RECT prcClip, int /*long*/ hrgnUpdate, RECT prcUpdate, int flags);
+public static final native int SelectClipRgn (int /*long*/ hdc, int /*long*/ hrgn);
+public static final native int /*long*/ SelectObject (int /*long*/ hDC, int /*long*/ HGDIObj);
+public static final native int /*long*/ SelectPalette (int /*long*/ hDC, int /*long*/ hpal, boolean bForceBackground);
+public static final native int SendInput (int nInputs, int /*long*/ pInputs, int cbSize);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int  [] wParam, int [] lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ [] wParam, int /*long*/ lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, char [] lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int [] lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, short [] lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVCOLUMN lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LITEM lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVITEM lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, MARGINS lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, POINT lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, REBARBANDINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, RECT lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SYSTEMTIME lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTON lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTONINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TCITEM lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TOOLINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVINSERTSTRUCT lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVITEM lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, UDACCEL lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDITEM lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDLAYOUT lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, BUTTON_IMAGELIST lParam);
+public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SIZE lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int [] wParam, int [] lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ [] wParam, int /*long*/ lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, byte [] lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int [] lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, short [] lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int /*long*/ lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVCOLUMN lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LITEM lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, LVITEM lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, MARGINS lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, POINT lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, REBARBANDINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, RECT lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SYSTEMTIME lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTON lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TBBUTTONINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TCITEM lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TOOLINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVINSERTSTRUCT lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, TVITEM lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, UDACCEL lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDHITTESTINFO lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDITEM lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, HDLAYOUT lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, BUTTON_IMAGELIST lParam);
+public static final native int /*long*/ SendMessageA (int /*long*/ hWnd, int Msg, int /*long*/ wParam, SIZE lParam);
+public static final native int /*long*/ SetActiveWindow (int /*long*/ hWnd);
+public static final native int SetBkColor (int /*long*/ hdc, int colorRef);
+public static final native int SetBkMode (int /*long*/ hdc, int mode);
+public static final native boolean SetBrushOrgEx (int /*long*/ hdc, int nXOrg, int nYOrg, POINT lppt);
+public static final native int /*long*/ SetCapture (int /*long*/ hWnd);
 public static final native boolean SetCaretPos (int X, int Y);
-public static final native int SetClipboardData (int uFormat, int hMem);
-public static final native int SetCursor (int hCursor);
+public static final native int /*long*/ SetClipboardData (int uFormat, int /*long*/ hMem);
+public static final native int /*long*/ SetCursor (int /*long*/ hCursor);
 public static final native boolean SetCursorPos (int X, int Y);
-public static final native int SetDIBColorTable (int hdc, int uStartIndex, int cEntries, byte[] pColors);
+public static final native int SetDIBColorTable (int /*long*/ hdc, int uStartIndex, int cEntries, byte[] pColors);
 public static final native int SetErrorMode (int uMode);
-public static final native int SetFocus (int hWnd);
-public static final native boolean SetForegroundWindow (int hWnd);
-public static final native int SetGraphicsMode(int hdc, int iMode);
-public static final native int SetLayout (int hdc, int dwLayout);
-public static final native boolean SetMenu (int hWnd, int hMenu);
-public static final native boolean SetMenuDefaultItem (int hMenu, int uItem, int fByPos);
-public static final native boolean SetMenuInfo (int hmenu, MENUINFO lpcmi);
-public static final native boolean SetMenuItemInfoW (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native boolean SetMenuItemInfoA (int hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-public static final native int SetMetaRgn (int hdc);
-public static final native int SetPaletteEntries (int hPal, int iStart, int cEntries, byte[] lppe);
-public static final native int SetParent (int hWndChild, int hWndNewParent);
-public static final native int SetPixel (int hdc, int X, int Y, int crColor);
-public static final native int SetPolyFillMode(int hdc, int iPolyFillMode);
-public static final native boolean SetProcessDPIAware();
-public static final native boolean SetRect(RECT lprc, int xLeft, int yTop, int xRight, int yBottom);
-public static final native boolean SetRectRgn (int hrgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
-public static final native int SetROP2 (int hdc, int fnDrawMode);
-public static final native boolean SetScrollInfo (int hwnd, int flags, SCROLLINFO info, boolean fRedraw);
-public static final native int SetStretchBltMode(int hdc, int iStretchMode);
-public static final native boolean SetPropW (int hWnd, int lpString, int hData);
-public static final native boolean SetPropA (int hWnd, int lpString, int hData);
-public static final native int SetTextAlign(int hdc, int fMode);
-public static final native int SetTextColor (int hdc, int colorRef);
-public static final native int SetTimer (int hWnd, int nIDEvent, int Elapse, int lpTimerFunc);
-public static final native int SetWindowLongW (int hWnd, int nIndex, int dwNewLong);
-public static final native int SetWindowLongA (int hWnd, int nIndex, int dwNewLong);
-public static final native boolean SetWindowOrgEx(int hdc, int X, int Y, POINT lpPoint);
-public static final native boolean SetWindowPlacement (int hWnd, WINDOWPLACEMENT lpwndpl);
-public static final native boolean SetWindowPos(int hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
-public static final native int SetWindowRgn(int hWnd, int hRgn, boolean bRedraw);
-public static final native boolean SetWindowTextW (int hWnd, char [] lpString);
-public static final native boolean SetWindowTextA (int hWnd, byte [] lpString);
-public static final native int SetWindowTheme (int hwnd, char [] pszSubAppName, char [] pszSubIdList);
-public static final native int SetWindowsHookExW (int idHook, int lpfn,  int hMod,  int dwThreadId);
-public static final native int SetWindowsHookExA (int idHook, int lpfn,  int hMod,  int dwThreadId);
-public static final native boolean SetWorldTransform(int hdc, float[] lpXform);
-public static final native int SHBrowseForFolderW (BROWSEINFO lpbi);
-public static final native int SHBrowseForFolderA (BROWSEINFO lpbi);
-public static final native boolean SHCreateMenuBar(SHMENUBARINFO pmb);
-public static final native int SHGetFileInfoW (char [] pszPath, int dwFileAttributes, SHFILEINFOW psfi, int cbFileInfo, int uFlags);
-public static final native int SHGetFileInfoA (byte [] pszPath, int dwFileAttributes, SHFILEINFOA psfi, int cbFileInfo, int uFlags);
-public static final native boolean SHHandleWMSettingChange (int hwnd, int wParam, int lParam, SHACTIVATEINFO psai);
-public static final native int SHRecognizeGesture(SHRGINFO shrg);
-public static final native void SHSendBackToFocusWindow (int uMsg, int wp, int lp);
-public static final native boolean SHSipPreference (int hwnd, int st);
+public static final native int /*long*/ SetFocus (int /*long*/ hWnd);
+public static final native boolean SetForegroundWindow (int /*long*/ hWnd);
+public static final native int SetGraphicsMode (int /*long*/ hdc, int iMode);
+public static final native int SetLayout (int /*long*/ hdc, int dwLayout);
+public static final native boolean SetMenu (int /*long*/ hWnd, int /*long*/ hMenu);
+public static final native boolean SetMenuDefaultItem (int /*long*/ hMenu, int uItem, int fByPos);
+public static final native boolean SetMenuInfo (int /*long*/ hmenu, MENUINFO lpcmi);
+public static final native boolean SetMenuItemInfoW (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean SetMenuItemInfoA (int /*long*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native int SetMetaRgn (int /*long*/ hdc);
+public static final native int SetPaletteEntries (int /*long*/ hPal, int iStart, int cEntries, byte[] lppe);
+public static final native int /*long*/ SetParent (int /*long*/ hWndChild, int /*long*/ hWndNewParent);
+public static final native int SetPixel (int /*long*/ hdc, int X, int Y, int crColor);
+public static final native int SetPolyFillMode (int /*long*/ hdc, int iPolyFillMode);
+public static final native boolean SetProcessDPIAware ();
+public static final native boolean SetRect (RECT lprc, int xLeft, int yTop, int xRight, int yBottom);
+public static final native boolean SetRectRgn (int /*long*/ hrgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+public static final native int SetROP2 (int /*long*/ hdc, int fnDrawMode);
+public static final native boolean SetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw);
+public static final native int SetStretchBltMode (int /*long*/ hdc, int iStretchMode);
+public static final native boolean SetPropW (int /*long*/ hWnd, int /*long*/ lpString, int /*long*/ hData);
+public static final native boolean SetPropA (int /*long*/ hWnd, int /*long*/ lpString, int /*long*/ hData);
+public static final native int SetTextAlign (int /*long*/ hdc, int fMode);
+public static final native int SetTextColor (int /*long*/ hdc, int colorRef);
+public static final native int /*long*/ SetTimer (int /*long*/ hWnd, int /*long*/ nIDEvent, int Elapse, int /*long*/ lpTimerFunc);
+public static final native int SetWindowLongW (int /*long*/ hWnd, int nIndex, int dwNewLong);
+public static final native int SetWindowLongA (int /*long*/ hWnd, int nIndex, int dwNewLong);
+public static final native int /*long*/ SetWindowLongPtrW (int /*long*/ hWnd, int nIndex, int /*long*/ dwNewLong);
+public static final native int /*long*/ SetWindowLongPtrA (int /*long*/ hWnd, int nIndex, int /*long*/ dwNewLong);
+public static final native boolean SetWindowOrgEx (int /*long*/ hdc, int X, int Y, POINT lpPoint);
+public static final native boolean SetWindowPlacement (int /*long*/ hWnd, WINDOWPLACEMENT lpwndpl);
+public static final native boolean SetWindowPos(int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
+public static final native int SetWindowRgn (int /*long*/ hWnd, int /*long*/ hRgn, boolean bRedraw);
+public static final native boolean SetWindowTextW (int /*long*/ hWnd, char [] lpString);
+public static final native boolean SetWindowTextA (int /*long*/ hWnd, byte [] lpString);
+public static final native int SetWindowTheme (int /*long*/ hwnd, char [] pszSubAppName, char [] pszSubIdList);
+public static final native int /*long*/ SetWindowsHookExW (int idHook, int /*long*/ lpfn,  int /*long*/ hMod,  int dwThreadId);
+public static final native int /*long*/ SetWindowsHookExA (int idHook, int /*long*/ lpfn,  int /*long*/ hMod,  int dwThreadId);
+public static final native boolean SetWorldTransform(int /*long*/ hdc, float[] lpXform);
+public static final native int /*long*/ SHBrowseForFolderW (BROWSEINFO lpbi);
+public static final native int /*long*/ SHBrowseForFolderA (BROWSEINFO lpbi);
+public static final native boolean SHCreateMenuBar (SHMENUBARINFO pmb);
+public static final native int /*long*/ SHGetFileInfoW (char [] pszPath, int dwFileAttributes, SHFILEINFOW psfi, int cbFileInfo, int uFlags);
+public static final native int /*long*/ SHGetFileInfoA (byte [] pszPath, int dwFileAttributes, SHFILEINFOA psfi, int cbFileInfo, int uFlags);
+public static final native boolean SHHandleWMSettingChange (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam, SHACTIVATEINFO psai);
+public static final native int SHRecognizeGesture (SHRGINFO shrg);
+public static final native void SHSendBackToFocusWindow (int uMsg, int /*long*/ wp, int /*long*/ lp);
+public static final native boolean SHSipPreference (int /*long*/ hwnd, int st);
 public static final native boolean ShellExecuteExW (SHELLEXECUTEINFO lpExecInfo);
 public static final native boolean ShellExecuteExA (SHELLEXECUTEINFO lpExecInfo);
 public static final native boolean Shell_NotifyIconA (int dwMessage, NOTIFYICONDATAA lpData);
 public static final native boolean Shell_NotifyIconW (int dwMessage, NOTIFYICONDATAW lpData);
-public static final native int SHGetMalloc (int [] ppMalloc);
-public static final native boolean SHGetPathFromIDListW (int pidl, char [] pszPath);
-public static final native boolean SHGetPathFromIDListA (int pidl, byte [] pszPath);
-public static final native boolean SHSetAppKeyWndAssoc(byte bVk, int hwnd);
-public static final native boolean ShowCaret (int hWnd);
-public static final native boolean ShowOwnedPopups (int hWnd, boolean fShow);
-public static final native boolean ShowScrollBar (int hWnd, int wBar, boolean bShow);
-public static final native boolean ShowWindow (int hWnd, int nCmdShow);
+public static final native int SHGetMalloc (int /*long*/ [] ppMalloc);
+public static final native boolean SHGetPathFromIDListW (int /*long*/ pidl, char [] pszPath);
+public static final native boolean SHGetPathFromIDListA (int /*long*/ pidl, byte [] pszPath);
+public static final native boolean SHSetAppKeyWndAssoc (byte bVk, int /*long*/ hwnd);
+public static final native boolean ShowCaret (int /*long*/ hWnd);
+public static final native boolean ShowOwnedPopups (int /*long*/ hWnd, boolean fShow);
+public static final native boolean ShowScrollBar (int /*long*/ hWnd, int wBar, boolean bShow);
+public static final native boolean ShowWindow (int /*long*/ hWnd, int nCmdShow);
 public static final native boolean SipGetInfo (SIPINFO pSipInfo);
-public static final native int StartDocW (int hdc, DOCINFO lpdi);
-public static final native int StartDocA (int hdc, DOCINFO lpdi);
-public static final native int StartPage (int hdc);
-public static final native boolean StretchBlt (int hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int dwRop);
-public static final native boolean StrokePath(int hdc);
+public static final native int StartDocW (int /*long*/ hdc, DOCINFO lpdi);
+public static final native int StartDocA (int /*long*/ hdc, DOCINFO lpdi);
+public static final native int StartPage (int /*long*/ hdc);
+public static final native boolean StretchBlt (int /*long*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int /*long*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int dwRop);
+public static final native boolean StrokePath (int /*long*/ hdc);
 public static final native boolean SystemParametersInfoW (int uiAction, int uiParam, HIGHCONTRAST pvParam, int fWinIni);
 public static final native boolean SystemParametersInfoA (int uiAction, int uiParam, HIGHCONTRAST pvParam, int fWinIni);
 public static final native boolean SystemParametersInfoW (int uiAction, int uiParam, RECT pvParam, int fWinIni);
 public static final native boolean SystemParametersInfoA (int uiAction, int uiParam, RECT pvParam, int fWinIni);
 public static final native boolean SystemParametersInfoW (int uiAction, int uiParam, NONCLIENTMETRICSW pvParam, int fWinIni);
 public static final native boolean SystemParametersInfoA (int uiAction, int uiParam, NONCLIENTMETRICSA pvParam, int fWinIni);
-public static final native boolean SystemParametersInfoW (int uiAction, int uiParam, int[] pvParam, int fWinIni);
-public static final native boolean SystemParametersInfoA (int uiAction, int uiParam, int[] pvParam, int fWinIni);
+public static final native boolean SystemParametersInfoW (int uiAction, int uiParam, int [] pvParam, int fWinIni);
+public static final native boolean SystemParametersInfoA (int uiAction, int uiParam, int [] pvParam, int fWinIni);
 public static final native int ToAscii (int uVirtKey, int uScanCode, byte [] lpKeyState, short [] lpChar, int uFlags);
-public static final native int ToUnicode(int wVirtKey, int wScanCode, byte [] lpKeyState, char [] pwszBuff, int cchBuff, int wFlags);
-public static final native boolean TrackMouseEvent(TRACKMOUSEEVENT lpEventTrack);
-public static final native boolean TrackPopupMenu (int hMenu, int uFlags, int x, int y, int nReserved, int hWnd, RECT prcRect);
-public static final native int TranslateAcceleratorW (int hWnd, int hAccTable, MSG lpMsg);
-public static final native int TranslateAcceleratorA (int hWnd, int hAccTable, MSG lpMsg);
-public static final native boolean TranslateCharsetInfo(int lpSrc, int [] lpCs, int dwFlags);
-public static final native boolean TranslateMDISysAccel (int hWndClient, MSG lpMsg);
+public static final native int ToUnicode (int wVirtKey, int wScanCode, byte [] lpKeyState, char [] pwszBuff, int cchBuff, int wFlags);
+public static final native boolean TrackMouseEvent (TRACKMOUSEEVENT lpEventTrack);
+public static final native boolean TrackPopupMenu (int /*long*/ hMenu, int uFlags, int x, int y, int nReserved, int /*long*/ hWnd, RECT prcRect);
+public static final native int TranslateAcceleratorW (int /*long*/ hWnd, int /*long*/ hAccTable, MSG lpMsg);
+public static final native int TranslateAcceleratorA (int /*long*/ hWnd, int /*long*/ hAccTable, MSG lpMsg);
+public static final native boolean TranslateCharsetInfo (int /*long*/ lpSrc, int [] lpCs, int dwFlags);
+public static final native boolean TranslateMDISysAccel (int /*long*/ hWndClient, MSG lpMsg);
 public static final native boolean TranslateMessage (MSG lpmsg);
-public static final native boolean TransparentBlt(int hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int hHeightDest, int hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int crTransparent);
-public static final native boolean TransparentImage (int hdcDest, int DstX, int DstY, int DstCx, int DstCy,int hSrc, int SrcX, int SrcY, int SrcCx, int SrcCy, int TransparentColor);
-public static final native boolean UnhookWindowsHookEx (int hhk);
-public static final native boolean UnregisterClassW (char [] lpClassName, int hInstance);
-public static final native boolean UnregisterClassA (byte [] lpClassName, int hInstance);
-public static final native boolean UpdateWindow (int hWnd);
-public static final native boolean ValidateRect (int hWnd, RECT lpRect);
+public static final native boolean TransparentBlt (int /*long*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int hHeightDest, int /*long*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int crTransparent);
+public static final native boolean TransparentImage (int /*long*/ hdcDest, int DstX, int DstY, int DstCx, int DstCy,int /*long*/ hSrc, int SrcX, int SrcY, int SrcCx, int SrcCy, int TransparentColor);
+public static final native boolean UnhookWindowsHookEx (int /*long*/ hhk);
+public static final native boolean UnregisterClassW (char [] lpClassName, int /*long*/ hInstance);
+public static final native boolean UnregisterClassA (byte [] lpClassName, int /*long*/ hInstance);
+public static final native boolean UpdateWindow (int /*long*/ hWnd);
+public static final native boolean ValidateRect (int /*long*/ hWnd, RECT lpRect);
 public static final native short VkKeyScanW (short ch);
 public static final native short VkKeyScanA (short ch);
-public static final native int VtblCall (int fnNumber, int ppVtbl);
-public static final native int VtblCall (int fnNumber, int ppVtbl, int arg0);
-public static final native int VtblCall (int fnNumber, int ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-public static final native int VtblCall (int fnNumber, int ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl);
+
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0);
+
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long[] arg3);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int arg2, long[] arg3);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long[] arg3);
+
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+
 public static final native boolean WaitMessage ();
 public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, byte [] lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, boolean [] lpUsedDefaultChar);
-public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, int lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, boolean [] lpUsedDefaultChar);
-public static final native int WindowFromDC (int hDC);
-public static final native int WindowFromPoint (POINT lpPoint);
-public static final native int strlen (int s);
-public static final native int wcslen (int string);
-}
\ No newline at end of file
+public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, int /*long*/ lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, boolean [] lpUsedDefaultChar);
+public static final native int /*long*/ WindowFromDC (int /*long*/ hDC);
+public static final native int /*long*/ WindowFromPoint (POINT lpPoint);
+public static final native int strlen (int /*long*/ s);
+public static final native int wcslen (int /*long*/ string);
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
index bddd9df8e9..4492329b0a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
@@ -16,5 +16,5 @@ public abstract class OSVERSIONINFO {
 	public int dwMinorVersion;
 	public int dwBuildNumber;
 	public int dwPlatformId;
-	public static /*final*/ int sizeof = OS.IsUnicode ? 276 : 148;
+	public static /*final*/ int sizeof = OS.IsUnicode ? OS.OSVERSIONINFOW_sizeof () : OS.OSVERSIONINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOA.java
index 94c9a65c19..e6367917a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOA.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class OSVERSIONINFOA extends OSVERSIONINFO {
 	public byte[] szCSDVersion = new byte[128];
-	public static final int sizeof = 148;
+	public static final int sizeof = OS.OSVERSIONINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOW.java
index c27c85a989..0b484a36a5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFOW.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class OSVERSIONINFOW extends OSVERSIONINFO {
 	public char[] szCSDVersion = new char[128];
-	public static final int sizeof = 276;
+	public static final int sizeof = OS.OSVERSIONINFOW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
index a50473aeda..6a58e8d5ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
@@ -11,12 +11,12 @@
 package org.eclipse.swt.internal.win32;
 
 public class PAINTSTRUCT {
-	public int hdc; 
+	public int /*long*/  hdc; 
 	public boolean fErase;
 //	public RECT rcPaint;
 	public int left, top, right, bottom;
 	public boolean fRestore; 
 	public boolean fIncUpdate; 
 	public byte[] rgbReserved = new byte[32];
-	public static final int sizeof = 64;
+	public static final int sizeof = OS.PAINTSTRUCT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java
index 8a3a1ae8a0..017ebd4911 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class POINT {
 	public int x;
 	public int y;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.POINT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
index 0ebfb5ba6a..e9e3f853e5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
@@ -12,23 +12,23 @@ package org.eclipse.swt.internal.win32;
 
 public class PRINTDLG {
 	public int lStructSize; // DWORD
-	public int hwndOwner; // HWND
-	public int hDevMode; // HGLOBAL
-	public int hDevNames; // HGLOBAL
-	public int hDC; // HDC
+	public int /*long*/ hwndOwner; // HWND
+	public int /*long*/ hDevMode; // HGLOBAL
+	public int /*long*/ hDevNames; // HGLOBAL
+	public int /*long*/ hDC; // HDC
 	public int Flags; // DWORD
 	public short nFromPage; // WORD
 	public short nToPage; // WORD
 	public short nMinPage; // WORD
 	public short nMaxPage; // WORD
 	public short nCopies; // WORD
-	public int hInstance; // HINSTANCE
-	public int lCustData; // LPARAM
-	public int lpfnPrintHook; // LPPRINTHOOKPROC
-	public int lpfnSetupHook; // LPSETUPHOOKPROC
-	public int lpPrintTemplateName; // LPCTSTR
-	public int lpSetupTemplateName; // LPCTSTR
-	public int hPrintTemplate; // HGLOBAL
-	public int hSetupTemplate; // HGLOBAL
-	public static final int sizeof = 66;
+	public int /*long*/ hInstance; // HINSTANCE
+	public int /*long*/ lCustData; // LPARAM
+	public int /*long*/ lpfnPrintHook; // LPPRINTHOOKPROC
+	public int /*long*/ lpfnSetupHook; // LPSETUPHOOKPROC
+	public int /*long*/ lpPrintTemplateName; // LPCTSTR
+	public int /*long*/ lpSetupTemplateName; // LPCTSTR
+	public int /*long*/ hPrintTemplate; // HGLOBAL
+	public int /*long*/ hSetupTemplate; // HGLOBAL
+	public static final int sizeof = OS.PRINTDLG_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
index ec2292d27b..c9a6a3b039 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
@@ -11,9 +11,9 @@
 package org.eclipse.swt.internal.win32;
 
 public class PROCESS_INFORMATION {
-	public int hProcess;
-	public int hThread;
+	public int /*long*/ hProcess;
+	public int /*long*/ hThread;
 	public int dwProcessId;
 	public int dwThreadId;
-	public static int sizeof = 16;
+	public static int sizeof = OS.PROCESS_INFORMATION_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
index 57168efb59..75f03efe19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
@@ -16,21 +16,21 @@ public class REBARBANDINFO {
 	public int fStyle;
 	public int clrFore;
 	public int clrBack;
-	public int lpText;
+	public int /*long*/ lpText;
 	public int cch;
 	public int iImage;
-	public int hwndChild;
+	public int /*long*/ hwndChild;
 	public int cxMinChild;
 	public int cyMinChild;
 	public int cx;
-	public int hbmBack;
+	public int /*long*/ hbmBack;
 	public int wID;
 	public int cyChild;  
 	public int cyMaxChild;
 	public int cyIntegral;
 	public int cxIdeal;
-	public int lParam;
+	public int /*long*/ lParam;
 	public int cxHeader;
 	/* Note in WinCE.  The field cxHeader is not defined. */ 
-	public static final int sizeof = OS.IsWinCE ? 76 : 80;
+	public static final int sizeof = OS.REBARBANDINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java
index 69b6f7c644..7e6bdc67ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java
@@ -15,5 +15,5 @@ public class RECT {
 	public int top;
 	public int right;
 	public int bottom;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.RECT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ANALYSIS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ANALYSIS.java
index e174436fdd..25a12129f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ANALYSIS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ANALYSIS.java
@@ -19,5 +19,5 @@ public class SCRIPT_ANALYSIS {
 	public boolean fLogicalOrder; 
 	public boolean fNoGlyphIndex;
 	public SCRIPT_STATE s = new SCRIPT_STATE(); 
-	public static final int sizeof = 4;
+	public static final int sizeof = OS.SCRIPT_ANALYSIS_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_CONTROL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_CONTROL.java
index c169e27c55..ddb8c831be 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_CONTROL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_CONTROL.java
@@ -11,7 +11,7 @@
 package org.eclipse.swt.internal.win32;
 
 public class SCRIPT_CONTROL {
-	public int	uDefaultLanguage; 
+	public int uDefaultLanguage; 
 	public boolean fContextDigits; 
 	public boolean fInvertPreBoundDir; 
 	public boolean fInvertPostBoundDir; 
@@ -21,5 +21,5 @@ public class SCRIPT_CONTROL {
 	public boolean fNumericOverride;
 	public boolean fLegacyBidiClass;
 	public int fReserved;
-	public static final int sizeof = 4;
+	public static final int sizeof = OS.SCRIPT_CONTROL_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java
index 0a3dc0a2f1..052341f189 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java
@@ -15,5 +15,5 @@ public class SCRIPT_DIGITSUBSTITUTE {
 	public short TraditionalDigitLanguage;
 	public byte DigitSubstitute;
 	public int dwReserved;
-	public static final int sizeof = 12;
+	public static final int sizeof = OS.SCRIPT_DIGITSUBSTITUTE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_FONTPROPERTIES.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_FONTPROPERTIES.java
index 1306effdf0..4f501a6989 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_FONTPROPERTIES.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_FONTPROPERTIES.java
@@ -17,5 +17,5 @@ public class SCRIPT_FONTPROPERTIES {
 	public short wgInvalid;
 	public short wgKashida; 
 	public int iKashidaWidth;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.SCRIPT_FONTPROPERTIES_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ITEM.java
index c2e3be1a2b..4c0f1486bc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_ITEM.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class SCRIPT_ITEM {
 	public int iCharPos;
 	public SCRIPT_ANALYSIS a = new SCRIPT_ANALYSIS(); 
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.SCRIPT_ITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_LOGATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_LOGATTR.java
index a31d3778dd..876be202cf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_LOGATTR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_LOGATTR.java
@@ -17,5 +17,5 @@ public class SCRIPT_LOGATTR {
 	public boolean fWordStop; 
 	public boolean fInvalid; 
 	public byte fReserved;	
-	public static final int sizeof = 1;
+	public static final int sizeof = OS.SCRIPT_LOGATTR_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_PROPERTIES.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_PROPERTIES.java
index af69849ad0..38bf1d6c94 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_PROPERTIES.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_PROPERTIES.java
@@ -26,5 +26,5 @@ public class SCRIPT_PROPERTIES {
 	public boolean fAmbiguousCharSet;
 	public boolean fClusterSizeVaries;
 	public boolean fRejectInvalid;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.SCRIPT_PROPERTIES_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_STATE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_STATE.java
index 1ae948a61d..57317524f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_STATE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_STATE.java
@@ -22,5 +22,5 @@ public class SCRIPT_STATE {
 	public boolean fGcpClusters; 
 	public boolean fReserved; 
 	public short fEngineReserved;
-	public static final int sizeof = 2;
+	public static final int sizeof = OS.SCRIPT_STATE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
index e2762a7b71..2e47a31261 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
@@ -18,5 +18,5 @@ public class SCROLLINFO {
 	public int nPage;
 	public int nPos;
 	public int nTrackPos;
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.SCROLLINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHACTIVATEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHACTIVATEINFO.java
index 92323b3d3a..eb7582eb93 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHACTIVATEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHACTIVATEINFO.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.win32;
 
 public class SHACTIVATEINFO {
 	public int cbSize;
-	public int hwndLastFocus;
+	public int /*long*/ hwndLastFocus;
 	public int fSipUp; // :1
 	public int fSipOnDeactivation; // :1
 	public int fActive; // :1
 	public int fReserved; // :29
-	public static final int sizeof = 12;
+	public static final int sizeof = OS.SHACTIVATEINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
index 6371d12b3f..f6848011ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
@@ -13,24 +13,24 @@ package org.eclipse.swt.internal.win32;
 public class SHELLEXECUTEINFO {
 	public int cbSize;
 	public int fMask; 
-	public int hwnd;
-	public int lpVerb;
-	public int lpFile; 
-	public int lpParameters;
-	public int lpDirectory;
+	public int /*long*/ hwnd;
+	public int /*long*/ lpVerb;
+	public int /*long*/ lpFile; 
+	public int /*long*/ lpParameters;
+	public int /*long*/ lpDirectory;
 	public int nShow; 
-	public int hInstApp;
+	public int /*long*/ hInstApp;
 	// Optional members
-	public int lpIDList; 
-	public int lpClass;
-	public int hkeyClass;
+	public int /*long*/ lpIDList; 
+	public int /*long*/ lpClass;
+	public int /*long*/ hkeyClass;
 	public int dwHotKey;
 //	union {
 //		HANDLE hIcon;		
 //		HANDLE hMonitor;
 //	};
-	public int hIcon;
-	public int hProcess; 
-	public static final int sizeof = 60;
+	public int /*long*/ hIcon;
+	public int /*long*/ hProcess; 
+	public static final int sizeof = OS.SHELLEXECUTEINFO_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java
index 760f727860..6a8205fdb5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class SHFILEINFO {
-	public int hIcon;
+	public int /*long*/ hIcon;
 	public int iIcon;
 	public int dwAttributes;
-	public static int sizeof = OS.IsUnicode ? 692 : 352;
+	public static int sizeof = OS.IsUnicode ? OS.SHFILEINFOW_sizeof ():  OS.SHFILEINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOA.java
index e79376b4e6..9b457f04cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOA.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class SHFILEINFOA extends SHFILEINFO {
 	public byte [] szDisplayName = new byte [OS.MAX_PATH];
 	public byte [] szTypeName = new byte [80];
-	public static int sizeof = 352;
+	public static int sizeof = OS.SHFILEINFOA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOW.java
index b8b7c21ce5..9379feebec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOW.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class SHFILEINFOW extends SHFILEINFO {
 	public char [] szDisplayName = new char [OS.MAX_PATH];
 	public char [] szTypeName = new char [80];
-	public static int sizeof = 692;
+	public static int sizeof = OS.SHFILEINFOW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHMENUBARINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHMENUBARINFO.java
index 66e6d0210f..162b2941f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHMENUBARINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHMENUBARINFO.java
@@ -12,12 +12,12 @@ package org.eclipse.swt.internal.win32;
 
 public class SHMENUBARINFO {
 	public int cbSize;
-	public int hwndParent;
+	public int /*long*/ hwndParent;
 	public int dwFlags;
 	public int nToolBarId;
-	public int hInstRes;
+	public int /*long*/ hInstRes;
 	public int nBmpId;
 	public int cBmpImages;
-	public int hwndMB;
-	public static final int sizeof = OS.IsSP ? 36 : 32;
+	public int /*long*/ hwndMB;
+	public static final int sizeof = OS.IsSP ? 36 : OS.SHMENUBARINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHRGINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHRGINFO.java
index 3516a428a7..8677b449ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHRGINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHRGINFO.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.win32;
 
 public class SHRGINFO {
 	public int cbSize;
-	public int hwndClient;
+	public int /*long*/ hwndClient;
 //	POINT ptDown
 	public int ptDown_x;
 	public int ptDown_y;
 	public int dwFlags;
-	public static final int sizeof = 20;
+	public static final int sizeof = OS.SHRGINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIPINFO.java
index e8cc3d2073..84ccfc341a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIPINFO.java
@@ -24,6 +24,6 @@ public class SIPINFO {
 	public int rcSipRect_right;
 	public int rcSipRect_bottom;
 	public int dwImDataSize;
-	public int pvImData;
-	public static final int sizeof = 48;
+	public int /*long*/ pvImData;
+	public static final int sizeof = OS.SIPINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java
index 3cef38bcc4..c9d8677c08 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class SIZE {
 	public int cx;
 	public int cy;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.SIZE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java
index 41a9ede044..140c3d843b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.win32;
 
 public class STARTUPINFO {
 	public int cb;
-	public int lpReserved;
-	public int lpDesktop;
-	public int lpTitle;
+	public int /*long*/ lpReserved;
+	public int /*long*/ lpDesktop;
+	public int /*long*/ lpTitle;
 	public int dwX;
 	public int dwY;
 	public int dwXSize;
@@ -25,9 +25,9 @@ public class STARTUPINFO {
 	public int dwFlags;
 	public short wShowWindow;
 	public short cbReserved2;
-	public int lpReserved2;
-	public int hStdInput;
-	public int hStdOutput;
-	public int hStdError;
-	public static int sizeof = 17 * 4;
+	public int /*long*/ lpReserved2;
+	public int /*long*/ hStdInput;
+	public int /*long*/ hStdOutput;
+	public int /*long*/ hStdError;
+	public static int sizeof = OS.STARTUPINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SYSTEMTIME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SYSTEMTIME.java
index a28874ea99..2a27dd452b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SYSTEMTIME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SYSTEMTIME.java
@@ -19,5 +19,5 @@ public class SYSTEMTIME {
 	public short wMinute;
 	public short wSecond;
 	public short wMilliseconds;
-	public static final int sizeof = 16;
-}
+	public static final int sizeof = OS.SYSTEMTIME_sizeof ();
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
index 82680734ac..6d696e6f0b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
@@ -15,7 +15,7 @@ public class TBBUTTON {
 	public int idCommand;
 	public byte fsState;
 	public byte fsStyle;
-	public int dwData;
-	public int iString;
-	public static final int sizeof = 20;
+	public int /*long*/ dwData;
+	public int /*long*/ iString;
+	public static final int sizeof = OS.TBBUTTON_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
index 7656e23131..7be34c9a75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
@@ -18,8 +18,8 @@ public class TBBUTTONINFO {
 	public byte fsState;
 	public byte fsStyle;
 	public short cx;
-	public int lParam;
-	public int pszText;
+	public int /*long*/ lParam;
+	public int /*long*/ pszText;
 	public int cchText;
-	public static final int sizeof = 32;
+	public static final int sizeof = OS.TBBUTTONINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java
index ada33699d0..7a8b828615 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java
@@ -14,9 +14,9 @@ public class TCITEM {
 	public int mask;
 	public int dwState;
 	public int dwStateMask;
-	public int pszText;
+	public int /*long*/ pszText;
 	public int cchTextMax;
 	public int iImage;
-	public int lParam;
-	public static final int sizeof = 28;
+	public int /*long*/ lParam;
+	public static final int sizeof = OS.TCITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
index b0c5e6df81..32ee72b287 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
@@ -27,5 +27,5 @@ public abstract class TEXTMETRIC {
 	public byte tmStruckOut;
 	public byte tmPitchAndFamily;
 	public byte tmCharSet;
-	public static final int sizeof = OS.IsUnicode ? 60 : 56;
+	public static final int sizeof = OS.IsUnicode ? OS.TEXTMETRICW_sizeof():  OS.TEXTMETRICA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICA.java
index d0ff185b9c..7416cb96ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICA.java
@@ -15,5 +15,5 @@ public class TEXTMETRICA extends TEXTMETRIC {
 	public byte tmLastChar;
 	public byte tmDefaultChar; 
 	public byte tmBreakChar;
-	public static final int sizeof = 56;
+	public static final int sizeof = OS.TEXTMETRICA_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICW.java
index 2a5c8008f9..8a71be447e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICW.java
@@ -15,5 +15,5 @@ public class TEXTMETRICW extends TEXTMETRIC {
 	public char tmLastChar;
 	public char tmDefaultChar; 
 	public char tmBreakChar;
-	public static final int sizeof = 60;
+	public static final int sizeof = OS.TEXTMETRICW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
index 593141f437..506a626569 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
@@ -13,12 +13,13 @@ package org.eclipse.swt.internal.win32;
 public class TOOLINFO {
 	public int cbSize; 
 	public int uFlags;
-	public int hwnd; 
-	public int uId; 
+	public int /*long*/ hwnd; 
+	public int /*long*/ uId; 
 //	public RECT rect;
 	public int left, top, right, bottom;
-	public int hinst; 
-	public int lpszText;
-	public int lParam;
-	public static int sizeof = 44;
+	public int /*long*/ hinst; 
+	public int /*long*/ lpszText;
+	public int /*long*/ lParam;
+	public int /*long*/ lpReserved;
+	public static int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.TOOLINFO_sizeof () : 44;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
index d65f194461..cd92ffd54e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
@@ -13,7 +13,7 @@ package org.eclipse.swt.internal.win32;
 public class TRACKMOUSEEVENT {
 	public int cbSize;
 	public int dwFlags;
-	public int hwndTrack;
+	public int /*long*/ hwndTrack;
 	public int dwHoverTime;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.TRACKMOUSEEVENT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
index 44de9a99a1..5bf84cda99 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
@@ -17,6 +17,6 @@ public class TRIVERTEX {
 	public short Green;
 	public short Blue;
 	public short Alpha;
-	public static final int sizeof = 16;
+	public static final int sizeof = OS.TRIVERTEX_sizeof ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
index c7cd0f8312..4f9fc64e12 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
@@ -15,6 +15,6 @@ public class TVHITTESTINFO {
 	public int x;
 	public int y;
 	public int flags;
-	public int hItem;
-	public static int sizeof = 16;
+	public int /*long*/ hItem;
+	public static int sizeof = OS.TVHITTESTINFO_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
index 4e5a97a6b6..5f0430096a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
@@ -11,19 +11,19 @@
 package org.eclipse.swt.internal.win32;
 
 public class TVINSERTSTRUCT {
-	public int hParent;
-	public int hInsertAfter;
+	public int /*long*/ hParent;
+	public int /*long*/ hInsertAfter;
 //	public TVITEMEX item;
 	public int mask;
-	public int hItem;
+	public int /*long*/ hItem;
 	public int state;
 	public int stateMask;
-	public int pszText;
+	public int /*long*/ pszText;
   	public int cchTextMax;
   	public int iImage;
   	public int iSelectedImage;
 	public int cChildren;
-	public int lParam;
+	public int /*long*/ lParam;
 	public int iIntegral;
-	public static final int sizeof = 48 + (OS.IsWinCE ? 0 : 4);
+	public static final int sizeof = OS.TVINSERTSTRUCT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
index 9236d2778a..85d2e4fbbf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
@@ -12,14 +12,14 @@ package org.eclipse.swt.internal.win32;
 
 public class TVITEM {
 	public int mask;
-	public int hItem;
+	public int /*long*/ hItem;
 	public int state;
 	public int stateMask;
-	public int pszText;
+	public int /*long*/ pszText;
   	public int cchTextMax;
   	public int iImage;
   	public int iSelectedImage;
 	public int cChildren;
-	public int lParam;
-	public static final int sizeof = 40;
+	public int /*long*/ lParam;
+	public static final int sizeof = OS.TVITEM_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java
index 209e9ba37f..2adb29d671 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java
@@ -12,5 +12,5 @@ package org.eclipse.swt.internal.win32;
 
 public class TVITEMEX extends TVITEM {
 	public int iIntegral;
-	public static final int sizeof = 44;
+	public static final int sizeof = OS.TVITEMEX_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/UDACCEL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/UDACCEL.java
index 25a7deb69c..c5f8d149af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/UDACCEL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/UDACCEL.java
@@ -13,5 +13,5 @@ package org.eclipse.swt.internal.win32;
 public class UDACCEL {
 	public int nSec;
 	public int nInc;
-	public static final int sizeof = 8;
+	public static final int sizeof = OS.UDACCEL_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
index 2de717c139..d507e42c6e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
@@ -25,5 +25,5 @@ public class WINDOWPLACEMENT {
 	public int top;
 	public int right;
 	public int bottom;
-	public static final int sizeof = 44;
+	public static final int sizeof = OS.WINDOWPLACEMENT_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
index 8cea3d96cb..43b2e3780b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
@@ -11,12 +11,12 @@
 package org.eclipse.swt.internal.win32;
 
 public class WINDOWPOS {
-	public int hwnd;                     
-	public int hwndInsertAfter;
-	public int x;                        
+	public int /*long*/ hwnd;
+	public int /*long*/ hwndInsertAfter;
+	public int x;
 	public int y;
-	public int cx;                       
+	public int cx;
 	public int cy;
 	public int flags;  
-	public static final int sizeof = 28;
+	public static final int sizeof = OS.WINDOWPOS_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
index 98c42a673d..78913c11a5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
@@ -12,14 +12,14 @@ package org.eclipse.swt.internal.win32;
 
 public class WNDCLASS {
 	public int style; 
-	public int lpfnWndProc; 
+	public int /*long*/ lpfnWndProc; 
 	public int cbClsExtra; 
 	public int cbWndExtra; 
-	public int hInstance; 
-	public int hIcon; 
-	public int hCursor; 
-	public int hbrBackground; 
-	public int lpszMenuName; 
-	public int lpszClassName; 
-	public static final int sizeof = 40;
+	public int /*long*/ hInstance; 
+	public int /*long*/ hIcon; 
+	public int /*long*/ hCursor; 
+	public int /*long*/ hbrBackground; 
+	public int /*long*/ lpszMenuName; 
+	public int /*long*/ lpszClassName; 
+	public static final int sizeof = OS.WNDCLASS_sizeof ();
 }