Revert "Revert "Bug 532830 - [Win32] Remove ANSI versions of functionsI20181102-1800

and structures""

This reverts commit cb9e6da1d9066625ba2185de599cea11f7406d49.

Change-Id: Idfde2376d21ebba2133ef07a2d92e29f27997efe
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

65 files changed, 2027 insertions, 9921 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
index 6d237668d7..7f5af91ab5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
@@ -133,7 +133,7 @@ public Object nativeToJava(TransferData transferData) {
 		int size = OS.DragQueryFile(stgmedium.unionField, i, null, 0) + 1;
 		TCHAR lpszFile = new TCHAR(0, size);
 		// Get file name and append it to string
-		OS.DragQueryFile(stgmedium.unionField, i, lpszFile, size);
+		OS.DragQueryFile(stgmedium.unionField, i, lpszFile.chars, size);
 		fileNames[i] = lpszFile.toString(0, lpszFile.strlen());
 	}
 	OS.DragFinish(stgmedium.unionField); // frees data associated with HDROP data
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 fa72e03574..6b7637b80b 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
@@ -24,7 +24,9 @@ SWT_PREFIX  = swt
 WS_PREFIX   = win32
 SWT_VERSION = $(maj_ver)$(min_ver)r$(rev)
 SWT_LIB     = $(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
-SWT_LIBS    = comctl32.lib shell32.lib imm32.lib oleacc.lib usp10.lib wininet.lib Crypt32.lib Shlwapi.lib
+SWT_LIBS    = comctl32.lib shell32.lib imm32.lib oleacc.lib usp10.lib \
+	wininet.lib Crypt32.lib Shlwapi.lib Uxtheme.lib Propsys.lib Urlmon.lib \
+	Msimg32.lib
 SWT_OBJS    = swt.obj callback.obj c.obj c_stats.obj \
 	os.obj os_structs.obj os_custom.obj os_stats.obj \
 	com_structs.obj com.obj com_stats.obj com_custom.obj
@@ -62,7 +64,7 @@ WEBKITCFLAGS = -c -O1\
 	-I"$(WEBKIT_SUPPORT_DIR)\win\include"
 
 #CFLAGS = $(cdebug) $(cflags) $(cvarsmt) $(CFLAGS) \
-CFLAGS = -O1 -DNDEBUG /c $(cflags) $(cvarsmt) $(CFLAGS) \
+CFLAGS = -O1 -DNDEBUG -DUNICODE -D_UNICODE /c $(cflags) $(cvarsmt) $(CFLAGS) \
 	-DSWT_VERSION=$(maj_ver)$(min_ver) -DSWT_REVISION=$(rev) $(NATIVE_STATS) -DUSE_ASSEMBLER \
 	/I"$(SWT_JAVA_HOME)\include" /I"$(SWT_JAVA_HOME)\include\win32" /I.
 RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver).$(rev).0\" -DSWT_COMMA_VERSION=$(comma_ver)
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 62d201ba4f..ee960d35cb 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
@@ -67,15 +67,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ActivateActCtx_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)ActivateActCtx(arg0, (ULONG_PTR*)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, ActivateActCtx)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, ULONG_PTR*))fp)(arg0, (ULONG_PTR*)lparg1);
-		}
-	}
+	rc = (jboolean)ActivateActCtx((HANDLE)arg0, (ULONG_PTR*)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, ActivateActCtx_FUNC);
@@ -95,50 +87,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ActivateKeyboardLayout)
 }
 #endif
 
-#ifndef NO_AddFontResourceExA
-JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, AddFontResourceExA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AddFontResourceExA(lparg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AddFontResourceExA)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jintLong))fp)(lparg0, arg1, arg2);
-		}
-	}
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, AddFontResourceExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_AddFontResourceExW
-JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW)
+#ifndef NO_AddFontResourceEx
+JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceEx)
 	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLong arg2)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, AddFontResourceExW_FUNC);
+	OS_NATIVE_ENTER(env, that, AddFontResourceEx_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AddFontResourceExW(lparg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AddFontResourceExW)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jint, jintLong))fp)(lparg0, arg1, arg2);
-		}
-	}
+	rc = (jint)AddFontResourceEx(lparg0, arg1, (PVOID)arg2);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, AddFontResourceExW_FUNC);
+	OS_NATIVE_EXIT(env, that, AddFontResourceEx_FUNC);
 	return rc;
 }
 #endif
@@ -165,15 +125,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, AllowSetForegroundWindow_FUNC);
-/*
 	rc = (jboolean)AllowSetForegroundWindow(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AllowSetForegroundWindow)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, AllowSetForegroundWindow_FUNC);
 	return rc;
 }
@@ -187,15 +139,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, AlphaBlend_FUNC);
 	if (arg10) if ((lparg10 = getBLENDFUNCTIONFields(env, arg10, &_arg10)) == NULL) goto fail;
-/*
-	rc = (jboolean)AlphaBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AlphaBlend)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, BLENDFUNCTION))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
-		}
-	}
+	rc = (jboolean)AlphaBlend((HDC)arg0, arg1, arg2, arg3, arg4, (HDC)arg5, arg6, arg7, arg8, arg9, *lparg10);
 fail:
 	if (arg10 && lparg10) setBLENDFUNCTIONFields(env, arg10, lparg10);
 	OS_NATIVE_EXIT(env, that, AlphaBlend_FUNC);
@@ -215,41 +159,8 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Arc)
 }
 #endif
 
-#ifndef NO_AssocQueryStringA
-JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jintArray arg5)
-{
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, AssocQueryStringA_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AssocQueryStringA(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AssocQueryStringA)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
-		}
-	}
-fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, AssocQueryStringA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_AssocQueryStringW
-JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW)
+#ifndef NO_AssocQueryString
+JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryString)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
 {
 	jchar *lparg2=NULL;
@@ -257,26 +168,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW)
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, AssocQueryStringW_FUNC);
+	OS_NATIVE_ENTER(env, that, AssocQueryString_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AssocQueryStringW(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, AssocQueryStringW)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jchar *, jchar *, jchar *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
-		}
-	}
+	rc = (jint)AssocQueryString(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, AssocQueryStringW_FUNC);
+	OS_NATIVE_EXIT(env, that, AssocQueryString_FUNC);
 	return rc;
 }
 #endif
@@ -365,15 +268,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint)
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getBP_PAINTPARAMSFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-/*
 	rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, BeginBufferedPaint)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HDC, RECT *, jint, BP_PAINTPARAMS *, HDC*))fp)((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
-		}
-	}
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setBP_PAINTPARAMSFields(env, arg3, lparg3);
@@ -453,15 +348,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, BufferedPaintInit_FUNC);
-/*
 	rc = (jint)BufferedPaintInit();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, BufferedPaintInit)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintInit_FUNC);
 	return rc;
 }
@@ -473,15 +360,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintUnInit)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, BufferedPaintUnInit_FUNC);
-/*
 	rc = (jint)BufferedPaintUnInit();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, BufferedPaintUnInit)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintUnInit_FUNC);
 	return rc;
 }
@@ -667,176 +546,89 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CallNextHookEx)
 }
 #endif
 
-#ifndef NO_CallWindowProcA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcA)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CallWindowProcA_FUNC);
-	rc = (jintLong)CallWindowProcA((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
-	OS_NATIVE_EXIT(env, that, CallWindowProcA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CallWindowProcW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcW)
+#ifndef NO_CallWindowProc
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProc)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CallWindowProcW_FUNC);
-	rc = (jintLong)CallWindowProcW((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
-	OS_NATIVE_EXIT(env, that, CallWindowProcW_FUNC);
+	OS_NATIVE_ENTER(env, that, CallWindowProc_FUNC);
+	rc = (jintLong)CallWindowProc((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
+	OS_NATIVE_EXIT(env, that, CallWindowProc_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CertNameToStrA
-JNIEXPORT jint JNICALL OS_NATIVE(CertNameToStrA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jbyteArray arg3, jint arg4)
-{
-	CERT_NAME_BLOB _arg1, *lparg1=NULL;
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CertNameToStrA_FUNC);
-	if (arg1) if ((lparg1 = getCERT_NAME_BLOBFields(env, arg1, &_arg1)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CertNameToStrA(arg0, (PCERT_NAME_BLOB)lparg1, arg2, (LPSTR)lparg3, arg4);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg1 && lparg1) setCERT_NAME_BLOBFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, CertNameToStrA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CertNameToStrW
-JNIEXPORT jint JNICALL OS_NATIVE(CertNameToStrW)
+#ifndef NO_CertNameToStr
+JNIEXPORT jint JNICALL OS_NATIVE(CertNameToStr)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jcharArray arg3, jint arg4)
 {
 	CERT_NAME_BLOB _arg1, *lparg1=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CertNameToStrW_FUNC);
+	OS_NATIVE_ENTER(env, that, CertNameToStr_FUNC);
 	if (arg1) if ((lparg1 = getCERT_NAME_BLOBFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CertNameToStrW(arg0, (PCERT_NAME_BLOB)lparg1, arg2, (LPWSTR)lparg3, arg4);
+	rc = (jint)CertNameToStr(arg0, (PCERT_NAME_BLOB)lparg1, arg2, (LPWSTR)lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) setCERT_NAME_BLOBFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, CertNameToStrW_FUNC);
+	OS_NATIVE_EXIT(env, that, CertNameToStr_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CharLowerA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerA)
+#ifndef NO_CharLower
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharLower)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CharLowerA_FUNC);
-	rc = (jintLong)CharLowerA((LPSTR)arg0);
-	OS_NATIVE_EXIT(env, that, CharLowerA_FUNC);
+	OS_NATIVE_ENTER(env, that, CharLower_FUNC);
+	rc = (jintLong)CharLower((LPWSTR)arg0);
+	OS_NATIVE_EXIT(env, that, CharLower_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CharLowerW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerW)
+#ifndef NO_CharUpper
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpper)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CharLowerW_FUNC);
-	rc = (jintLong)CharLowerW((LPWSTR)arg0);
-	OS_NATIVE_EXIT(env, that, CharLowerW_FUNC);
+	OS_NATIVE_ENTER(env, that, CharUpper_FUNC);
+	rc = (jintLong)CharUpper((LPWSTR)arg0);
+	OS_NATIVE_EXIT(env, that, CharUpper_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CharUpperA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperA)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CharUpperA_FUNC);
-	rc = (jintLong)CharUpperA((LPSTR)arg0);
-	OS_NATIVE_EXIT(env, that, CharUpperA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CharUpperW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperW)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CharUpperW_FUNC);
-	rc = (jintLong)CharUpperW((LPWSTR)arg0);
-	OS_NATIVE_EXIT(env, that, CharUpperW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ChooseColorA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseColorA)
+#ifndef NO_ChooseColor
+JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseColor)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	CHOOSECOLOR _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ChooseColorA_FUNC);
+	OS_NATIVE_ENTER(env, that, ChooseColor_FUNC);
 	if (arg0) if ((lparg0 = getCHOOSECOLORFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ChooseColorA(lparg0);
+	rc = (jboolean)ChooseColor((LPCHOOSECOLORW)lparg0);
 fail:
 	if (arg0 && lparg0) setCHOOSECOLORFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ChooseColorA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ChooseColorW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseColorW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	CHOOSECOLOR _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ChooseColorW_FUNC);
-	if (arg0) if ((lparg0 = getCHOOSECOLORFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ChooseColorW((LPCHOOSECOLORW)lparg0);
-fail:
-	if (arg0 && lparg0) setCHOOSECOLORFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ChooseColorW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ChooseFontA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseFontA)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	CHOOSEFONT _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ChooseFontA_FUNC);
-	if (arg0) if ((lparg0 = getCHOOSEFONTFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ChooseFontA(lparg0);
-fail:
-	if (arg0 && lparg0) setCHOOSEFONTFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ChooseFontA_FUNC);
+	OS_NATIVE_EXIT(env, that, ChooseColor_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_ChooseFontW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseFontW)
+#ifndef NO_ChooseFont
+JNIEXPORT jboolean JNICALL OS_NATIVE(ChooseFont)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	CHOOSEFONT _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ChooseFontW_FUNC);
+	OS_NATIVE_ENTER(env, that, ChooseFont_FUNC);
 	if (arg0) if ((lparg0 = getCHOOSEFONTFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ChooseFontW((LPCHOOSEFONTW)lparg0);
+	rc = (jboolean)ChooseFont((LPCHOOSEFONTW)lparg0);
 fail:
 	if (arg0 && lparg0) setCHOOSEFONTFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ChooseFontW_FUNC);
+	OS_NATIVE_EXIT(env, that, ChooseFont_FUNC);
 	return rc;
 }
 #endif
@@ -931,15 +723,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseThemeData_FUNC);
-/*
 	rc = (jint)CloseThemeData((HTHEME)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, CloseThemeData)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME))fp)((HTHEME)arg0);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, CloseThemeData_FUNC);
 	return rc;
 }
@@ -993,15 +777,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CoInternetIsFeatureEnabled_FUNC);
-/*
 	rc = (jint)CoInternetIsFeatureEnabled(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, CoInternetIsFeatureEnabled_FUNC);
 	return rc;
 }
@@ -1013,15 +789,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CoInternetSetFeatureEnabled_FUNC);
-/*
 	rc = (jint)CoInternetSetFeatureEnabled(arg0, arg1, (BOOL)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, BOOL))fp)(arg0, arg1, (BOOL)arg2);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, CoInternetSetFeatureEnabled_FUNC);
 	return rc;
 }
@@ -1085,80 +853,33 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CopyImage)
 }
 #endif
 
-#ifndef NO_CreateAcceleratorTableA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateAcceleratorTableA((LPACCEL)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateAcceleratorTableW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableW)
+#ifndef NO_CreateAcceleratorTable
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTable)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableW_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateAcceleratorTable_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateAcceleratorTableW((LPACCEL)lparg0, arg1);
+	rc = (jintLong)CreateAcceleratorTable((LPACCEL)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableW_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateAcceleratorTable_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateActCtxA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxA)
+#ifndef NO_CreateActCtx
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtx)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ACTCTX _arg0, *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateActCtxA_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateActCtx_FUNC);
 	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
-	rc = (jintLong)CreateActCtxA(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, CreateActCtxA)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
-		}
-	}
+	rc = (jintLong)CreateActCtx(lparg0);
 fail:
-	OS_NATIVE_EXIT(env, that, CreateActCtxA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateActCtxW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	ACTCTX _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateActCtxW_FUNC);
-	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
-	rc = (jintLong)CreateActCtxW(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, CreateActCtxW)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
-		}
-	}
-fail:
-	OS_NATIVE_EXIT(env, that, CreateActCtxW_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateActCtx_FUNC);
 	return rc;
 }
 #endif
@@ -1234,40 +955,21 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateDCA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateDCA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateDCA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)arg2, (CONST DEVMODE *)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, CreateDCA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateDCW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCW)
+#ifndef NO_CreateDC
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDC)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateDCW_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateDC_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateDCW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
+	rc = (jintLong)CreateDC((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, CreateDCW_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateDC_FUNC);
 	return rc;
 }
 #endif
@@ -1329,122 +1031,62 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateEnhMetaFileA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jbyteArray arg3)
-{
-	jbyte *lparg1=NULL;
-	RECT _arg2, *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateEnhMetaFileA((HDC)arg0, (LPCSTR)lparg1, lparg2, (LPCSTR)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, CreateEnhMetaFileA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateEnhMetaFileW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileW)
+#ifndef NO_CreateEnhMetaFile
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFile)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2, jcharArray arg3)
 {
 	jchar *lparg1=NULL;
 	RECT _arg2, *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileW_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateEnhMetaFile_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)CreateEnhMetaFileW((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
+	rc = (jintLong)CreateEnhMetaFile((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, CreateEnhMetaFileW_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO_CreateFontIndirectA__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectA__J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__I)(JNIEnv *env, jclass that, jintLong arg0)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__J)(JNIEnv *env, jclass that, jintLong arg0)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__J_FUNC);
-#endif
-	rc = (jintLong)CreateFontIndirectA((LPLOGFONTA)arg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	LOGFONTA _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
-	if (arg0) if ((lparg0 = getLOGFONTAFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)CreateFontIndirectA(lparg0);
-fail:
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateEnhMetaFile_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_CreateFontIndirectW__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectW__J) && defined(JNI64))
+#if (!defined(NO_CreateFontIndirect__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirect__J) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__I)(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__I)(JNIEnv *env, jclass that, jintLong arg0)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__J)(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__J)(JNIEnv *env, jclass that, jintLong arg0)
 #endif
 {
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__I_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateFontIndirect__I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__J_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateFontIndirect__J_FUNC);
 #endif
-	rc = (jintLong)CreateFontIndirectW((LPLOGFONTW)arg0);
+	rc = (jintLong)CreateFontIndirect((LPLOGFONTW)arg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__I_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateFontIndirect__I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__J_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateFontIndirect__J_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2)
+#ifndef NO_CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
-	LOGFONTW _arg0, *lparg0=NULL;
+	LOGFONT _arg0, *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
-	if (arg0) if ((lparg0 = getLOGFONTWFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)CreateFontIndirectW(lparg0);
+	OS_NATIVE_ENTER(env, that, CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
+	if (arg0) if ((lparg0 = getLOGFONTFields(env, arg0, &_arg0)) == NULL) goto fail;
+	rc = (jintLong)CreateFontIndirect(lparg0);
 fail:
-	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
 	return rc;
 }
 #endif
@@ -1544,40 +1186,21 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePopupMenu)
 }
 #endif
 
-#ifndef NO_CreateProcessA
-JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessA)
+#ifndef NO_CreateProcess
+JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcess)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
 {
 	STARTUPINFO _arg8, *lparg8=NULL;
 	PROCESS_INFORMATION _arg9, *lparg9=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateProcessA_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateProcess_FUNC);
 	if (arg8) if ((lparg8 = getSTARTUPINFOFields(env, arg8, &_arg8)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = getPROCESS_INFORMATIONFields(env, arg9, &_arg9)) == NULL) goto fail;
-	rc = (jboolean)CreateProcessA((LPCSTR)arg0, (LPSTR)arg1, (LPSECURITY_ATTRIBUTES)arg2, (LPSECURITY_ATTRIBUTES)arg3, arg4, arg5, (LPVOID)arg6, (LPSTR)arg7, (LPSTARTUPINFOA)lparg8, (LPPROCESS_INFORMATION)lparg9);
+	rc = (jboolean)CreateProcess((LPCWSTR)arg0, (LPWSTR)arg1, (LPSECURITY_ATTRIBUTES)arg2, (LPSECURITY_ATTRIBUTES)arg3, arg4, arg5, (LPVOID)arg6, (LPWSTR)arg7, (LPSTARTUPINFOW)lparg8, (LPPROCESS_INFORMATION)lparg9);
 fail:
 	if (arg9 && lparg9) setPROCESS_INFORMATIONFields(env, arg9, lparg9);
 	if (arg8 && lparg8) setSTARTUPINFOFields(env, arg8, lparg8);
-	OS_NATIVE_EXIT(env, that, CreateProcessA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateProcessW
-JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
-{
-	STARTUPINFO _arg8, *lparg8=NULL;
-	PROCESS_INFORMATION _arg9, *lparg9=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateProcessW_FUNC);
-	if (arg8) if ((lparg8 = getSTARTUPINFOFields(env, arg8, &_arg8)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = getPROCESS_INFORMATIONFields(env, arg9, &_arg9)) == NULL) goto fail;
-	rc = (jboolean)CreateProcessW((LPCWSTR)arg0, (LPWSTR)arg1, (LPSECURITY_ATTRIBUTES)arg2, (LPSECURITY_ATTRIBUTES)arg3, arg4, arg5, (LPVOID)arg6, (LPWSTR)arg7, (LPSTARTUPINFOW)lparg8, (LPPROCESS_INFORMATION)lparg9);
-fail:
-	if (arg9 && lparg9) setPROCESS_INFORMATIONFields(env, arg9, lparg9);
-	if (arg8 && lparg8) setSTARTUPINFOFields(env, arg8, lparg8);
-	OS_NATIVE_EXIT(env, that, CreateProcessW_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateProcess_FUNC);
 	return rc;
 }
 #endif
@@ -1622,70 +1245,36 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateWindowExA
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
-{
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-	CREATESTRUCT _arg11, *lparg11=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateWindowExA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jintLong)CreateWindowExA(arg0, (LPSTR)lparg1, lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
-fail:
-	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, CreateWindowExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CreateWindowExW
-JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExW)
+#ifndef NO_CreateWindowEx
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowEx)
 	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
 	CREATESTRUCT _arg11, *lparg11=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, CreateWindowExW_FUNC);
+	OS_NATIVE_ENTER(env, that, CreateWindowEx_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jintLong)CreateWindowExW(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
+	rc = (jintLong)CreateWindowEx(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
 fail:
 	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, CreateWindowExW_FUNC);
+	OS_NATIVE_EXIT(env, that, CreateWindowEx_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_DEVMODEA_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(DEVMODEA_1sizeof)
+#ifndef NO_DEVMODE_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(DEVMODE_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DEVMODEA_1sizeof_FUNC);
-	rc = (jint)DEVMODEA_sizeof();
-	OS_NATIVE_EXIT(env, that, DEVMODEA_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DEVMODEW_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(DEVMODEW_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DEVMODEW_1sizeof_FUNC);
-	rc = (jint)DEVMODEW_sizeof();
-	OS_NATIVE_EXIT(env, that, DEVMODEW_1sizeof_FUNC);
+	OS_NATIVE_ENTER(env, that, DEVMODE_1sizeof_FUNC);
+	rc = (jint)DEVMODE_sizeof();
+	OS_NATIVE_EXIT(env, that, DEVMODE_1sizeof_FUNC);
 	return rc;
 }
 #endif
@@ -1762,74 +1351,38 @@ JNIEXPORT jint JNICALL OS_NATIVE(DTTOPTS_1sizeof)
 }
 #endif
 
-#ifndef NO_DefFrameProcA
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcA)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefFrameProcA_FUNC);
-	rc = (jintLong)DefFrameProcA((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
-	OS_NATIVE_EXIT(env, that, DefFrameProcA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DefFrameProcW
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcW)
+#ifndef NO_DefFrameProc
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProc)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefFrameProcW_FUNC);
-	rc = (jintLong)DefFrameProcW((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
-	OS_NATIVE_EXIT(env, that, DefFrameProcW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DefMDIChildProcA
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefMDIChildProcA_FUNC);
-	rc = (jintLong)DefMDIChildProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, DefMDIChildProcA_FUNC);
+	OS_NATIVE_ENTER(env, that, DefFrameProc_FUNC);
+	rc = (jintLong)DefFrameProc((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
+	OS_NATIVE_EXIT(env, that, DefFrameProc_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_DefMDIChildProcW
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcW)
+#ifndef NO_DefMDIChildProc
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProc)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefMDIChildProcW_FUNC);
-	rc = (jintLong)DefMDIChildProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, DefMDIChildProcW_FUNC);
+	OS_NATIVE_ENTER(env, that, DefMDIChildProc_FUNC);
+	rc = (jintLong)DefMDIChildProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	OS_NATIVE_EXIT(env, that, DefMDIChildProc_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_DefWindowProcA
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcA)
+#ifndef NO_DefWindowProc
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProc)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefWindowProcA_FUNC);
-	rc = (jintLong)DefWindowProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, DefWindowProcA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DefWindowProcW
-JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DefWindowProcW_FUNC);
-	rc = (jintLong)DefWindowProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, DefWindowProcW_FUNC);
+	OS_NATIVE_ENTER(env, that, DefWindowProc_FUNC);
+	rc = (jintLong)DefWindowProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	OS_NATIVE_EXIT(env, that, DefWindowProc_FUNC);
 	return rc;
 }
 #endif
@@ -1966,66 +1519,34 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow)
 }
 #endif
 
-#ifndef NO_DispatchMessageA
-JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageA)
+#ifndef NO_DispatchMessage
+JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessage)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	MSG _arg0, *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DispatchMessageA_FUNC);
+	OS_NATIVE_ENTER(env, that, DispatchMessage_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)DispatchMessageA(lparg0);
+	rc = (jintLong)DispatchMessage(lparg0);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, DispatchMessageA_FUNC);
+	OS_NATIVE_EXIT(env, that, DispatchMessage_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_DispatchMessageW
-JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	MSG _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, DispatchMessageW_FUNC);
-	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)DispatchMessageW(lparg0);
-fail:
-	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, DispatchMessageW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DocumentPropertiesA
-JNIEXPORT jint JNICALL OS_NATIVE(DocumentPropertiesA)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3, jintLong arg4, jint arg5)
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DocumentPropertiesA_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)DocumentPropertiesA((HWND)arg0, (HANDLE)arg1, (LPTSTR)lparg2, (PDEVMODE)arg3, (PDEVMODE)arg4, arg5);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, DocumentPropertiesA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DocumentPropertiesW
-JNIEXPORT jint JNICALL OS_NATIVE(DocumentPropertiesW)
+#ifndef NO_DocumentProperties
+JNIEXPORT jint JNICALL OS_NATIVE(DocumentProperties)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jintLong arg4, jint arg5)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DocumentPropertiesW_FUNC);
+	OS_NATIVE_ENTER(env, that, DocumentProperties_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)DocumentPropertiesW((HWND)arg0, (HANDLE)arg1, (LPWSTR)lparg2, (PDEVMODEW)arg3, (PDEVMODEW)arg4, arg5);
+	rc = (jint)DocumentProperties((HWND)arg0, (HANDLE)arg1, (LPWSTR)lparg2, (PDEVMODEW)arg3, (PDEVMODEW)arg4, arg5);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, DocumentPropertiesW_FUNC);
+	OS_NATIVE_EXIT(env, that, DocumentProperties_FUNC);
 	return rc;
 }
 #endif
@@ -2056,34 +1577,18 @@ JNIEXPORT void JNICALL OS_NATIVE(DragFinish)
 }
 #endif
 
-#ifndef NO_DragQueryFileA
-JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DragQueryFileA_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)DragQueryFileA((HDROP)arg0, arg1, (LPTSTR)lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, DragQueryFileA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DragQueryFileW
-JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileW)
+#ifndef NO_DragQueryFile
+JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFile)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DragQueryFileW_FUNC);
+	OS_NATIVE_ENTER(env, that, DragQueryFile_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)DragQueryFileW((HDROP)arg0, arg1, (LPWSTR)lparg2, arg3);
+	rc = (jint)DragQueryFile((HDROP)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, DragQueryFileW_FUNC);
+	OS_NATIVE_EXIT(env, that, DragQueryFile_FUNC);
 	return rc;
 }
 #endif
@@ -2160,40 +1665,21 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar)
 }
 #endif
 
-#ifndef NO_DrawTextA
-JNIEXPORT jint JNICALL OS_NATIVE(DrawTextA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3, jint arg4)
-{
-	jbyte *lparg1=NULL;
-	RECT _arg3, *lparg3=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DrawTextA_FUNC);
-	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)DrawTextA((HDC)arg0, (LPSTR)lparg1, arg2, lparg3, arg4);
-fail:
-		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, DrawTextA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_DrawTextW
-JNIEXPORT jint JNICALL OS_NATIVE(DrawTextW)
+#ifndef NO_DrawText
+JNIEXPORT jint JNICALL OS_NATIVE(DrawText)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4)
 {
 	jchar *lparg1=NULL;
 	RECT _arg3, *lparg3=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DrawTextW_FUNC);
+	OS_NATIVE_ENTER(env, that, DrawText_FUNC);
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)DrawTextW((HDC)arg0, (LPWSTR)lparg1, arg2, lparg3, arg4);
+	rc = (jint)DrawText((HDC)arg0, (LPWSTR)lparg1, arg2, lparg3, arg4);
 fail:
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, DrawTextW_FUNC);
+	OS_NATIVE_EXIT(env, that, DrawText_FUNC);
 	return rc;
 }
 #endif
@@ -2208,15 +1694,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground)
 	OS_NATIVE_ENTER(env, that, DrawThemeBackground_FUNC);
 	if (arg4) if ((lparg4 = getRECTFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getRECTFields(env, arg5, &_arg5)) == NULL) goto fail;
-/*
 	rc = (jint)DrawThemeBackground((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, DrawThemeBackground)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME, HDC, jint, jint, const RECT *, const RECT *))fp)((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
-		}
-	}
 fail:
 	if (arg5 && lparg5) setRECTFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setRECTFields(env, arg4, lparg4);
@@ -2235,15 +1713,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
 	OS_NATIVE_ENTER(env, that, DrawThemeText_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = getRECTFields(env, arg8, &_arg8)) == NULL) goto fail;
-/*
-	rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, DrawThemeText)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
-		}
-	}
+	rc = (jint)DrawThemeText((HTHEME)arg0, (HDC)arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
 fail:
 	if (arg8 && lparg8) setRECTFields(env, arg8, lparg8);
 	if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
@@ -2358,15 +1828,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndBufferedPaint_FUNC);
-/*
 	rc = (jint)EndBufferedPaint((HPAINTBUFFER)arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, EndBufferedPaint)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, jboolean))fp)((HPAINTBUFFER)arg0, arg1);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, EndBufferedPaint_FUNC);
 	return rc;
 }
@@ -2432,15 +1894,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumDisplayMonitors_FUNC);
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
 	rc = (jboolean)EnumDisplayMonitors((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, EnumDisplayMonitors)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, LPCRECT, MONITORENUMPROC, LPARAM))fp)((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
-		}
-	}
 fail:
 	if (arg1 && lparg1) setRECTFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, EnumDisplayMonitors_FUNC);
@@ -2464,98 +1918,42 @@ fail:
 }
 #endif
 
-#ifndef NO_EnumFontFamiliesA
-JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumFontFamiliesA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)EnumFontFamiliesA((HDC)arg0, (LPSTR)lparg1, (FONTENUMPROC)arg2, (LPARAM)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, EnumFontFamiliesA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_EnumFontFamiliesW
-JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesW)
+#ifndef NO_EnumFontFamilies
+JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamilies)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumFontFamiliesW_FUNC);
+	OS_NATIVE_ENTER(env, that, EnumFontFamilies_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)EnumFontFamiliesW((HDC)arg0, (LPCWSTR)lparg1, (FONTENUMPROCW)arg2, (LPARAM)arg3);
+	rc = (jint)EnumFontFamilies((HDC)arg0, (LPCWSTR)lparg1, (FONTENUMPROCW)arg2, (LPARAM)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, EnumFontFamiliesW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_EnumSystemLanguageGroupsA
-JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsA_FUNC);
-/*
-	rc = (jboolean)EnumSystemLanguageGroupsA((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCA, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsA_FUNC);
+	OS_NATIVE_EXIT(env, that, EnumFontFamilies_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_EnumSystemLanguageGroupsW
-JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
+#ifndef NO_EnumSystemLanguageGroups
+JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroups)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsW_FUNC);
-/*
-	rc = (jboolean)EnumSystemLanguageGroupsW((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCW, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsW_FUNC);
+	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroups_FUNC);
+	rc = (jboolean)EnumSystemLanguageGroups((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
+	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroups_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_EnumSystemLocalesA
-JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesA)
+#ifndef NO_EnumSystemLocales
+JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocales)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumSystemLocalesA_FUNC);
-	rc = (jboolean)EnumSystemLocalesA((LOCALE_ENUMPROCA)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, EnumSystemLocalesA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_EnumSystemLocalesW
-JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, EnumSystemLocalesW_FUNC);
-	rc = (jboolean)EnumSystemLocalesW((LOCALE_ENUMPROCW)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, EnumSystemLocalesW_FUNC);
+	OS_NATIVE_ENTER(env, that, EnumSystemLocales_FUNC);
+	rc = (jboolean)EnumSystemLocales((LOCALE_ENUMPROCW)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, EnumSystemLocales_FUNC);
 	return rc;
 }
 #endif
@@ -2589,40 +1987,21 @@ JNIEXPORT jint JNICALL OS_NATIVE(ExcludeClipRect)
 }
 #endif
 
-#ifndef NO_ExpandEnvironmentStringsA
-JNIEXPORT jint JNICALL OS_NATIVE(ExpandEnvironmentStringsA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ExpandEnvironmentStringsA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)ExpandEnvironmentStringsA(lparg0, lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, ExpandEnvironmentStringsA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ExpandEnvironmentStringsW
-JNIEXPORT jint JNICALL OS_NATIVE(ExpandEnvironmentStringsW)
+#ifndef NO_ExpandEnvironmentStrings
+JNIEXPORT jint JNICALL OS_NATIVE(ExpandEnvironmentStrings)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ExpandEnvironmentStringsW_FUNC);
+	OS_NATIVE_ENTER(env, that, ExpandEnvironmentStrings_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)ExpandEnvironmentStringsW(lparg0, lparg1, arg2);
+	rc = (jint)ExpandEnvironmentStrings(lparg0, lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, ExpandEnvironmentStringsW_FUNC);
+	OS_NATIVE_EXIT(env, that, ExpandEnvironmentStrings_FUNC);
 	return rc;
 }
 #endif
@@ -2665,88 +2044,45 @@ fail:
 }
 #endif
 
-#ifndef NO_ExtTextOutA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jbyteArray arg5, jint arg6, jintArray arg7)
-{
-	RECT _arg4, *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jint *lparg7=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ExtTextOutA_FUNC);
-	if (arg4) if ((lparg4 = getRECTFields(env, arg4, &_arg4)) == NULL) goto fail;
-		if (arg5) if ((lparg5 = (*env)->GetPrimitiveArrayCritical(env, arg5, NULL)) == NULL) goto fail;
-		if (arg7) if ((lparg7 = (*env)->GetPrimitiveArrayCritical(env, arg7, NULL)) == NULL) goto fail;
-	rc = (jboolean)ExtTextOutA((HDC)arg0, arg1, arg2, arg3, lparg4, (LPSTR)lparg5, arg6, (CONST INT *)lparg7);
-fail:
-		if (arg7 && lparg7) (*env)->ReleasePrimitiveArrayCritical(env, arg7, lparg7, JNI_ABORT);
-		if (arg5 && lparg5) (*env)->ReleasePrimitiveArrayCritical(env, arg5, lparg5, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, ExtTextOutA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ExtTextOutW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutW)
+#ifndef NO_ExtTextOut
+JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOut)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jint *lparg7=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ExtTextOutW_FUNC);
+	OS_NATIVE_ENTER(env, that, ExtTextOut_FUNC);
 	if (arg4) if ((lparg4 = getRECTFields(env, arg4, &_arg4)) == NULL) goto fail;
 		if (arg5) if ((lparg5 = (*env)->GetPrimitiveArrayCritical(env, arg5, NULL)) == NULL) goto fail;
 		if (arg7) if ((lparg7 = (*env)->GetPrimitiveArrayCritical(env, arg7, NULL)) == NULL) goto fail;
-	rc = (jboolean)ExtTextOutW((HDC)arg0, arg1, arg2, arg3, lparg4, (LPWSTR)lparg5, arg6, (CONST INT *)lparg7);
+	rc = (jboolean)ExtTextOut((HDC)arg0, arg1, arg2, arg3, lparg4, (LPWSTR)lparg5, arg6, (CONST INT *)lparg7);
 fail:
 		if (arg7 && lparg7) (*env)->ReleasePrimitiveArrayCritical(env, arg7, lparg7, JNI_ABORT);
 		if (arg5 && lparg5) (*env)->ReleasePrimitiveArrayCritical(env, arg5, lparg5, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, ExtTextOutW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ExtractIconExA
-JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ExtractIconExA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)ExtractIconExA((LPSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, ExtractIconExA_FUNC);
+	OS_NATIVE_EXIT(env, that, ExtTextOut_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_ExtractIconExW
-JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExW)
+#ifndef NO_ExtractIconEx
+JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconEx)
 	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
 	jintLong *lparg2=NULL;
 	jintLong *lparg3=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ExtractIconExW_FUNC);
+	OS_NATIVE_ENTER(env, that, ExtractIconEx_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)ExtractIconExW((LPWSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
+	rc = (jint)ExtractIconEx((LPWSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, ExtractIconExW_FUNC);
+	OS_NATIVE_EXIT(env, that, ExtractIconEx_FUNC);
 	return rc;
 }
 #endif
@@ -2821,34 +2157,18 @@ fail:
 }
 #endif
 
-#ifndef NO_FormatMessageA
-JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageA)
-	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
-{
-	jintLong *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, FormatMessageA_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)FormatMessageA(arg0, (LPCVOID)arg1, arg2, arg3, (LPSTR)lparg4, arg5, (va_list*)arg6);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, FormatMessageA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_FormatMessageW
-JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageW)
+#ifndef NO_FormatMessage
+JNIEXPORT jint JNICALL OS_NATIVE(FormatMessage)
 	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
 {
 	jintLong *lparg4=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, FormatMessageW_FUNC);
+	OS_NATIVE_ENTER(env, that, FormatMessage_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)FormatMessageW(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6);
+	rc = (jint)FormatMessage(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, FormatMessageW_FUNC);
+	OS_NATIVE_EXIT(env, that, FormatMessage_FUNC);
 	return rc;
 }
 #endif
@@ -3037,174 +2357,88 @@ fail:
 }
 #endif
 
-#ifndef NO_GetCharABCWidthsA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
-{
-	jint *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharABCWidthsA_FUNC);
-		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetCharABCWidthsA((HDC)arg0, arg1, arg2, (LPABC)lparg3);
-fail:
-		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, GetCharABCWidthsA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetCharABCWidthsW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsW)
+#ifndef NO_GetCharABCWidths
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidths)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharABCWidthsW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetCharABCWidths_FUNC);
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetCharABCWidthsW((HDC)arg0, arg1, arg2, (LPABC)lparg3);
+	rc = (jboolean)GetCharABCWidths((HDC)arg0, arg1, arg2, (LPABC)lparg3);
 fail:
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, GetCharABCWidthsW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetCharABCWidths_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetCharWidthA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthA)
+#ifndef NO_GetCharWidth
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidth)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharWidthA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetCharWidth_FUNC);
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetCharWidthA((HDC)arg0, arg1, arg2, (LPINT)lparg3);
+	rc = (jboolean)GetCharWidth((HDC)arg0, arg1, arg2, (LPINT)lparg3);
 fail:
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, GetCharWidthA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetCharWidth_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetCharWidthW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
-{
-	jint *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharWidthW_FUNC);
-		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetCharWidthW((HDC)arg0, arg1, arg2, (LPINT)lparg3);
-fail:
-		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, GetCharWidthW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetCharacterPlacementA
-JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
-{
-	jbyte *lparg1=NULL;
-	GCP_RESULTS _arg4, *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharacterPlacementA_FUNC);
-	if (arg4) if ((lparg4 = getGCP_RESULTSFields(env, arg4, &_arg4)) == NULL) goto fail;
-		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetCharacterPlacementA((HDC)arg0, (LPSTR)lparg1, arg2, arg3, lparg4, arg5);
-fail:
-		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	if (arg4 && lparg4) setGCP_RESULTSFields(env, arg4, lparg4);
-	OS_NATIVE_EXIT(env, that, GetCharacterPlacementA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetCharacterPlacementW
-JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementW)
+#ifndef NO_GetCharacterPlacement
+JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacement)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
 {
 	jchar *lparg1=NULL;
 	GCP_RESULTS _arg4, *lparg4=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetCharacterPlacementW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetCharacterPlacement_FUNC);
 	if (arg4) if ((lparg4 = getGCP_RESULTSFields(env, arg4, &_arg4)) == NULL) goto fail;
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetCharacterPlacementW((HDC)arg0, (LPWSTR)lparg1, arg2, arg3, (LPGCP_RESULTSW)lparg4, arg5);
+	rc = (jint)GetCharacterPlacement((HDC)arg0, (LPWSTR)lparg1, arg2, arg3, (LPGCP_RESULTSW)lparg4, arg5);
 fail:
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
 	if (arg4 && lparg4) setGCP_RESULTSFields(env, arg4, lparg4);
-	OS_NATIVE_EXIT(env, that, GetCharacterPlacementW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetCharacterPlacement_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetClassInfoA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
-{
-	jbyte *lparg1=NULL;
-	WNDCLASS _arg2, *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClassInfoA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getWNDCLASSFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)GetClassInfoA((HINSTANCE)arg0, (LPSTR)lparg1, lparg2);
-fail:
-	if (arg2 && lparg2) setWNDCLASSFields(env, arg2, lparg2);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClassInfoA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetClassInfoW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoW)
+#ifndef NO_GetClassInfo
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfo)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2)
 {
 	jchar *lparg1=NULL;
 	WNDCLASS _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClassInfoW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetClassInfo_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getWNDCLASSFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)GetClassInfoW((HINSTANCE)arg0, (LPWSTR)lparg1, (LPWNDCLASSW)lparg2);
+	rc = (jboolean)GetClassInfo((HINSTANCE)arg0, (LPWSTR)lparg1, (LPWNDCLASSW)lparg2);
 fail:
 	if (arg2 && lparg2) setWNDCLASSFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClassInfoW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetClassNameA
-JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClassNameA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetClassNameA((HWND)arg0, lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClassNameA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetClassInfo_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetClassNameW
-JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameW)
+#ifndef NO_GetClassName
+JNIEXPORT jint JNICALL OS_NATIVE(GetClassName)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClassNameW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetClassName_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetClassNameW((HWND)arg0, lparg1, arg2);
+	rc = (jint)GetClassName((HWND)arg0, lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClassNameW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetClassName_FUNC);
 	return rc;
 }
 #endif
@@ -3265,34 +2499,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetClipboardData)
 }
 #endif
 
-#ifndef NO_GetClipboardFormatNameA
-JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardFormatNameA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClipboardFormatNameA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetClipboardFormatNameA(arg0, lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClipboardFormatNameA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetClipboardFormatNameW
-JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardFormatNameW)
+#ifndef NO_GetClipboardFormatName
+JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardFormatName)
 	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetClipboardFormatNameW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetClipboardFormatName_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetClipboardFormatNameW(arg0, (LPWSTR)lparg1, arg2);
+	rc = (jint)GetClipboardFormatName(arg0, (LPWSTR)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetClipboardFormatNameW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetClipboardFormatName_FUNC);
 	return rc;
 }
 #endif
@@ -3305,15 +2523,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GetComboBoxInfo_FUNC);
 	if (arg1) if ((lparg1 = getCOMBOBOXINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
 	rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetComboBoxInfo)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, COMBOBOXINFO *))fp)((HWND)arg0, lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) setCOMBOBOXINFOFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, GetComboBoxInfo_FUNC);
@@ -3643,21 +2853,21 @@ fail:
 }
 #endif
 
-#ifndef NO_GetGlyphIndicesW
-JNIEXPORT jint JNICALL OS_NATIVE(GetGlyphIndicesW)
+#ifndef NO_GetGlyphIndices
+JNIEXPORT jint JNICALL OS_NATIVE(GetGlyphIndices)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jshortArray arg3, jint arg4)
 {
 	jchar *lparg1=NULL;
 	jshort *lparg3=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetGlyphIndicesW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetGlyphIndices_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)GetGlyphIndicesW((HDC)arg0, lparg1, arg2, (LPWORD)lparg3, arg4);
+	rc = (jint)GetGlyphIndices((HDC)arg0, lparg1, arg2, (LPWORD)lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetGlyphIndicesW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetGlyphIndices_FUNC);
 	return rc;
 }
 #endif
@@ -3782,15 +2992,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes)
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
 	rc = (jboolean)GetLayeredWindowAttributes((HWND)arg0, lparg1, lparg2, lparg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetLayeredWindowAttributes)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint *, jbyte *, jint *))fp)((HWND)arg0, lparg1, lparg2, lparg3);
-		}
-	}
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
@@ -3806,48 +3008,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetLayout_FUNC);
-/*
 	rc = (jint)GetLayout((HDC)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetLayout)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HDC))fp)((HDC)arg0);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, GetLayout_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetLocaleInfoA
-JNIEXPORT jint JNICALL OS_NATIVE(GetLocaleInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetLocaleInfoA_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)GetLocaleInfoA(arg0, arg1, (LPSTR)lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, GetLocaleInfoA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetLocaleInfoW
-JNIEXPORT jint JNICALL OS_NATIVE(GetLocaleInfoW)
+#ifndef NO_GetLocaleInfo
+JNIEXPORT jint JNICALL OS_NATIVE(GetLocaleInfo)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetLocaleInfoW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetLocaleInfo_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)GetLocaleInfoW(arg0, arg1, (LPWSTR)lparg2, arg3);
+	rc = (jint)GetLocaleInfo(arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, GetLocaleInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetLocaleInfo_FUNC);
 	return rc;
 }
 #endif
@@ -3872,15 +3050,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuBarInfo_FUNC);
 	if (arg3) if ((lparg3 = getMENUBARINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-/*
-	rc = (jboolean)GetMenuBarInfo(arg0, arg1, arg2, lparg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetMenuBarInfo)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, MENUBARINFO *))fp)(arg0, arg1, arg2, lparg3);
-		}
-	}
+	rc = (jboolean)GetMenuBarInfo((HWND)arg0, arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setMENUBARINFOFields(env, arg3, lparg3);
 	OS_NATIVE_EXIT(env, that, GetMenuBarInfo_FUNC);
@@ -3908,15 +3078,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuInfo_FUNC);
 	if (arg1) if ((lparg1 = getMENUINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
 	rc = (jboolean)GetMenuInfo((HMENU)arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetMenuInfo)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) setMENUINFOFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, GetMenuInfo_FUNC);
@@ -3936,34 +3098,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount)
 }
 #endif
 
-#ifndef NO_GetMenuItemInfoA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoA)
+#ifndef NO_GetMenuItemInfo
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfo)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMenuItemInfoA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetMenuItemInfo_FUNC);
 	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)GetMenuItemInfoA((HMENU)arg0, arg1, arg2, lparg3);
+	rc = (jboolean)GetMenuItemInfo((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
 fail:
 	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, GetMenuItemInfoA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetMenuItemInfoW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
-{
-	MENUITEMINFO _arg3, *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMenuItemInfoW_FUNC);
-	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)GetMenuItemInfoW((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
-fail:
-	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, GetMenuItemInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetMenuItemInfo_FUNC);
 	return rc;
 }
 #endif
@@ -3984,18 +3130,18 @@ fail:
 }
 #endif
 
-#ifndef NO_GetMessageA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageA)
+#ifndef NO_GetMessage
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessage)
 	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMessageA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetMessage_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetMessageA(lparg0, (HWND)arg1, arg2, arg3);
+	rc = (jboolean)GetMessage(lparg0, (HWND)arg1, arg2, arg3);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetMessageA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetMessage_FUNC);
 	return rc;
 }
 #endif
@@ -4024,22 +3170,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMessageTime)
 }
 #endif
 
-#ifndef NO_GetMessageW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageW)
-	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	MSG _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMessageW_FUNC);
-	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetMessageW(lparg0, (HWND)arg1, arg2, arg3);
-fail:
-	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetMessageW_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_GetMetaRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
@@ -4052,114 +3182,50 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
 }
 #endif
 
-#ifndef NO_GetModuleFileNameA
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetModuleFileNameA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleFileNameA((HMODULE)arg0, (LPSTR)lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetModuleFileNameA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetModuleFileNameW
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameW)
+#ifndef NO_GetModuleFileName
+JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileName)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetModuleFileNameW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetModuleFileName_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleFileNameW((HMODULE)arg0, (LPWSTR)lparg1, arg2);
+	rc = (jint)GetModuleFileName((HMODULE)arg0, (LPWSTR)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetModuleFileNameW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetModuleFileName_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetModuleHandleA
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleA)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetModuleHandleA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)GetModuleHandleA((LPSTR)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GetModuleHandleA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetModuleHandleW
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleW)
+#ifndef NO_GetModuleHandle
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandle)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetModuleHandleW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetModuleHandle_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)GetModuleHandleW((LPWSTR)lparg0);
+	rc = (jintLong)GetModuleHandle((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GetModuleHandleW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetMonitorInfoA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	MONITORINFO _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMonitorInfoA_FUNC);
-	if (arg1) if ((lparg1 = getMONITORINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	rc = (jboolean)GetMonitorInfoA((HMONITOR)arg0, (LPMONITORINFO)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetMonitorInfoA)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setMONITORINFOFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, GetMonitorInfoA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetModuleHandle_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetMonitorInfoW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW)
+#ifndef NO_GetMonitorInfo
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfo)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MONITORINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetMonitorInfoW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetMonitorInfo_FUNC);
 	if (arg1) if ((lparg1 = getMONITORINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	rc = (jboolean)GetMonitorInfoW((HMONITOR)arg0, (LPMONITORINFO)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetMonitorInfoW)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
-		}
-	}
+	rc = (jboolean)GetMonitorInfo((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 fail:
 	if (arg1 && lparg1) setMONITORINFOFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, GetMonitorInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetMonitorInfo_FUNC);
 	return rc;
 }
 #endif
@@ -4176,328 +3242,165 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
 }
 #endif
 
-#if (!defined(NO_GetObjectA__III) && !defined(JNI64)) || (!defined(NO_GetObjectA__JIJ) && defined(JNI64))
+#if (!defined(NO_GetObject__III) && !defined(JNI64)) || (!defined(NO_GetObject__JIJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 #endif
 {
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectA__III_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__III_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, GetObjectA__JIJ_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__JIJ_FUNC);
 #endif
-	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+	rc = (jint)GetObject((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectA__III_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__III_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, GetObjectA__JIJ_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__JIJ_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
+#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #endif
 {
 	BITMAP _arg2, *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
 #endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
+	rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
+#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #endif
 {
 	DIBSECTION _arg2, *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
 #endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
+	rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
+#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #endif
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
 #endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
+	rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#endif
-{
-	LOGFONTA _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
-#endif
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setLOGFONTAFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_GetObjectW__III) && !defined(JNI64)) || (!defined(NO_GetObjectW__JIJ) && defined(JNI64))
+#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 #endif
 {
+	LOGFONT _arg2, *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectW__III_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, GetObjectW__JIJ_FUNC);
-#endif
-	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectW__III_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, GetObjectW__JIJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#endif
-{
-	BITMAP _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
 #endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
+	rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2);
 fail:
-	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
+	if (arg2 && lparg2) setLOGFONTFields(env, arg2, lparg2);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+	OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#endif
-{
-	DIBSECTION _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
-#endif
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#endif
-{
-	LOGBRUSH _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#endif
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-#endif
-{
-	LOGFONTW _arg2, *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
-#endif
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setLOGFONTWFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO_GetOpenFileNameA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetOpenFileNameA)
+#ifndef NO_GetOpenFileName
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetOpenFileName)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	OPENFILENAME _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetOpenFileNameA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetOpenFileName_FUNC);
 	if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetOpenFileNameA(lparg0);
+	rc = (jboolean)GetOpenFileName((LPOPENFILENAMEW)lparg0);
 fail:
 	if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetOpenFileNameA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetOpenFileName_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetOpenFileNameW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetOpenFileNameW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	OPENFILENAME _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetOpenFileNameW_FUNC);
-	if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetOpenFileNameW((LPOPENFILENAMEW)lparg0);
-fail:
-	if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetOpenFileNameW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetOutlineTextMetricsA
-JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsA)
+#ifndef NO_GetOutlineTextMetrics
+JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetrics)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
-	OUTLINETEXTMETRICA _arg2, *lparg2=NULL;
+	OUTLINETEXTMETRIC _arg2, *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetOutlineTextMetricsA_FUNC);
-	if (arg2) if ((lparg2 = getOUTLINETEXTMETRICAFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)GetOutlineTextMetricsA((HDC)arg0, arg1, lparg2);
+	OS_NATIVE_ENTER(env, that, GetOutlineTextMetrics_FUNC);
+	if (arg2) if ((lparg2 = getOUTLINETEXTMETRICFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jint)GetOutlineTextMetrics((HDC)arg0, arg1, lparg2);
 fail:
-	if (arg2 && lparg2) setOUTLINETEXTMETRICAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, GetOutlineTextMetricsA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetOutlineTextMetricsW
-JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-{
-	OUTLINETEXTMETRICW _arg2, *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetOutlineTextMetricsW_FUNC);
-	if (arg2) if ((lparg2 = getOUTLINETEXTMETRICWFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)GetOutlineTextMetricsW((HDC)arg0, arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setOUTLINETEXTMETRICWFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, GetOutlineTextMetricsW_FUNC);
+	if (arg2 && lparg2) setOUTLINETEXTMETRICFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, GetOutlineTextMetrics_FUNC);
 	return rc;
 }
 #endif
@@ -4566,33 +3469,8 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcessHeap)
 }
 #endif
 
-#ifndef NO_GetProfileStringA
-JNIEXPORT jint JNICALL OS_NATIVE(GetProfileStringA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetProfileStringA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)GetProfileStringA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)lparg2, (LPSTR)lparg3, arg4);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GetProfileStringA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetProfileStringW
-JNIEXPORT jint JNICALL OS_NATIVE(GetProfileStringW)
+#ifndef NO_GetProfileString
+JNIEXPORT jint JNICALL OS_NATIVE(GetProfileString)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jcharArray arg2, jcharArray arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
@@ -4600,42 +3478,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetProfileStringW)
 	jchar *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetProfileStringW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetProfileString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)GetProfileStringW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)lparg2, (LPWSTR)lparg3, arg4);
+	rc = (jint)GetProfileString((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)lparg2, (LPWSTR)lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GetProfileStringW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetProfileString_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetPropA
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropA)
+#ifndef NO_GetProp
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetProp)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetPropA_FUNC);
-	rc = (jintLong)GetPropA((HWND)arg0, (LPCTSTR)arg1);
-	OS_NATIVE_EXIT(env, that, GetPropA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetPropW
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetPropW_FUNC);
-	rc = (jintLong)GetPropW((HWND)arg0, (LPCWSTR)arg1);
-	OS_NATIVE_EXIT(env, that, GetPropW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetProp_FUNC);
+	rc = (jintLong)GetProp((HWND)arg0, (LPCWSTR)arg1);
+	OS_NATIVE_EXIT(env, that, GetProp_FUNC);
 	return rc;
 }
 #endif
@@ -4696,34 +3562,18 @@ fail:
 }
 #endif
 
-#ifndef NO_GetSaveFileNameA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetSaveFileNameA)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	OPENFILENAME _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetSaveFileNameA_FUNC);
-	if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetSaveFileNameA(lparg0);
-fail:
-	if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetSaveFileNameA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetSaveFileNameW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetSaveFileNameW)
+#ifndef NO_GetSaveFileName
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetSaveFileName)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	OPENFILENAME _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetSaveFileNameW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetSaveFileName_FUNC);
 	if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)GetSaveFileNameW((LPOPENFILENAMEW)lparg0);
+	rc = (jboolean)GetSaveFileName((LPOPENFILENAMEW)lparg0);
 fail:
 	if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetSaveFileNameW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetSaveFileName_FUNC);
 	return rc;
 }
 #endif
@@ -4760,31 +3610,17 @@ fail:
 }
 #endif
 
-#ifndef NO_GetStartupInfoA
-JNIEXPORT void JNICALL OS_NATIVE(GetStartupInfoA)
+#ifndef NO_GetStartupInfo
+JNIEXPORT void JNICALL OS_NATIVE(GetStartupInfo)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	STARTUPINFO _arg0, *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, GetStartupInfoA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetStartupInfo_FUNC);
 	if (arg0) if ((lparg0 = getSTARTUPINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	GetStartupInfoA((LPSTARTUPINFOA)lparg0);
+	GetStartupInfo((LPSTARTUPINFOW)lparg0);
 fail:
 	if (arg0 && lparg0) setSTARTUPINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetStartupInfoA_FUNC);
-}
-#endif
-
-#ifndef NO_GetStartupInfoW
-JNIEXPORT void JNICALL OS_NATIVE(GetStartupInfoW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	STARTUPINFO _arg0, *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, GetStartupInfoW_FUNC);
-	if (arg0) if ((lparg0 = getSTARTUPINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	GetStartupInfoW((LPSTARTUPINFOW)lparg0);
-fail:
-	if (arg0 && lparg0) setSTARTUPINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, GetStartupInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, GetStartupInfo_FUNC);
 }
 #endif
 
@@ -4830,15 +3666,7 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
 {
 	jshort rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSystemDefaultUILanguage_FUNC);
-/*
 	rc = (jshort)GetSystemDefaultUILanguage();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetSystemDefaultUILanguage)
-		if (fp) {
-			rc = (jshort)((jshort (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, GetSystemDefaultUILanguage_FUNC);
 	return rc;
 }
@@ -4896,72 +3724,37 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor)
 }
 #endif
 
-#ifndef NO_GetTextExtentPoint32A
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32A)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3)
-{
-	jbyte *lparg1=NULL;
-	SIZE _arg3, *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetTextExtentPoint32A_FUNC);
-	if (arg3) if ((lparg3 = &_arg3) == NULL) goto fail;
-		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetTextExtentPoint32A((HDC)arg0, (LPSTR)lparg1, arg2, lparg3);
-fail:
-		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, GetTextExtentPoint32A_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetTextExtentPoint32W
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32W)
+#ifndef NO_GetTextExtentPoint32
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3)
 {
 	jchar *lparg1=NULL;
 	SIZE _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetTextExtentPoint32W_FUNC);
+	OS_NATIVE_ENTER(env, that, GetTextExtentPoint32_FUNC);
 	if (arg3) if ((lparg3 = &_arg3) == NULL) goto fail;
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)GetTextExtentPoint32W((HDC)arg0, (LPWSTR)lparg1, arg2, lparg3);
+	rc = (jboolean)GetTextExtentPoint32((HDC)arg0, (LPWSTR)lparg1, arg2, lparg3);
 fail:
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, GetTextExtentPoint32W_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetTextMetricsA
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsA)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	TEXTMETRICA _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetTextMetricsA_FUNC);
-	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-	rc = (jboolean)GetTextMetricsA((HDC)arg0, lparg1);
-fail:
-	if (arg1 && lparg1) setTEXTMETRICAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, GetTextMetricsA_FUNC);
+	OS_NATIVE_EXIT(env, that, GetTextExtentPoint32_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetTextMetricsW
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsW)
+#ifndef NO_GetTextMetrics
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetrics)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
-	TEXTMETRICW _arg1, *lparg1=NULL;
+	TEXTMETRIC _arg1, *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GetTextMetricsW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetTextMetrics_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-	rc = (jboolean)GetTextMetricsW((HDC)arg0, lparg1);
+	rc = (jboolean)GetTextMetrics((HDC)arg0, lparg1);
 fail:
-	if (arg1 && lparg1) setTEXTMETRICWFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, GetTextMetricsW_FUNC);
+	if (arg1 && lparg1) setTEXTMETRICFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, GetTextMetrics_FUNC);
 	return rc;
 }
 #endif
@@ -4976,15 +3769,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize)
 	OS_NATIVE_ENTER(env, that, GetThemePartSize_FUNC);
 	if (arg4) if ((lparg4 = getRECTFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = &_arg6) == NULL) goto fail;
-/*
-	rc = (jint)GetThemePartSize(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetThemePartSize)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, SIZE *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
-		}
-	}
+	rc = (jint)GetThemePartSize((HTHEME)arg0, (HDC)arg1, arg2, arg3, lparg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) setSIZEFields(env, arg6, lparg6);
 	OS_NATIVE_EXIT(env, that, GetThemePartSize_FUNC);
@@ -5004,15 +3789,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent)
 	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = getRECTFields(env, arg8, &_arg8)) == NULL) goto fail;
-/*
-	rc = (jint)GetThemeTextExtent(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GetThemeTextExtent)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
-		}
-	}
+	rc = (jint)GetThemeTextExtent((HTHEME)arg0, (HDC)arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) setRECTFields(env, arg8, lparg8);
 	if (arg7 && lparg7) setRECTFields(env, arg7, lparg7);
@@ -5106,50 +3883,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowDC)
 }
 #endif
 
-#ifndef NO_GetWindowLongA
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
+#ifndef NO_GetWindowLong
+JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLong)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowLongA_FUNC);
-	rc = (jint)GetWindowLongA((HWND)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, GetWindowLongA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetWindowLongPtrA
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowLongPtrA_FUNC);
-	rc = (jintLong)GetWindowLongPtrA((HWND)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, GetWindowLongPtrA_FUNC);
+	OS_NATIVE_ENTER(env, that, GetWindowLong_FUNC);
+	rc = (jint)GetWindowLong((HWND)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, GetWindowLong_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetWindowLongPtrW
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrW)
+#ifndef NO_GetWindowLongPtr
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtr)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowLongPtrW_FUNC);
-	rc = (jintLong)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, jintLong arg0, jint arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowLongW_FUNC);
-	rc = (jint)GetWindowLongW((HWND)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, GetWindowLongW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetWindowLongPtr_FUNC);
+	rc = (jintLong)GetWindowLongPtr((HWND)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, GetWindowLongPtr_FUNC);
 	return rc;
 }
 #endif
@@ -5214,58 +3967,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn)
 }
 #endif
 
-#ifndef NO_GetWindowTextA
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+#ifndef NO_GetWindowText
+JNIEXPORT jint JNICALL OS_NATIVE(GetWindowText)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
-	jbyte *lparg1=NULL;
+	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowTextA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetWindowTextA((HWND)arg0, (LPSTR)lparg1, arg2);
+	OS_NATIVE_ENTER(env, that, GetWindowText_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jint)GetWindowText((HWND)arg0, (LPWSTR)lparg1, arg2);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetWindowTextA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetWindowTextLengthA
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthA)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowTextLengthA_FUNC);
-	rc = (jint)GetWindowTextLengthA((HWND)arg0);
-	OS_NATIVE_EXIT(env, that, GetWindowTextLengthA_FUNC);
+	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, GetWindowText_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_GetWindowTextLengthW
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthW)
+#ifndef NO_GetWindowTextLength
+JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLength)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowTextLengthW_FUNC);
-	rc = (jint)GetWindowTextLengthW((HWND)arg0);
-	OS_NATIVE_EXIT(env, that, GetWindowTextLengthW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GetWindowTextW
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextW)
-	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
-{
-	jchar *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GetWindowTextW_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetWindowTextW((HWND)arg0, (LPWSTR)lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, GetWindowTextW_FUNC);
+	OS_NATIVE_ENTER(env, that, GetWindowTextLength_FUNC);
+	rc = (jint)GetWindowTextLength((HWND)arg0);
+	OS_NATIVE_EXIT(env, that, GetWindowTextLength_FUNC);
 	return rc;
 }
 #endif
@@ -5286,34 +4011,18 @@ fail:
 }
 #endif
 
-#ifndef NO_GlobalAddAtomA
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalAddAtomA)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GlobalAddAtomA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GlobalAddAtomA((LPCTSTR)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GlobalAddAtomA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GlobalAddAtomW
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalAddAtomW)
+#ifndef NO_GlobalAddAtom
+JNIEXPORT jint JNICALL OS_NATIVE(GlobalAddAtom)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GlobalAddAtomW_FUNC);
+	OS_NATIVE_ENTER(env, that, GlobalAddAtom_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GlobalAddAtomW((LPCWSTR)lparg0);
+	rc = (jint)GlobalAddAtom((LPCWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, GlobalAddAtomW_FUNC);
+	OS_NATIVE_EXIT(env, that, GlobalAddAtom_FUNC);
 	return rc;
 }
 #endif
@@ -5384,15 +4093,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GradientFill_FUNC);
-/*
 	rc = (jboolean)GradientFill((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, GradientFill)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG))fp)((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, GradientFill_FUNC);
 	return rc;
 }
@@ -5794,200 +4495,114 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDestroyContext)
 }
 #endif
 
-#ifndef NO_ImmEscapeA
-JNIEXPORT jintLong JNICALL OS_NATIVE(ImmEscapeA)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3)
-{
-	jbyte *lparg3=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmEscapeA_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)ImmEscapeA((HKL)arg0, (HIMC)arg1, arg2, (LPVOID)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, ImmEscapeA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ImmEscapeW
-JNIEXPORT jintLong JNICALL OS_NATIVE(ImmEscapeW)
+#ifndef NO_ImmEscape
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmEscape)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jcharArray arg3)
 {
 	jchar *lparg3=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmEscapeW_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmEscape_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)ImmEscapeW((HKL)arg0, (HIMC)arg1, arg2, (LPVOID)lparg3);
+	rc = (jintLong)ImmEscape((HKL)arg0, (HIMC)arg1, arg2, (LPVOID)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, ImmEscapeW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ImmGetCompositionFontA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontA)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	LOGFONTA _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionFontA_FUNC);
-	if (arg1) if ((lparg1 = getLOGFONTAFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)ImmGetCompositionFontA((HIMC)arg0, lparg1);
-fail:
-	if (arg1 && lparg1) setLOGFONTAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionFontA_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmEscape_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_ImmGetCompositionFontW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontW)
+#ifndef NO_ImmGetCompositionFont
+JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFont)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
-	LOGFONTW _arg1, *lparg1=NULL;
+	LOGFONT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionFontW_FUNC);
-	if (arg1) if ((lparg1 = getLOGFONTWFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)ImmGetCompositionFontW((HIMC)arg0, lparg1);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionFont_FUNC);
+	if (arg1) if ((lparg1 = getLOGFONTFields(env, arg1, &_arg1)) == NULL) goto fail;
+	rc = (jboolean)ImmGetCompositionFont((HIMC)arg0, lparg1);
 fail:
-	if (arg1 && lparg1) setLOGFONTWFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionFontW_FUNC);
+	if (arg1 && lparg1) setLOGFONTFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionFont_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_ImmGetCompositionStringA__II_3BI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringA__JI_3BI) && defined(JNI64))
+#if (!defined(NO_ImmGetCompositionString__II_3BI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3BI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA__JI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 #endif
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringA__II_3BI_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3BI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringA__JI_3BI_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3BI_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ImmGetCompositionStringA((HIMC)arg0, arg1, (LPSTR)lparg2, arg3);
+	rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringA__II_3BI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringA__JI_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_ImmGetCompositionStringA__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringA__JI_3II) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
-#endif
-{
-	jint *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringA__II_3II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringA__JI_3II_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ImmGetCompositionStringA((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringA__II_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3BI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringA__JI_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3BI_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_ImmGetCompositionStringW__II_3BI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3BI) && defined(JNI64))
+#if (!defined(NO_ImmGetCompositionString__II_3CI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3CI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
-#endif
-{
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3BI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3BI_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3BI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3BI_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_ImmGetCompositionStringW__II_3CI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3CI) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 #endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3CI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3CI_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
+	rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3CI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3CI_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_ImmGetCompositionStringW__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3II) && defined(JNI64))
+#if (!defined(NO_ImmGetCompositionString__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3II) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
 #endif
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3II_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
+	rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3II_FUNC);
 #endif
 	return rc;
 }
@@ -6088,34 +4703,18 @@ fail:
 }
 #endif
 
-#ifndef NO_ImmSetCompositionFontA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontA)
+#ifndef NO_ImmSetCompositionFont
+JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFont)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
-	LOGFONTA _arg1, *lparg1=NULL;
+	LOGFONT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmSetCompositionFontA_FUNC);
-	if (arg1) if ((lparg1 = getLOGFONTAFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)ImmSetCompositionFontA((HIMC)arg0, lparg1);
+	OS_NATIVE_ENTER(env, that, ImmSetCompositionFont_FUNC);
+	if (arg1) if ((lparg1 = getLOGFONTFields(env, arg1, &_arg1)) == NULL) goto fail;
+	rc = (jboolean)ImmSetCompositionFont((HIMC)arg0, lparg1);
 fail:
-	if (arg1 && lparg1) setLOGFONTAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, ImmSetCompositionFontA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ImmSetCompositionFontW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontW)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	LOGFONTW _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ImmSetCompositionFontW_FUNC);
-	if (arg1) if ((lparg1 = getLOGFONTWFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)ImmSetCompositionFontW((HIMC)arg0, lparg1);
-fail:
-	if (arg1 && lparg1) setLOGFONTWFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, ImmSetCompositionFontW_FUNC);
+	if (arg1 && lparg1) setLOGFONTFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, ImmSetCompositionFont_FUNC);
 	return rc;
 }
 #endif
@@ -6186,65 +4785,24 @@ fail:
 }
 #endif
 
-#ifndef NO_InsertMenuItemA
-JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemA)
+#ifndef NO_InsertMenuItem
+JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItem)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InsertMenuItemA_FUNC);
+	OS_NATIVE_ENTER(env, that, InsertMenuItem_FUNC);
 	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)InsertMenuItemA((HMENU)arg0, arg1, arg2, lparg3);
+	rc = (jboolean)InsertMenuItem((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
 fail:
 	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, InsertMenuItemA_FUNC);
+	OS_NATIVE_EXIT(env, that, InsertMenuItem_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_InsertMenuItemW
-JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
-{
-	MENUITEMINFO _arg3, *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InsertMenuItemW_FUNC);
-	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)InsertMenuItemW((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
-fail:
-	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, InsertMenuItemW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_InternetGetCookieA
-JNIEXPORT jboolean JNICALL OS_NATIVE(InternetGetCookieA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2, jintArray arg3)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InternetGetCookieA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)InternetGetCookieA((LPCTSTR)lparg0, (LPCTSTR)lparg1, (LPSTR)lparg2, (LPDWORD)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, InternetGetCookieA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_InternetGetCookieW
-JNIEXPORT jboolean JNICALL OS_NATIVE(InternetGetCookieW)
+#ifndef NO_InternetGetCookie
+JNIEXPORT jboolean JNICALL OS_NATIVE(InternetGetCookie)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jcharArray arg2, jintArray arg3)
 {
 	jchar *lparg0=NULL;
@@ -6252,62 +4810,40 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(InternetGetCookieW)
 	jchar *lparg2=NULL;
 	jint *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InternetGetCookieW_FUNC);
+	OS_NATIVE_ENTER(env, that, InternetGetCookie_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)InternetGetCookieW((LPCWSTR)lparg0, (LPCWSTR)lparg1, (LPWSTR)lparg2, (LPDWORD)lparg3);
+	rc = (jboolean)InternetGetCookie((LPCWSTR)lparg0, (LPCWSTR)lparg1, (LPWSTR)lparg2, (LPDWORD)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, InternetGetCookieW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_InternetSetCookieA
-JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetCookieA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InternetSetCookieA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)InternetSetCookieA((LPCTSTR)lparg0, (LPCTSTR)lparg1, (LPCTSTR)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, InternetSetCookieA_FUNC);
+	OS_NATIVE_EXIT(env, that, InternetGetCookie_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_InternetSetCookieW
-JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetCookieW)
+#ifndef NO_InternetSetCookie
+JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetCookie)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jcharArray arg2)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, InternetSetCookieW_FUNC);
+	OS_NATIVE_ENTER(env, that, InternetSetCookie_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)InternetSetCookieW((LPCWSTR)lparg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
+	rc = (jboolean)InternetSetCookie((LPCWSTR)lparg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, InternetSetCookieW_FUNC);
+	OS_NATIVE_EXIT(env, that, InternetSetCookie_FUNC);
 	return rc;
 }
 #endif
@@ -6390,15 +4926,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsAppThemed_FUNC);
-/*
 	rc = (jboolean)IsAppThemed();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, IsAppThemed)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, IsAppThemed_FUNC);
 	return rc;
 }
@@ -6410,15 +4938,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsHungAppWindow_FUNC);
-/*
 	rc = (jboolean)IsHungAppWindow((HWND)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, IsHungAppWindow)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, IsHungAppWindow_FUNC);
 	return rc;
 }
@@ -6556,26 +5076,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOGBRUSH_1sizeof)
 }
 #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)
+#ifndef NO_LOGFONT_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(LOGFONT_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);
+	OS_NATIVE_ENTER(env, that, LOGFONT_1sizeof_FUNC);
+	rc = (jint)LOGFONT_sizeof();
+	OS_NATIVE_EXIT(env, that, LOGFONT_1sizeof_FUNC);
 	return rc;
 }
 #endif
@@ -6680,98 +5188,50 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
 }
 #endif
 
-#ifndef NO_LoadBitmapA
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapA)
+#ifndef NO_LoadBitmap
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmap)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadBitmapA_FUNC);
-	rc = (jintLong)LoadBitmapA((HINSTANCE)arg0, (LPSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadBitmapA_FUNC);
+	OS_NATIVE_ENTER(env, that, LoadBitmap_FUNC);
+	rc = (jintLong)LoadBitmap((HINSTANCE)arg0, (LPWSTR)arg1);
+	OS_NATIVE_EXIT(env, that, LoadBitmap_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadBitmapW
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapW)
+#ifndef NO_LoadCursor
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursor)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadBitmapW_FUNC);
-	rc = (jintLong)LoadBitmapW((HINSTANCE)arg0, (LPWSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadBitmapW_FUNC);
+	OS_NATIVE_ENTER(env, that, LoadCursor_FUNC);
+	rc = (jintLong)LoadCursor((HINSTANCE)arg0, (LPWSTR)arg1);
+	OS_NATIVE_EXIT(env, that, LoadCursor_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadCursorA
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorA)
+#ifndef NO_LoadIcon
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIcon)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadCursorA_FUNC);
-	rc = (jintLong)LoadCursorA((HINSTANCE)arg0, (LPSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadCursorA_FUNC);
+	OS_NATIVE_ENTER(env, that, LoadIcon_FUNC);
+	rc = (jintLong)LoadIcon((HINSTANCE)arg0, (LPWSTR)arg1);
+	OS_NATIVE_EXIT(env, that, LoadIcon_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadCursorW
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadCursorW_FUNC);
-	rc = (jintLong)LoadCursorW((HINSTANCE)arg0, (LPWSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadCursorW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_LoadIconA
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconA)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadIconA_FUNC);
-	rc = (jintLong)LoadIconA((HINSTANCE)arg0, (LPSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadIconA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_LoadIconW
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadIconW_FUNC);
-	rc = (jintLong)LoadIconW((HINSTANCE)arg0, (LPWSTR)arg1);
-	OS_NATIVE_EXIT(env, that, LoadIconW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_LoadImageA
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA)
+#ifndef NO_LoadImage
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImage)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadImageA_FUNC);
-	rc = (jintLong)LoadImageA((HINSTANCE)arg0, (LPSTR)arg1, arg2, arg3, arg4, arg5);
-	OS_NATIVE_EXIT(env, that, LoadImageA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_LoadImageW
-JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, LoadImageW_FUNC);
-	rc = (jintLong)LoadImageW((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
-	OS_NATIVE_EXIT(env, that, LoadImageW_FUNC);
+	OS_NATIVE_ENTER(env, that, LoadImage_FUNC);
+	rc = (jintLong)LoadImage((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
+	OS_NATIVE_EXIT(env, that, LoadImage_FUNC);
 	return rc;
 }
 #endif
@@ -6968,26 +5428,14 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(MapViewOfFile)
 }
 #endif
 
-#ifndef NO_MapVirtualKeyA
-JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyA)
+#ifndef NO_MapVirtualKey
+JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKey)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, MapVirtualKeyA_FUNC);
-	rc = (jint)MapVirtualKeyA(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, MapVirtualKeyA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_MapVirtualKeyW
-JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, MapVirtualKeyW_FUNC);
-	rc = (jint)MapVirtualKeyW(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, MapVirtualKeyW_FUNC);
+	OS_NATIVE_ENTER(env, that, MapVirtualKey_FUNC);
+	rc = (jint)MapVirtualKey(arg0, arg1);
+	OS_NATIVE_EXIT(env, that, MapVirtualKey_FUNC);
 	return rc;
 }
 #endif
@@ -7058,40 +5506,21 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MessageBeep)
 }
 #endif
 
-#ifndef NO_MessageBoxA
-JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
-{
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, MessageBoxA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)MessageBoxA((HWND)arg0, (LPSTR)lparg1, (LPSTR)lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, MessageBoxA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_MessageBoxW
-JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxW)
+#ifndef NO_MessageBox
+JNIEXPORT jint JNICALL OS_NATIVE(MessageBox)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, MessageBoxW_FUNC);
+	OS_NATIVE_ENTER(env, that, MessageBox_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)MessageBoxW((HWND)arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3);
+	rc = (jint)MessageBox((HWND)arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, MessageBoxW_FUNC);
+	OS_NATIVE_EXIT(env, that, MessageBox_FUNC);
 	return rc;
 }
 #endif
@@ -7118,15 +5547,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MonitorFromWindow_FUNC);
-/*
-	rc = (jintLong)MonitorFromWindow(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, MonitorFromWindow)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jintLong)MonitorFromWindow((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MonitorFromWindow_FUNC);
 	return rc;
 }
@@ -7153,50 +5574,26 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JJI)(JNIEnv *env, jclass that, jint
 }
 #endif
 
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#endif
-{
-	DEVMODEA _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = getDEVMODEAFields(env, arg1, &_arg1)) == NULL) goto fail;
-	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
-fail:
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I) && defined(JNI64))
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #endif
 {
-	DEVMODEW _arg1, *lparg1=NULL;
+	DEVMODE _arg1, *lparg1=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC);
 #endif
-	if (arg1) if ((lparg1 = getDEVMODEWFields(env, arg1, &_arg1)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = getDEVMODEFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC);
 #endif
 }
 #endif
@@ -7321,50 +5718,26 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I) && defined(JNI64))
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #endif
 {
-	LOGFONTA _arg1, *lparg1=NULL;
+	LOGFONT _arg1, *lparg1=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC);
 #endif
-	if (arg1) if ((lparg1 = getLOGFONTAFields(env, arg1, &_arg1)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = getLOGFONTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#endif
-{
-	LOGFONTW _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = getLOGFONTWFields(env, arg1, &_arg1)) == NULL) goto fail;
-	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
-fail:
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC);
 #endif
 }
 #endif
@@ -7537,50 +5910,26 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && defined(JNI64))
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 #endif
 {
-	NMTTDISPINFOA _arg1, *lparg1=NULL;
+	NMTTDISPINFO _arg1, *lparg1=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC);
 #endif
-	if (arg1) if ((lparg1 = getNMTTDISPINFOAFields(env, arg1, &_arg1)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = getNMTTDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-#endif
-{
-	NMTTDISPINFOW _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = getNMTTDISPINFOWFields(env, arg1, &_arg1)) == NULL) goto fail;
-	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
-fail:
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC);
 #endif
 }
 #endif
@@ -8069,52 +6418,27 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI) && defined(JNI64))
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #endif
 {
-	DEVMODEA _arg0, *lparg0=NULL;
+	DEVMODE _arg0, *lparg0=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC);
 #endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
-	if (arg0 && lparg0) setDEVMODEAFields(env, arg0, lparg0);
+	if (arg0 && lparg0) setDEVMODEFields(env, arg0, lparg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#endif
-{
-	DEVMODEW _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI_FUNC);
-#endif
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setDEVMODEWFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC);
 #endif
 }
 #endif
@@ -8325,52 +6649,27 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#endif
-{
-	LOGFONTA _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
-#endif
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setLOGFONTAFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI) && defined(JNI64))
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #endif
 {
-	LOGFONTW _arg0, *lparg0=NULL;
+	LOGFONT _arg0, *lparg0=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC);
 #endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
-	if (arg0 && lparg0) setLOGFONTWFields(env, arg0, lparg0);
+	if (arg0 && lparg0) setLOGFONTFields(env, arg0, lparg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC);
 #endif
 }
 #endif
@@ -8825,52 +7124,27 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#endif
-{
-	NMTTDISPINFOA _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC);
-#endif
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setNMTTDISPINFOAFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI) && defined(JNI64))
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #endif
 {
-	NMTTDISPINFOW _arg0, *lparg0=NULL;
+	NMTTDISPINFO _arg0, *lparg0=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC);
 #endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
-	if (arg0 && lparg0) setNMTTDISPINFOWFields(env, arg0, lparg0);
+	if (arg0 && lparg0) setNMTTDISPINFOFields(env, arg0, lparg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC);
 #endif
 }
 #endif
@@ -9167,52 +7441,27 @@ fail:
 }
 #endif
 
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI) && defined(JNI64))
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 #endif
 {
-	TEXTMETRICA _arg0, *lparg0=NULL;
+	TEXTMETRIC _arg0, *lparg0=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC);
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC);
 #endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
-	if (arg0 && lparg0) setTEXTMETRICAFields(env, arg0, lparg0);
+	if (arg0 && lparg0) setTEXTMETRICFields(env, arg0, lparg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
-#endif
-{
-	TEXTMETRICW _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC);
-#endif
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setTEXTMETRICWFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC);
 #endif
 }
 #endif
@@ -9749,26 +7998,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(NMTTCUSTOMDRAW_1sizeof)
 }
 #endif
 
-#ifndef NO_NMTTDISPINFOA_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(NMTTDISPINFOA_1sizeof)
+#ifndef NO_NMTTDISPINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NMTTDISPINFO_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);
+	OS_NATIVE_ENTER(env, that, NMTTDISPINFO_1sizeof_FUNC);
+	rc = (jint)NMTTDISPINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, NMTTDISPINFO_1sizeof_FUNC);
 	return rc;
 }
 #endif
@@ -9821,50 +8058,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(NMUPDOWN_1sizeof)
 }
 #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)
+#ifndef NO_NONCLIENTMETRICS_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(NONCLIENTMETRICS_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);
+	OS_NATIVE_ENTER(env, that, NONCLIENTMETRICS_1sizeof_FUNC);
+	rc = (jint)NONCLIENTMETRICS_sizeof();
+	OS_NATIVE_EXIT(env, that, NONCLIENTMETRICS_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_NOTIFYICONDATAA_1V2_1SIZE
-JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATAA_1V2_1SIZE)
+#ifndef NO_NOTIFYICONDATA_1V2_1SIZE
+JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATA_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);
+	OS_NATIVE_ENTER(env, that, NOTIFYICONDATA_1V2_1SIZE_FUNC);
+	rc = (jint)NOTIFYICONDATA_V2_SIZE;
+	OS_NATIVE_EXIT(env, that, NOTIFYICONDATA_1V2_1SIZE_FUNC);
 	return rc;
 }
 #endif
@@ -9874,15 +8087,7 @@ JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent)
 	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, NotifyWinEvent_FUNC);
-/*
 	NotifyWinEvent((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, NotifyWinEvent)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(DWORD, HWND, LONG, LONG))fp)((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, NotifyWinEvent_FUNC);
 }
 #endif
@@ -9911,26 +8116,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(OPENFILENAME_1sizeof)
 }
 #endif
 
-#ifndef NO_OUTLINETEXTMETRICA_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(OUTLINETEXTMETRICA_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, OUTLINETEXTMETRICA_1sizeof_FUNC);
-	rc = (jint)OUTLINETEXTMETRICA_sizeof();
-	OS_NATIVE_EXIT(env, that, OUTLINETEXTMETRICA_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_OUTLINETEXTMETRICW_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(OUTLINETEXTMETRICW_1sizeof)
+#ifndef NO_OUTLINETEXTMETRIC_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(OUTLINETEXTMETRIC_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, OUTLINETEXTMETRICW_1sizeof_FUNC);
-	rc = (jint)OUTLINETEXTMETRICW_sizeof();
-	OS_NATIVE_EXIT(env, that, OUTLINETEXTMETRICW_1sizeof_FUNC);
+	OS_NATIVE_ENTER(env, that, OUTLINETEXTMETRIC_1sizeof_FUNC);
+	rc = (jint)OUTLINETEXTMETRIC_sizeof();
+	OS_NATIVE_EXIT(env, that, OUTLINETEXTMETRIC_1sizeof_FUNC);
 	return rc;
 }
 #endif
@@ -9997,40 +8190,21 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(OpenClipboard)
 }
 #endif
 
-#ifndef NO_OpenPrinterA
-JNIEXPORT jboolean JNICALL OS_NATIVE(OpenPrinterA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1, jintLong arg2)
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, OpenPrinterA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)OpenPrinterA((LPTSTR)lparg0, (LPHANDLE)lparg1, (LPPRINTER_DEFAULTS)arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, OpenPrinterA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_OpenPrinterW
-JNIEXPORT jboolean JNICALL OS_NATIVE(OpenPrinterW)
+#ifndef NO_OpenPrinter
+JNIEXPORT jboolean JNICALL OS_NATIVE(OpenPrinter)
 	(JNIEnv *env, jclass that, jcharArray arg0, jintLongArray arg1, jintLong arg2)
 {
 	jchar *lparg0=NULL;
 	jintLong *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, OpenPrinterW_FUNC);
+	OS_NATIVE_ENTER(env, that, OpenPrinter_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)OpenPrinterW((LPWSTR)lparg0, (LPHANDLE)lparg1, (LPPRINTER_DEFAULTSW)arg2);
+	rc = (jboolean)OpenPrinter((LPWSTR)lparg0, (LPHANDLE)lparg1, (LPPRINTER_DEFAULTSW)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, OpenPrinterW_FUNC);
+	OS_NATIVE_EXIT(env, that, OpenPrinter_FUNC);
 	return rc;
 }
 #endif
@@ -10055,15 +8229,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, OpenThemeData_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
 	rc = (jintLong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, OpenThemeData)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, OpenThemeData_FUNC);
@@ -10191,15 +8357,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PSPropertyKeyFromString)
 	OS_NATIVE_ENTER(env, that, PSPropertyKeyFromString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPROPERTYKEYFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
 	rc = (jint)PSPropertyKeyFromString(lparg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, PSPropertyKeyFromString)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, PROPERTYKEY *))fp)(lparg0, lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) setPROPERTYKEYFields(env, arg1, lparg1);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -10232,34 +8390,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PathIsExe)
 }
 #endif
 
-#ifndef NO_PeekMessageA
-JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessageA)
-	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
-{
-	MSG _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PeekMessageA_FUNC);
-	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)PeekMessageA(lparg0, (HWND)arg1, arg2, arg3, arg4);
-fail:
-	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, PeekMessageA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PeekMessageW
-JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessageW)
+#ifndef NO_PeekMessage
+JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessage)
 	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PeekMessageW_FUNC);
+	OS_NATIVE_ENTER(env, that, PeekMessage_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)PeekMessageW(lparg0, (HWND)arg1, arg2, arg3, arg4);
+	rc = (jboolean)PeekMessage(lparg0, (HWND)arg1, arg2, arg3, arg4);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, PeekMessageW_FUNC);
+	OS_NATIVE_EXIT(env, that, PeekMessage_FUNC);
 	return rc;
 }
 #endif
@@ -10308,82 +8450,42 @@ fail:
 }
 #endif
 
-#ifndef NO_PostMessageA
-JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageA)
+#ifndef NO_PostMessage
+JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessage)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PostMessageA_FUNC);
-	rc = (jboolean)PostMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, PostMessageA_FUNC);
+	OS_NATIVE_ENTER(env, that, PostMessage_FUNC);
+	rc = (jboolean)PostMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	OS_NATIVE_EXIT(env, that, PostMessage_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_PostMessageW
-JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PostMessageW_FUNC);
-	rc = (jboolean)PostMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, PostMessageW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PostThreadMessageA
-JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessageA)
+#ifndef NO_PostThreadMessage
+JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessage)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PostThreadMessageA_FUNC);
-	rc = (jboolean)PostThreadMessageA(arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, PostThreadMessageA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PostThreadMessageW
-JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessageW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PostThreadMessageW_FUNC);
-	rc = (jboolean)PostThreadMessageW(arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-	OS_NATIVE_EXIT(env, that, PostThreadMessageW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PrintDlgA
-JNIEXPORT jboolean JNICALL OS_NATIVE(PrintDlgA)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	PRINTDLG _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PrintDlgA_FUNC);
-	if (arg0) if ((lparg0 = getPRINTDLGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)PrintDlgA(lparg0);
-fail:
-	if (arg0 && lparg0) setPRINTDLGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, PrintDlgA_FUNC);
+	OS_NATIVE_ENTER(env, that, PostThreadMessage_FUNC);
+	rc = (jboolean)PostThreadMessage(arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	OS_NATIVE_EXIT(env, that, PostThreadMessage_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_PrintDlgW
-JNIEXPORT jboolean JNICALL OS_NATIVE(PrintDlgW)
+#ifndef NO_PrintDlg
+JNIEXPORT jboolean JNICALL OS_NATIVE(PrintDlg)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	PRINTDLG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, PrintDlgW_FUNC);
+	OS_NATIVE_ENTER(env, that, PrintDlg_FUNC);
 	if (arg0) if ((lparg0 = getPRINTDLGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)PrintDlgW((LPPRINTDLGW)lparg0);
+	rc = (jboolean)PrintDlg((LPPRINTDLGW)lparg0);
 fail:
 	if (arg0 && lparg0) setPRINTDLGFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, PrintDlgW_FUNC);
+	OS_NATIVE_EXIT(env, that, PrintDlg_FUNC);
 	return rc;
 }
 #endif
@@ -10394,15 +8496,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PrintWindow_FUNC);
-/*
 	rc = (jboolean)PrintWindow((HWND)arg0, (HDC)arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, PrintWindow)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, jint))fp)((HWND)arg0, (HDC)arg1, arg2);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, PrintWindow_FUNC);
 	return rc;
 }
@@ -10528,33 +8622,8 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegCloseKey)
 }
 #endif
 
-#ifndef NO_RegCreateKeyExA
-JNIEXPORT jint JNICALL OS_NATIVE(RegCreateKeyExA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintLong arg6, jintLongArray arg7, jintLongArray arg8)
-{
-	jbyte *lparg1=NULL;
-	jbyte *lparg3=NULL;
-	jintLong *lparg7=NULL;
-	jintLong *lparg8=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegCreateKeyExA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = (*env)->GetIntLongArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	rc = (jint)RegCreateKeyExA((HKEY)arg0, (LPSTR)lparg1, arg2, (LPTSTR)lparg3, arg4, arg5, (LPSECURITY_ATTRIBUTES)arg6, (PHKEY)lparg7, (LPDWORD)lparg8);
-fail:
-	if (arg8 && lparg8) (*env)->ReleaseIntLongArrayElements(env, arg8, lparg8, 0);
-	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegCreateKeyExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegCreateKeyExW
-JNIEXPORT jint JNICALL OS_NATIVE(RegCreateKeyExW)
+#ifndef NO_RegCreateKeyEx
+JNIEXPORT jint JNICALL OS_NATIVE(RegCreateKeyEx)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jcharArray arg3, jint arg4, jint arg5, jintLong arg6, jintLongArray arg7, jintLongArray arg8)
 {
 	jchar *lparg1=NULL;
@@ -10562,87 +8631,40 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegCreateKeyExW)
 	jintLong *lparg7=NULL;
 	jintLong *lparg8=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegCreateKeyExW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegCreateKeyEx_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = (*env)->GetIntLongArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	rc = (jint)RegCreateKeyExW((HKEY)arg0, (LPWSTR)lparg1, arg2, (LPWSTR)lparg3, arg4, arg5, (LPSECURITY_ATTRIBUTES)arg6, (PHKEY)lparg7, (LPDWORD)lparg8);
+	rc = (jint)RegCreateKeyEx((HKEY)arg0, (LPWSTR)lparg1, arg2, (LPWSTR)lparg3, arg4, arg5, (LPSECURITY_ATTRIBUTES)arg6, (PHKEY)lparg7, (LPDWORD)lparg8);
 fail:
 	if (arg8 && lparg8) (*env)->ReleaseIntLongArrayElements(env, arg8, lparg8, 0);
 	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegCreateKeyExW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegDeleteValueA
-JNIEXPORT jint JNICALL OS_NATIVE(RegDeleteValueA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegDeleteValueA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)RegDeleteValueA((HKEY)arg0, (LPSTR)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegDeleteValueA_FUNC);
+	OS_NATIVE_EXIT(env, that, RegCreateKeyEx_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_RegDeleteValueW
-JNIEXPORT jint JNICALL OS_NATIVE(RegDeleteValueW)
+#ifndef NO_RegDeleteValue
+JNIEXPORT jint JNICALL OS_NATIVE(RegDeleteValue)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegDeleteValueW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegDeleteValue_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)RegDeleteValueW((HKEY)arg0, (LPWSTR)lparg1);
+	rc = (jint)RegDeleteValue((HKEY)arg0, (LPWSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegDeleteValueW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegDeleteValue_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_RegEnumKeyExA
-JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyExA)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4, jbyteArray arg5, jintArray arg6, jobject arg7)
-{
-	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jbyte *lparg5=NULL;
-	jint *lparg6=NULL;
-	FILETIME _arg7, *lparg7=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegEnumKeyExA_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = getFILETIMEFields(env, arg7, &_arg7)) == NULL) goto fail;
-	rc = (jint)RegEnumKeyExA((HKEY)arg0, arg1, (LPSTR)lparg2, (LPDWORD)lparg3, (LPDWORD)lparg4, (LPSTR)lparg5, (LPDWORD)lparg6, lparg7);
-fail:
-	if (arg7 && lparg7) setFILETIMEFields(env, arg7, lparg7);
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
-	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, RegEnumKeyExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegEnumKeyExW
-JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyExW)
+#ifndef NO_RegEnumKeyEx
+JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyEx)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7)
 {
 	jchar *lparg2=NULL;
@@ -10652,14 +8674,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyExW)
 	jint *lparg6=NULL;
 	FILETIME _arg7, *lparg7=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegEnumKeyExW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegEnumKeyEx_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetCharArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = getFILETIMEFields(env, arg7, &_arg7)) == NULL) goto fail;
-	rc = (jint)RegEnumKeyExW((HKEY)arg0, arg1, (LPWSTR)lparg2, (LPDWORD)lparg3, (LPDWORD)lparg4, (LPWSTR)lparg5, (LPDWORD)lparg6, lparg7);
+	rc = (jint)RegEnumKeyEx((HKEY)arg0, arg1, (LPWSTR)lparg2, (LPDWORD)lparg3, (LPDWORD)lparg4, (LPWSTR)lparg5, (LPDWORD)lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) setFILETIMEFields(env, arg7, lparg7);
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
@@ -10667,126 +8689,35 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, RegEnumKeyExW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegEnumKeyEx_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_RegOpenKeyExA
-JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyExA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jintLongArray arg4)
-{
-	jbyte *lparg1=NULL;
-	jintLong *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegOpenKeyExA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)RegOpenKeyExA((HKEY)arg0, (LPSTR)lparg1, arg2, arg3, (PHKEY)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegOpenKeyExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegOpenKeyExW
-JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyExW)
+#ifndef NO_RegOpenKeyEx
+JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyEx)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jintLongArray arg4)
 {
 	jchar *lparg1=NULL;
 	jintLong *lparg4=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegOpenKeyExW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegOpenKeyEx_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)RegOpenKeyExW((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (PHKEY)lparg4);
+	rc = (jint)RegOpenKeyEx((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (PHKEY)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegOpenKeyExW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegOpenKeyEx_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_RegQueryValueExA__I_3BI_3I_3B_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExA__J_3BJ_3I_3B_3I) && defined(JNI64))
+#if (!defined(NO_RegQueryValueEx__I_3CI_3I_3C_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueEx__J_3CJ_3I_3C_3I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3B_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jbyteArray arg4, jintArray arg5)
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__I_3CI_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__J_3BJ_3I_3B_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jbyteArray arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jint *lparg3=NULL;
-	jbyte *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, RegQueryValueExA__I_3BI_3I_3B_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)RegQueryValueExA((HKEY)arg0, (LPSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
-fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, RegQueryValueExA__I_3BI_3I_3B_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_RegQueryValueExA__I_3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExA__J_3BJ_3I_3I_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__J_3BJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, RegQueryValueExA__I_3BI_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)RegQueryValueExA((HKEY)arg0, (LPSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
-fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, RegQueryValueExA__I_3BI_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_RegQueryValueExW__I_3CI_3I_3C_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExW__J_3CJ_3I_3C_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
 #endif
 {
 	jchar *lparg1=NULL;
@@ -10795,34 +8726,34 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3C_3I)(JNIEnv *env,
 	jint *lparg5=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, RegQueryValueExW__I_3CI_3I_3C_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, RegQueryValueEx__I_3CI_3I_3C_3I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)RegQueryValueExW((HKEY)arg0, (LPWSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
+	rc = (jint)RegQueryValueEx((HKEY)arg0, (LPWSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, RegQueryValueExW__I_3CI_3I_3C_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, RegQueryValueEx__I_3CI_3I_3C_3I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_RegQueryValueExW__I_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExW__J_3CJ_3I_3I_3I) && defined(JNI64))
+#if (!defined(NO_RegQueryValueEx__I_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueEx__J_3CJ_3I_3I_3I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__I_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
 #else
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
 #endif
 {
 	jchar *lparg1=NULL;
@@ -10831,127 +8762,76 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3I_3I)(JNIEnv *env,
 	jint *lparg5=NULL;
 	jint rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, RegQueryValueExW__I_3CI_3I_3I_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, RegQueryValueEx__I_3CI_3I_3I_3I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)RegQueryValueExW((HKEY)arg0, (LPWSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
+	rc = (jint)RegQueryValueEx((HKEY)arg0, (LPWSTR)lparg1, (LPDWORD)arg2, (LPDWORD)lparg3, (LPBYTE)lparg4, (LPDWORD)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, RegQueryValueExW__I_3CI_3I_3I_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, RegQueryValueEx__I_3CI_3I_3I_3I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#ifndef NO_RegSetValueExA
-JNIEXPORT jint JNICALL OS_NATIVE(RegSetValueExA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5)
-{
-	jbyte *lparg1=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegSetValueExA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)RegSetValueExA((HKEY)arg0, (LPSTR)lparg1, arg2, arg3, (const BYTE*)lparg4, arg5);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegSetValueExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegSetValueExW
-JNIEXPORT jint JNICALL OS_NATIVE(RegSetValueExW)
+#ifndef NO_RegSetValueEx
+JNIEXPORT jint JNICALL OS_NATIVE(RegSetValueEx)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5)
 {
 	jchar *lparg1=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegSetValueExW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegSetValueEx_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)RegSetValueExW((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (const BYTE*)lparg4, arg5);
+	rc = (jint)RegSetValueEx((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (const BYTE*)lparg4, arg5);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, RegSetValueExW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegSetValueEx_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_RegisterClassA
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterClassA)
+#ifndef NO_RegisterClass
+JNIEXPORT jint JNICALL OS_NATIVE(RegisterClass)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	WNDCLASS _arg0, *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterClassA_FUNC);
+	OS_NATIVE_ENTER(env, that, RegisterClass_FUNC);
 	if (arg0) if ((lparg0 = getWNDCLASSFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)RegisterClassA(lparg0);
+	rc = (jint)RegisterClass((LPWNDCLASSW)lparg0);
 fail:
 	if (arg0 && lparg0) setWNDCLASSFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, RegisterClassA_FUNC);
+	OS_NATIVE_EXIT(env, that, RegisterClass_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_RegisterClassW
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterClassW)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	WNDCLASS _arg0, *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterClassW_FUNC);
-	if (arg0) if ((lparg0 = getWNDCLASSFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)RegisterClassW((LPWNDCLASSW)lparg0);
-fail:
-	if (arg0 && lparg0) setWNDCLASSFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, RegisterClassW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegisterClipboardFormatA
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterClipboardFormatA)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterClipboardFormatA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)RegisterClipboardFormatA((LPTSTR)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, RegisterClipboardFormatA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegisterClipboardFormatW
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterClipboardFormatW)
+#ifndef NO_RegisterClipboardFormat
+JNIEXPORT jint JNICALL OS_NATIVE(RegisterClipboardFormat)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterClipboardFormatW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegisterClipboardFormat_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)RegisterClipboardFormatW((LPWSTR)lparg0);
+	rc = (jint)RegisterClipboardFormat((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, RegisterClipboardFormatW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegisterClipboardFormat_FUNC);
 	return rc;
 }
 #endif
@@ -10976,34 +8856,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RegisterTouchWindow)
 }
 #endif
 
-#ifndef NO_RegisterWindowMessageA
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterWindowMessageA)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterWindowMessageA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)RegisterWindowMessageA((LPTSTR)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, RegisterWindowMessageA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RegisterWindowMessageW
-JNIEXPORT jint JNICALL OS_NATIVE(RegisterWindowMessageW)
+#ifndef NO_RegisterWindowMessage
+JNIEXPORT jint JNICALL OS_NATIVE(RegisterWindowMessage)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RegisterWindowMessageW_FUNC);
+	OS_NATIVE_ENTER(env, that, RegisterWindowMessage_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)RegisterWindowMessageW((LPWSTR)lparg0);
+	rc = (jint)RegisterWindowMessage((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, RegisterWindowMessageW_FUNC);
+	OS_NATIVE_EXIT(env, that, RegisterWindowMessage_FUNC);
 	return rc;
 }
 #endif
@@ -11044,26 +8908,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RemoveMenu)
 }
 #endif
 
-#ifndef NO_RemovePropA
-JNIEXPORT jintLong JNICALL OS_NATIVE(RemovePropA)
+#ifndef NO_RemoveProp
+JNIEXPORT jintLong JNICALL OS_NATIVE(RemoveProp)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, RemovePropA_FUNC);
-	rc = (jintLong)RemovePropA((HWND)arg0, (LPCTSTR)arg1);
-	OS_NATIVE_EXIT(env, that, RemovePropA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RemovePropW
-JNIEXPORT jintLong JNICALL OS_NATIVE(RemovePropW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, RemovePropW_FUNC);
-	rc = (jintLong)RemovePropW((HWND)arg0, (LPCWSTR)arg1);
-	OS_NATIVE_EXIT(env, that, RemovePropW_FUNC);
+	OS_NATIVE_ENTER(env, that, RemoveProp_FUNC);
+	rc = (jintLong)RemoveProp((HWND)arg0, (LPCWSTR)arg1);
+	OS_NATIVE_EXIT(env, that, RemoveProp_FUNC);
 	return rc;
 }
 #endif
@@ -11260,34 +9112,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(SCROLLINFO_1sizeof)
 }
 #endif
 
-#ifndef NO_SHBrowseForFolderA
-JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolderA)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	BROWSEINFO _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SHBrowseForFolderA_FUNC);
-	if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)SHBrowseForFolderA(lparg0);
-fail:
-	if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, SHBrowseForFolderA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SHBrowseForFolderW
-JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolderW)
+#ifndef NO_SHBrowseForFolder
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolder)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	BROWSEINFO _arg0, *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SHBrowseForFolderW_FUNC);
+	OS_NATIVE_ENTER(env, that, SHBrowseForFolder_FUNC);
 	if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)SHBrowseForFolderW((LPBROWSEINFOW)lparg0);
+	rc = (jintLong)SHBrowseForFolder((LPBROWSEINFOW)lparg0);
 fail:
 	if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, SHBrowseForFolderW_FUNC);
+	OS_NATIVE_EXIT(env, that, SHBrowseForFolder_FUNC);
 	return rc;
 }
 #endif
@@ -11304,15 +9140,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromParsingName)
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)SHCreateItemFromParsingName(lparg0, arg1, lparg2, lparg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SHCreateItemFromParsingName)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jintLong, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3);
-		}
-	}
+	rc = (jint)SHCreateItemFromParsingName(lparg0, (IBindCtx *)arg1, (REFIID)lparg2, (void **)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
@@ -11334,15 +9162,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromRelativeName)
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)SHCreateItemFromRelativeName(arg0, lparg1, arg2, lparg3, lparg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SHCreateItemFromRelativeName)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jchar *, jintLong, jbyte *, jintLong *))fp)(arg0, lparg1, arg2, lparg3, lparg4);
-		}
-	}
+	rc = (jint)SHCreateItemFromRelativeName((IShellItem *)arg0, lparg1, (IBindCtx *)arg2, (REFIID)lparg3, (void **)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
@@ -11366,15 +9186,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemInKnownFolder)
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)SHCreateItemInKnownFolder(lparg0, arg1, lparg2, lparg3, lparg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SHCreateItemInKnownFolder)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jchar *, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3, lparg4);
-		}
-	}
+	rc = (jint)SHCreateItemInKnownFolder((REFKNOWNFOLDERID)lparg0, arg1, lparg2, (REFIID)lparg3, (void **)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
@@ -11409,64 +9221,33 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHELLEXECUTEINFO_1sizeof)
 }
 #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)
+#ifndef NO_SHFILEINFO_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(SHFILEINFO_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 jintLong JNICALL OS_NATIVE(SHGetFileInfoA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
-{
-	jbyte *lparg0=NULL;
-	SHFILEINFOA _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetFileInfoA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getSHFILEINFOAFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)SHGetFileInfoA((LPCSTR)lparg0, arg1, (SHFILEINFOA *)lparg2, arg3, arg4);
-fail:
-	if (arg2 && lparg2) setSHFILEINFOAFields(env, arg2, lparg2);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SHGetFileInfoA_FUNC);
+	OS_NATIVE_ENTER(env, that, SHFILEINFO_1sizeof_FUNC);
+	rc = (jint)SHFILEINFO_sizeof();
+	OS_NATIVE_EXIT(env, that, SHFILEINFO_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SHGetFileInfoW
-JNIEXPORT jintLong JNICALL OS_NATIVE(SHGetFileInfoW)
+#ifndef NO_SHGetFileInfo
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHGetFileInfo)
 	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
-	SHFILEINFOW _arg2, *lparg2=NULL;
+	SHFILEINFO _arg2, *lparg2=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetFileInfoW_FUNC);
+	OS_NATIVE_ENTER(env, that, SHGetFileInfo_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getSHFILEINFOWFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)SHGetFileInfoW((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4);
+	if (arg2) if ((lparg2 = getSHFILEINFOFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jintLong)SHGetFileInfo((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4);
 fail:
-	if (arg2 && lparg2) setSHFILEINFOWFields(env, arg2, lparg2);
+	if (arg2 && lparg2) setSHFILEINFOFields(env, arg2, lparg2);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SHGetFileInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, SHGetFileInfo_FUNC);
 	return rc;
 }
 #endif
@@ -11487,34 +9268,18 @@ fail:
 }
 #endif
 
-#ifndef NO_SHGetPathFromIDListA
-JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDListA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetPathFromIDListA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)SHGetPathFromIDListA((LPCITEMIDLIST)arg0, (LPSTR)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, SHGetPathFromIDListA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SHGetPathFromIDListW
-JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDListW)
+#ifndef NO_SHGetPathFromIDList
+JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDList)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetPathFromIDListW_FUNC);
+	OS_NATIVE_ENTER(env, that, SHGetPathFromIDList_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)SHGetPathFromIDListW((LPCITEMIDLIST)arg0, (LPWSTR)lparg1);
+	rc = (jboolean)SHGetPathFromIDList((LPCITEMIDLIST)arg0, (LPWSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, SHGetPathFromIDListW_FUNC);
+	OS_NATIVE_EXIT(env, that, SHGetPathFromIDList_FUNC);
 	return rc;
 }
 #endif
@@ -12018,1808 +9783,810 @@ JNIEXPORT jint JNICALL OS_NATIVE(SendInput)
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIII) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJJ) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIII) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 #endif
 {
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIII_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIII_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJJ_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJJ_FUNC);
 #endif
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIII_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIII_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJJ_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJJ_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	BUTTON_IMAGELIST _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getBUTTON_IMAGELISTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setBUTTON_IMAGELISTFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	HDHITTESTINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getHDHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDHITTESTINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	HDITEM _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getHDITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDITEMFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	HDLAYOUT _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getHDLAYOUTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDLAYOUTFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	LITEM _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getLITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLITEMFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	LVCOLUMN _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getLVCOLUMNFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVCOLUMNFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	LVHITTESTINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getLVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVHITTESTINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	LVINSERTMARK _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getLVINSERTMARKFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVINSERTMARKFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	LVITEM _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getLVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVITEMFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	MARGINS _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getMARGINSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMARGINSFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	MCHITTESTINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getMCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMCHITTESTINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	POINT _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	REBARBANDINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getREBARBANDINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setREBARBANDINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	RECT _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	SHDRAGIMAGE _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getSHDRAGIMAGEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSHDRAGIMAGEFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	SIZE _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	SYSTEMTIME _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getSYSTEMTIMEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSYSTEMTIMEFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TBBUTTONINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTBBUTTONINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TBBUTTON _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTBBUTTONFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TCHITTESTINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCHITTESTINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TCITEM _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTCITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCITEMFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TOOLINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTOOLINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTOOLINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TVHITTESTINFO _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVHITTESTINFOFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TVINSERTSTRUCT _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTVINSERTSTRUCTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVINSERTSTRUCTFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TVITEM _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVITEMFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	TVSORTCB _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getTVSORTCBFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVSORTCBFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64))
+#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
 #endif
 {
 	UDACCEL _arg3, *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getUDACCELFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setUDACCELFields(env, arg3, lparg3);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__III_3B) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3B) && defined(JNI64))
+#if (!defined(NO_SendMessage__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJ_3C) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3B)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jbyteArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3B)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jbyteArray arg3)
-#endif
-{
-	jbyte *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__III_3B_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3B_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__III_3B_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3B_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageA__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3C) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
 #endif
 {
 	jchar *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__III_3C_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__III_3C_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3C_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJ_3C_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__III_3C_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__III_3C_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3C_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJ_3C_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3I) && defined(JNI64))
+#if (!defined(NO_SendMessage__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJ_3I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
 #endif
 {
 	jint *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__III_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__III_3I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JIJ_3I_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__III_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__III_3I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JIJ_3I_FUNC);
 #endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_SendMessageA__III_3S) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3S) && defined(JNI64))
+#if (!defined(NO_SendMessage__II_3I_3I) && !defined(JNI64)) || (!defined(NO_SendMessage__JI_3I_3I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__II_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
-#endif
-{
-	jshort *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__III_3S_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3S_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__III_3S_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3S_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageA__II_3II) && !defined(JNI64)) || (!defined(NO_SendMessageA__JI_3JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
-#endif
-{
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__II_3II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JI_3JJ_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__II_3II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JI_3JJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageA__II_3I_3I) && !defined(JNI64)) || (!defined(NO_SendMessageA__JI_3I_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__II_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JI_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JI_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 #endif
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageA__II_3I_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__II_3I_3I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, SendMessageA__JI_3I_3I_FUNC);
+	OS_NATIVE_ENTER(env, that, SendMessage__JI_3I_3I_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageA__II_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageA__JI_3I_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIII) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJJ_FUNC);
-#endif
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	BUTTON_IMAGELIST _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getBUTTON_IMAGELISTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setBUTTON_IMAGELISTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	HDHITTESTINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getHDHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setHDHITTESTINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	HDITEM _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getHDITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setHDITEMFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	HDLAYOUT _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getHDLAYOUTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setHDLAYOUTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	LITEM _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getLITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setLITEMFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	LVCOLUMN _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getLVCOLUMNFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setLVCOLUMNFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	LVHITTESTINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getLVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setLVHITTESTINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	LVINSERTMARK _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getLVINSERTMARKFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setLVINSERTMARKFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	LVITEM _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getLVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setLVITEMFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__II_3I_3I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	MARGINS _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getMARGINSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setMARGINSFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	MCHITTESTINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getMCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setMCHITTESTINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	POINT _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	REBARBANDINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getREBARBANDINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setREBARBANDINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	RECT _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	SHDRAGIMAGE _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getSHDRAGIMAGEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setSHDRAGIMAGEFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	SIZE _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	SYSTEMTIME _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getSYSTEMTIMEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setSYSTEMTIMEFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TBBUTTONINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTBBUTTONINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTBBUTTONINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TBBUTTON _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTBBUTTONFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTBBUTTONFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TCHITTESTINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTCHITTESTINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TCITEM _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTCITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTCITEMFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TOOLINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTOOLINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTOOLINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TVHITTESTINFO _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTVHITTESTINFOFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TVINSERTSTRUCT _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTVINSERTSTRUCTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTVINSERTSTRUCTFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TVITEM _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTVITEMFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	TVSORTCB _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getTVSORTCBFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setTVSORTCBFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
-#endif
-{
-	UDACCEL _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
-#endif
-	if (arg3) if ((lparg3 = getUDACCELFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) setUDACCELFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3C) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
-#endif
-{
-	jchar *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__III_3C_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3C_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__III_3C_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3C_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
-#endif
-{
-	jint *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__III_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__III_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__III_3S) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3S) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
-#endif
-{
-	jshort *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__III_3S_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3S_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__III_3S_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3S_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__II_3II) && !defined(JNI64)) || (!defined(NO_SendMessageW__JI_3JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
-#endif
-{
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__II_3II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JI_3JJ_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__II_3II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JI_3JJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_SendMessageW__II_3I_3I) && !defined(JNI64)) || (!defined(NO_SendMessageW__JI_3I_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__II_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JI_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
-#endif
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, SendMessageW__II_3I_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, SendMessageW__JI_3I_3I_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, SendMessageW__II_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, SendMessageW__JI_3I_3I_FUNC);
+	OS_NATIVE_EXIT(env, that, SendMessage__JI_3I_3I_FUNC);
 #endif
 	return rc;
 }
@@ -13965,50 +10732,18 @@ fail:
 }
 #endif
 
-#ifndef NO_SetDllDirectoryA
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryA)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetDllDirectoryA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)SetDllDirectoryA((LPSTR)lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetDllDirectoryA)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPSTR))fp)((LPSTR)lparg0);
-		}
-	}
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SetDllDirectoryA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetDllDirectoryW
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryW)
+#ifndef NO_SetDllDirectory
+JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectory)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetDllDirectoryW_FUNC);
+	OS_NATIVE_ENTER(env, that, SetDllDirectory_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)SetDllDirectoryW((LPWSTR)lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetDllDirectoryW)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPWSTR))fp)((LPWSTR)lparg0);
-		}
-	}
+	rc = (jboolean)SetDllDirectory(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SetDllDirectoryW_FUNC);
+	OS_NATIVE_EXIT(env, that, SetDllDirectory_FUNC);
 	return rc;
 }
 #endif
@@ -14087,15 +10822,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetLayeredWindowAttributes_FUNC);
-/*
 	rc = (jboolean)SetLayeredWindowAttributes((HWND)arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetLayeredWindowAttributes)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jbyte, jint))fp)((HWND)arg0, arg1, arg2, arg3);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, SetLayeredWindowAttributes_FUNC);
 	return rc;
 }
@@ -14107,15 +10834,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetLayout_FUNC);
-/*
 	rc = (jint)SetLayout((HDC)arg0, (DWORD)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetLayout)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HDC, DWORD))fp)((HDC)arg0, (DWORD)arg1);
-		}
-	}
 	OS_NATIVE_EXIT(env, that, SetLayout_FUNC);
 	return rc;
 }
@@ -14153,15 +10872,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMenuInfo_FUNC);
 	if (arg1) if ((lparg1 = getMENUINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
 	rc = (jboolean)SetMenuInfo((HMENU)arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetMenuInfo)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1);
-		}
-	}
 fail:
 	if (arg1 && lparg1) setMENUINFOFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, SetMenuInfo_FUNC);
@@ -14169,34 +10880,18 @@ fail:
 }
 #endif
 
-#ifndef NO_SetMenuItemInfoA
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfoA)
+#ifndef NO_SetMenuItemInfo
+JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfo)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetMenuItemInfoA_FUNC);
+	OS_NATIVE_ENTER(env, that, SetMenuItemInfo_FUNC);
 	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)SetMenuItemInfoA((HMENU)arg0, arg1, arg2, lparg3);
+	rc = (jboolean)SetMenuItemInfo((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
 fail:
 	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, SetMenuItemInfoA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetMenuItemInfoW
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfoW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
-{
-	MENUITEMINFO _arg3, *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetMenuItemInfoW_FUNC);
-	if (arg3) if ((lparg3 = getMENUITEMINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)SetMenuItemInfoW((HMENU)arg0, arg1, arg2, (LPMENUITEMINFOW)lparg3);
-fail:
-	if (arg3 && lparg3) setMENUITEMINFOFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, SetMenuItemInfoW_FUNC);
+	OS_NATIVE_EXIT(env, that, SetMenuItemInfo_FUNC);
 	return rc;
 }
 #endif
@@ -14271,40 +10966,20 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetProcessDPIAware_FUNC);
-/*
 	rc = (jboolean)SetProcessDPIAware();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetProcessDPIAware)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, SetProcessDPIAware_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SetPropA
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropA)
+#ifndef NO_SetProp
+JNIEXPORT jboolean JNICALL OS_NATIVE(SetProp)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetPropA_FUNC);
-	rc = (jboolean)SetPropA((HWND)arg0, (LPCTSTR)arg1, (HANDLE)arg2);
-	OS_NATIVE_EXIT(env, that, SetPropA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetPropW
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetPropW_FUNC);
-	rc = (jboolean)SetPropW((HWND)arg0, (LPCWSTR)arg1, (HANDLE)arg2);
-	OS_NATIVE_EXIT(env, that, SetPropW_FUNC);
+	OS_NATIVE_ENTER(env, that, SetProp_FUNC);
+	rc = (jboolean)SetProp((HWND)arg0, (LPCWSTR)arg1, (HANDLE)arg2);
+	OS_NATIVE_EXIT(env, that, SetProp_FUNC);
 	return rc;
 }
 #endif
@@ -14401,50 +11076,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetTimer)
 }
 #endif
 
-#ifndef NO_SetWindowLongA
-JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongA)
+#ifndef NO_SetWindowLong
+JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLong)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowLongA_FUNC);
-	rc = (jint)SetWindowLongA((HWND)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, SetWindowLongA_FUNC);
+	OS_NATIVE_ENTER(env, that, SetWindowLong_FUNC);
+	rc = (jint)SetWindowLong((HWND)arg0, arg1, arg2);
+	OS_NATIVE_EXIT(env, that, SetWindowLong_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SetWindowLongPtrA
-JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtrA)
+#ifndef NO_SetWindowLongPtr
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtr)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowLongPtrA_FUNC);
-	rc = (jintLong)SetWindowLongPtrA((HWND)arg0, arg1, (LONG_PTR)arg2);
-	OS_NATIVE_EXIT(env, that, SetWindowLongPtrA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetWindowLongPtrW
-JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtrW)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowLongPtrW_FUNC);
-	rc = (jintLong)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, jintLong arg0, jint arg1, jint arg2)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowLongW_FUNC);
-	rc = (jint)SetWindowLongW((HWND)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, SetWindowLongW_FUNC);
+	OS_NATIVE_ENTER(env, that, SetWindowLongPtr_FUNC);
+	rc = (jintLong)SetWindowLongPtr((HWND)arg0, arg1, (LONG_PTR)arg2);
+	OS_NATIVE_EXIT(env, that, SetWindowLongPtr_FUNC);
 	return rc;
 }
 #endif
@@ -14505,34 +11156,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowRgn)
 }
 #endif
 
-#ifndef NO_SetWindowTextA
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowTextA)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowTextA_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)SetWindowTextA((HWND)arg0, (LPSTR)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, SetWindowTextA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetWindowTextW
-JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowTextW)
+#ifndef NO_SetWindowText
+JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowText)
 	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowTextW_FUNC);
+	OS_NATIVE_ENTER(env, that, SetWindowText_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)SetWindowTextW((HWND)arg0, (LPWSTR)lparg1);
+	rc = (jboolean)SetWindowText((HWND)arg0, (LPWSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, SetWindowTextW_FUNC);
+	OS_NATIVE_EXIT(env, that, SetWindowText_FUNC);
 	return rc;
 }
 #endif
@@ -14547,15 +11182,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme)
 	OS_NATIVE_ENTER(env, that, SetWindowTheme_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
 	rc = (jint)SetWindowTheme((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, SetWindowTheme)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, LPCWSTR, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
-		}
-	}
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
@@ -14564,26 +11191,14 @@ fail:
 }
 #endif
 
-#ifndef NO_SetWindowsHookExA
-JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookExA)
-	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jint arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowsHookExA_FUNC);
-	rc = (jintLong)SetWindowsHookExA(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
-	OS_NATIVE_EXIT(env, that, SetWindowsHookExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SetWindowsHookExW
-JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookExW)
+#ifndef NO_SetWindowsHookEx
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookEx)
 	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, SetWindowsHookExW_FUNC);
-	rc = (jintLong)SetWindowsHookExW(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
-	OS_NATIVE_EXIT(env, that, SetWindowsHookExW_FUNC);
+	OS_NATIVE_ENTER(env, that, SetWindowsHookEx_FUNC);
+	rc = (jintLong)SetWindowsHookEx(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
+	OS_NATIVE_EXIT(env, that, SetWindowsHookEx_FUNC);
 	return rc;
 }
 #endif
@@ -14604,66 +11219,34 @@ fail:
 }
 #endif
 
-#ifndef NO_ShellExecuteExA
-JNIEXPORT jboolean JNICALL OS_NATIVE(ShellExecuteExA)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	SHELLEXECUTEINFO _arg0, *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ShellExecuteExA_FUNC);
-	if (arg0) if ((lparg0 = getSHELLEXECUTEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ShellExecuteExA(lparg0);
-fail:
-	if (arg0 && lparg0) setSHELLEXECUTEINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ShellExecuteExA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_ShellExecuteExW
-JNIEXPORT jboolean JNICALL OS_NATIVE(ShellExecuteExW)
+#ifndef NO_ShellExecuteEx
+JNIEXPORT jboolean JNICALL OS_NATIVE(ShellExecuteEx)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	SHELLEXECUTEINFO _arg0, *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, ShellExecuteExW_FUNC);
+	OS_NATIVE_ENTER(env, that, ShellExecuteEx_FUNC);
 	if (arg0) if ((lparg0 = getSHELLEXECUTEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jboolean)ShellExecuteExW((LPSHELLEXECUTEINFOW)lparg0);
+	rc = (jboolean)ShellExecuteEx((LPSHELLEXECUTEINFOW)lparg0);
 fail:
 	if (arg0 && lparg0) setSHELLEXECUTEINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, ShellExecuteExW_FUNC);
+	OS_NATIVE_EXIT(env, that, ShellExecuteEx_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_Shell_1NotifyIconA
-JNIEXPORT jboolean JNICALL OS_NATIVE(Shell_1NotifyIconA)
+#ifndef NO_Shell_1NotifyIcon
+JNIEXPORT jboolean JNICALL OS_NATIVE(Shell_1NotifyIcon)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
 {
-	NOTIFYICONDATAA _arg1, *lparg1=NULL;
+	NOTIFYICONDATA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, Shell_1NotifyIconA_FUNC);
-	if (arg1) if ((lparg1 = getNOTIFYICONDATAAFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)Shell_NotifyIconA(arg0, lparg1);
+	OS_NATIVE_ENTER(env, that, Shell_1NotifyIcon_FUNC);
+	if (arg1) if ((lparg1 = getNOTIFYICONDATAFields(env, arg1, &_arg1)) == NULL) goto fail;
+	rc = (jboolean)Shell_NotifyIcon(arg0, lparg1);
 fail:
-	if (arg1 && lparg1) setNOTIFYICONDATAAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, Shell_1NotifyIconA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_Shell_1NotifyIconW
-JNIEXPORT jboolean JNICALL OS_NATIVE(Shell_1NotifyIconW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	NOTIFYICONDATAW _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, Shell_1NotifyIconW_FUNC);
-	if (arg1) if ((lparg1 = getNOTIFYICONDATAWFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)Shell_NotifyIconW(arg0, lparg1);
-fail:
-	if (arg1 && lparg1) setNOTIFYICONDATAWFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, Shell_1NotifyIconW_FUNC);
+	if (arg1 && lparg1) setNOTIFYICONDATAFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, Shell_1NotifyIcon_FUNC);
 	return rc;
 }
 #endif
@@ -14716,34 +11299,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowWindow)
 }
 #endif
 
-#ifndef NO_StartDocA
-JNIEXPORT jint JNICALL OS_NATIVE(StartDocA)
+#ifndef NO_StartDoc
+JNIEXPORT jint JNICALL OS_NATIVE(StartDoc)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DOCINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, StartDocA_FUNC);
+	OS_NATIVE_ENTER(env, that, StartDoc_FUNC);
 	if (arg1) if ((lparg1 = getDOCINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)StartDocA((HDC)arg0, lparg1);
+	rc = (jint)StartDoc((HDC)arg0, (LPDOCINFOW)lparg1);
 fail:
 	if (arg1 && lparg1) setDOCINFOFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, StartDocA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_StartDocW
-JNIEXPORT jint JNICALL OS_NATIVE(StartDocW)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	DOCINFO _arg1, *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, StartDocW_FUNC);
-	if (arg1) if ((lparg1 = getDOCINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)StartDocW((HDC)arg0, (LPDOCINFOW)lparg1);
-fail:
-	if (arg1 && lparg1) setDOCINFOFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, StartDocW_FUNC);
+	OS_NATIVE_EXIT(env, that, StartDoc_FUNC);
 	return rc;
 }
 #endif
@@ -14772,142 +11339,66 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(StretchBlt)
 }
 #endif
 
-#ifndef NO_StrokePath
-JNIEXPORT jboolean JNICALL OS_NATIVE(StrokePath)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, StrokePath_FUNC);
-	rc = (jboolean)StrokePath((HDC)arg0);
-	OS_NATIVE_EXIT(env, that, StrokePath_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
-{
-	HIGHCONTRAST _arg2, *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
-	if (arg2) if ((lparg2 = getHIGHCONTRASTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoA(arg0, arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) setHIGHCONTRASTFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
-{
-	NONCLIENTMETRICSA _arg2, *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I_FUNC);
-	if (arg2) if ((lparg2 = getNONCLIENTMETRICSAFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoA(arg0, arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) setNONCLIENTMETRICSAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
-{
-	RECT _arg2, *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
-	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoA(arg0, arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SystemParametersInfoA__II_3II
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoA__II_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
-{
-	jint *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoA__II_3II_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoA(arg0, arg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoA__II_3II_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I)
+#ifndef NO_SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I
+JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
 {
 	HIGHCONTRAST _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
 	if (arg2) if ((lparg2 = getHIGHCONTRASTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoW(arg0, arg1, lparg2, arg3);
+	rc = (jboolean)SystemParametersInfo(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setHIGHCONTRASTFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I)
+#ifndef NO_SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I
+JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
 {
-	NONCLIENTMETRICSW _arg2, *lparg2=NULL;
+	NONCLIENTMETRICS _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I_FUNC);
-	if (arg2) if ((lparg2 = getNONCLIENTMETRICSWFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoW(arg0, arg1, lparg2, arg3);
+	OS_NATIVE_ENTER(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I_FUNC);
+	if (arg2) if ((lparg2 = getNONCLIENTMETRICSFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jboolean)SystemParametersInfo(arg0, arg1, lparg2, arg3);
 fail:
-	if (arg2 && lparg2) setNONCLIENTMETRICSWFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I_FUNC);
+	if (arg2 && lparg2) setNONCLIENTMETRICSFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I)
+#ifndef NO_SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I
+JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
 {
 	RECT _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+	OS_NATIVE_ENTER(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoW(arg0, arg1, lparg2, arg3);
+	rc = (jboolean)SystemParametersInfo(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+	OS_NATIVE_EXIT(env, that, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_SystemParametersInfoW__II_3II
-JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoW__II_3II)
+#ifndef NO_SystemParametersInfo__II_3II
+JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfo__II_3II)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
 {
 	jint *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SystemParametersInfoW__II_3II_FUNC);
+	OS_NATIVE_ENTER(env, that, SystemParametersInfo__II_3II_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)SystemParametersInfoW(arg0, arg1, lparg2, arg3);
+	rc = (jboolean)SystemParametersInfo(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, SystemParametersInfoW__II_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, SystemParametersInfo__II_3II_FUNC);
 	return rc;
 }
 #endif
@@ -14960,26 +11451,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(TCITEM_1sizeof)
 }
 #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)
+#ifndef NO_TEXTMETRIC_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(TEXTMETRIC_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);
+	OS_NATIVE_ENTER(env, that, TEXTMETRIC_1sizeof_FUNC);
+	rc = (jint)TEXTMETRIC_sizeof();
+	OS_NATIVE_EXIT(env, that, TEXTMETRIC_1sizeof_FUNC);
 	return rc;
 }
 #endif
@@ -15128,25 +11607,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(TVSORTCB_1sizeof)
 }
 #endif
 
-#ifndef NO_ToAscii
-JNIEXPORT jint JNICALL OS_NATIVE(ToAscii)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jshortArray arg3, jint arg4)
-{
-	jbyte *lparg2=NULL;
-	jshort *lparg3=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ToAscii_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)ToAscii(arg0, arg1, (PBYTE)lparg2, (LPWORD)lparg3, arg4);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, ToAscii_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_ToUnicode
 JNIEXPORT jint JNICALL OS_NATIVE(ToUnicode)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jcharArray arg3, jint arg4, jint arg5)
@@ -15198,34 +11658,18 @@ fail:
 }
 #endif
 
-#ifndef NO_TranslateAcceleratorA
-JNIEXPORT jint JNICALL OS_NATIVE(TranslateAcceleratorA)
+#ifndef NO_TranslateAccelerator
+JNIEXPORT jint JNICALL OS_NATIVE(TranslateAccelerator)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	MSG _arg2, *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, TranslateAcceleratorA_FUNC);
+	OS_NATIVE_ENTER(env, that, TranslateAccelerator_FUNC);
 	if (arg2) if ((lparg2 = getMSGFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)TranslateAcceleratorA((HWND)arg0, (HACCEL)arg1, lparg2);
+	rc = (jint)TranslateAccelerator((HWND)arg0, (HACCEL)arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setMSGFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, TranslateAcceleratorA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_TranslateAcceleratorW
-JNIEXPORT jint JNICALL OS_NATIVE(TranslateAcceleratorW)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-{
-	MSG _arg2, *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, TranslateAcceleratorW_FUNC);
-	if (arg2) if ((lparg2 = getMSGFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)TranslateAcceleratorW((HWND)arg0, (HACCEL)arg1, lparg2);
-fail:
-	if (arg2 && lparg2) setMSGFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, TranslateAcceleratorW_FUNC);
+	OS_NATIVE_EXIT(env, that, TranslateAccelerator_FUNC);
 	return rc;
 }
 #endif
@@ -15284,15 +11728,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, TransparentBlt_FUNC);
-/*
-	rc = (jboolean)TransparentBlt(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, TransparentBlt)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-		}
-	}
+	rc = (jboolean)TransparentBlt((HDC)arg0, arg1, arg2, arg3, arg4, (HDC)arg5, arg6, arg7, arg8, arg9, arg10);
 	OS_NATIVE_EXIT(env, that, TransparentBlt_FUNC);
 	return rc;
 }
@@ -15350,34 +11786,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnmapViewOfFile)
 }
 #endif
 
-#ifndef NO_UnregisterClassA
-JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
-{
-	jbyte *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, UnregisterClassA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jboolean)UnregisterClassA((LPSTR)lparg0, (HINSTANCE)arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, UnregisterClassA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_UnregisterClassW
-JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassW)
+#ifndef NO_UnregisterClass
+JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClass)
 	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1)
 {
 	jchar *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, UnregisterClassW_FUNC);
+	OS_NATIVE_ENTER(env, that, UnregisterClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jboolean)UnregisterClassW((LPWSTR)lparg0, (HINSTANCE)arg1);
+	rc = (jboolean)UnregisterClass((LPWSTR)lparg0, (HINSTANCE)arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, UnregisterClassW_FUNC);
+	OS_NATIVE_EXIT(env, that, UnregisterClass_FUNC);
 	return rc;
 }
 #endif
@@ -15414,46 +11834,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateWindow)
 }
 #endif
 
-#ifndef NO_UrlCreateFromPathA
-JNIEXPORT jint JNICALL OS_NATIVE(UrlCreateFromPathA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintArray arg2, jint arg3)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, UrlCreateFromPathA_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)UrlCreateFromPathA((LPCSTR)lparg0, (LPSTR)lparg1, lparg2, arg3);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, UrlCreateFromPathA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_UrlCreateFromPathW
-JNIEXPORT jint JNICALL OS_NATIVE(UrlCreateFromPathW)
+#ifndef NO_UrlCreateFromPath
+JNIEXPORT jint JNICALL OS_NATIVE(UrlCreateFromPath)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jintArray arg2, jint arg3)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, UrlCreateFromPathW_FUNC);
+	OS_NATIVE_ENTER(env, that, UrlCreateFromPath_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)UrlCreateFromPathW((LPCWSTR)lparg0, (LPWSTR)lparg1, lparg2, arg3);
+	rc = (jint)UrlCreateFromPath((LPCWSTR)lparg0, (LPWSTR)lparg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, UrlCreateFromPathW_FUNC);
+	OS_NATIVE_EXIT(env, that, UrlCreateFromPath_FUNC);
 	return rc;
 }
 #endif
@@ -15474,26 +11872,14 @@ fail:
 }
 #endif
 
-#ifndef NO_VkKeyScanA
-JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScanA)
-	(JNIEnv *env, jclass that, jshort arg0)
-{
-	jshort rc = 0;
-	OS_NATIVE_ENTER(env, that, VkKeyScanA_FUNC);
-	rc = (jshort)VkKeyScanA((TCHAR)arg0);
-	OS_NATIVE_EXIT(env, that, VkKeyScanA_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VkKeyScanW
-JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScanW)
+#ifndef NO_VkKeyScan
+JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScan)
 	(JNIEnv *env, jclass that, jshort arg0)
 {
 	jshort rc = 0;
-	OS_NATIVE_ENTER(env, that, VkKeyScanW_FUNC);
-	rc = (jshort)VkKeyScanW((WCHAR)arg0);
-	OS_NATIVE_EXIT(env, that, VkKeyScanW_FUNC);
+	OS_NATIVE_ENTER(env, that, VkKeyScan_FUNC);
+	rc = (jshort)VkKeyScan((WCHAR)arg0);
+	OS_NATIVE_EXIT(env, that, VkKeyScan_FUNC);
 	return rc;
 }
 #endif
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 ee79679a5e..e3ad68a964 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
@@ -17,87 +17,14 @@
 #define PROPVARIANT_sizeof() sizeof(PROPVARIANT)
 
 /* Libraries for dynamic loaded functions */
-#define ActivateActCtx_LIB "kernel32.dll"
-#define AddFontResourceExA_LIB "gdi32.dll"
-#define AddFontResourceExW_LIB "gdi32.dll"
-#define AllowSetForegroundWindow_LIB "user32.dll"
-#define AlphaBlend_LIB "msimg32.dll"
-#define AnimateWindow_LIB "user32.dll"
-#define AssocQueryStringA_LIB "shlwapi.dll"
-#define AssocQueryStringW_LIB "shlwapi.dll"
-#define BufferedPaintInit_LIB "uxtheme.dll"
-#define BufferedPaintUnInit_LIB "uxtheme.dll"
-#define BufferedPaintSetAlpha_LIB "uxtheme.dll"
-#define BeginBufferedPaint_LIB "uxtheme.dll"
 #define CloseGestureInfoHandle_LIB "user32.dll"
-#define CloseThemeData_LIB "uxtheme.dll"
 #define CloseTouchInputHandle_LIB "user32.dll"
-#define CoInternetIsFeatureEnabled_LIB "urlmon.dll"
-#define CoInternetSetFeatureEnabled_LIB "urlmon.dll"
-#define CreateActCtxW_LIB "kernel32.dll"
-#define CreateActCtxA_LIB "kernel32.dll"
-#define DrawThemeBackground_LIB "uxtheme.dll"
-#define DrawThemeEdge_LIB "uxtheme.dll"
-#define DrawThemeIcon_LIB "uxtheme.dll"
-#define DrawThemeParentBackground_LIB "uxtheme.dll"
-#define DrawThemeText_LIB "uxtheme.dll"
-#define DrawThemeTextEx_LIB "uxtheme.dll"
-#define DwmEnableBlurBehindWindow_LIB "dwmapi.dll"
-#define DwmExtendFrameIntoClientArea_LIB "dwmapi.dll"
-#define DwmIsCompositionEnabled_LIB "dwmapi.dll"
 #define GetCurrentProcessExplicitAppUserModelID_LIB "shell32.dll"
 #define GetDpiForMonitor_LIB "shcore.dll"
 #define GetGestureInfo_LIB "user32.dll"
-#define GetThemeInt_LIB "uxtheme.dll"
-#define GetThemeMargins_LIB "uxtheme.dll"
-#define GetThemeBackgroundContentRect_LIB "uxtheme.dll"
-#define GetThemeBackgroundExtent_LIB "uxtheme.dll"
-#define GetThemeBitmap_LIB "uxtheme.dll"
-#define GetThemeColor_LIB "uxtheme.dll"
-#define GetThemePartSize_LIB "uxtheme.dll"
-#define GetThemeMetric_LIB "uxtheme.dll"
-#define GetThemeRect_LIB "uxtheme.dll"
-#define GetThemeSysSize_LIB "uxtheme.dll"
 #define GetTouchInputInfo_LIB "user32.dll"
-#define HitTestThemeBackground_LIB "uxtheme.dll"
-#define EndBufferedPaint_LIB "uxtheme.dll"
-#define EnumDisplayMonitors_LIB "user32.dll"
-#define EnumSystemLanguageGroupsA_LIB "kernel32.dll"
-#define EnumSystemLanguageGroupsW_LIB "kernel32.dll"
-#define GetComboBoxInfo_LIB "user32.dll"
-#define GetLayeredWindowAttributes_LIB "user32.dll"
-#define GetLayout_LIB "gdi32.dll"
-#define GetMenuBarInfo_LIB "user32.dll"
-#define GetMenuInfo_LIB "user32.dll"
-#define GetMonitorInfoA_LIB "user32.dll"
-#define GetMonitorInfoW_LIB "user32.dll"
-#define GetSystemDefaultUILanguage_LIB "kernel32.dll"
-#define GetThemeTextExtent_LIB "uxtheme.dll"
-#define GetWindowTheme_LIB "uxtheme.dll"
-#define GradientFill_LIB "msimg32.dll"
-#define ImmDisableTextFrameService_LIB "imm32.dll"
-#define IsAppThemed_LIB "uxtheme.dll"
-#define IsHungAppWindow_LIB "user32.dll"
 #define IsTouchWindow_LIB "user32.dll"
-#define MCIWndRegisterClass_LIB "msvfw32.dll"
-#define MonitorFromWindow_LIB "user32.dll"
-#define NotifyWinEvent_LIB "user32.dll"
-#define OpenThemeData_LIB "uxtheme.dll"
-#define PrintWindow_LIB "user32.dll"
-#define PSPropertyKeyFromString_LIB "propsys.dll"
 #define RegisterTouchWindow_LIB "user32.dll"
 #define SetCurrentProcessExplicitAppUserModelID_LIB "shell32.dll"
-#define SetDllDirectoryA_LIB "Kernel32.dll"
-#define SetDllDirectoryW_LIB "Kernel32.dll"
 #define SetGestureConfig_LIB "user32.dll"
-#define SetLayeredWindowAttributes_LIB "user32.dll"
-#define SetLayout_LIB "gdi32.dll"
-#define SetMenuInfo_LIB "user32.dll"
-#define SetProcessDPIAware_LIB "user32.dll"
-#define SetWindowTheme_LIB "uxtheme.dll"
-#define SHCreateItemFromRelativeName_LIB "shell32.dll"
-#define SHCreateItemInKnownFolder_LIB "shell32.dll"
-#define SHCreateItemFromParsingName_LIB "shell32.dll"
-#define TransparentBlt_LIB "msimg32.dll"
 #define UnregisterTouchWindow_LIB "user32.dll"
-#define UpdateLayeredWindow_LIB "user32.dll"
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 16e6d25a39..6713d7da63 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
@@ -26,14 +26,12 @@ char * OS_nativeFunctionNames[] = {
 	"AbortDoc",
 	"ActivateActCtx",
 	"ActivateKeyboardLayout",
-	"AddFontResourceExA",
-	"AddFontResourceExW",
+	"AddFontResourceEx",
 	"AdjustWindowRectEx",
 	"AllowSetForegroundWindow",
 	"AlphaBlend",
 	"Arc",
-	"AssocQueryStringA",
-	"AssocQueryStringW",
+	"AssocQueryString",
 	"BITMAPINFOHEADER_1sizeof",
 	"BITMAP_1sizeof",
 	"BLENDFUNCTION_1sizeof",
@@ -63,18 +61,12 @@ char * OS_nativeFunctionNames[] = {
 	"CRYPT_1INTEGER_1BLOB_1sizeof",
 	"CRYPT_1OBJID_1BLOB_1sizeof",
 	"CallNextHookEx",
-	"CallWindowProcA",
-	"CallWindowProcW",
-	"CertNameToStrA",
-	"CertNameToStrW",
-	"CharLowerA",
-	"CharLowerW",
-	"CharUpperA",
-	"CharUpperW",
-	"ChooseColorA",
-	"ChooseColorW",
-	"ChooseFontA",
-	"ChooseFontW",
+	"CallWindowProc",
+	"CertNameToStr",
+	"CharLower",
+	"CharUpper",
+	"ChooseColor",
+	"ChooseFont",
 	"ClientToScreen",
 	"CloseClipboard",
 	"CloseEnhMetaFile",
@@ -91,17 +83,14 @@ char * OS_nativeFunctionNames[] = {
 	"CombineRgn",
 	"CommDlgExtendedError",
 	"CopyImage",
-	"CreateAcceleratorTableA",
-	"CreateAcceleratorTableW",
-	"CreateActCtxA",
-	"CreateActCtxW",
+	"CreateAcceleratorTable",
+	"CreateActCtx",
 	"CreateBitmap",
 	"CreateCaret",
 	"CreateCompatibleBitmap",
 	"CreateCompatibleDC",
 	"CreateCursor",
-	"CreateDCA",
-	"CreateDCW",
+	"CreateDC",
 #ifndef JNI64
 	"CreateDIBSection__III_3III",
 #else
@@ -112,20 +101,13 @@ char * OS_nativeFunctionNames[] = {
 #else
 	"CreateDIBSection__J_3BI_3JJI",
 #endif
-	"CreateEnhMetaFileA",
-	"CreateEnhMetaFileW",
+	"CreateEnhMetaFile",
 #ifndef JNI64
-	"CreateFontIndirectA__I",
+	"CreateFontIndirect__I",
 #else
-	"CreateFontIndirectA__J",
+	"CreateFontIndirect__J",
 #endif
-	"CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2",
-#ifndef JNI64
-	"CreateFontIndirectW__I",
-#else
-	"CreateFontIndirectW__J",
-#endif
-	"CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2",
+	"CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2",
 	"CreateIconIndirect",
 	"CreateMenu",
 	"CreatePalette",
@@ -133,27 +115,21 @@ char * OS_nativeFunctionNames[] = {
 	"CreatePen",
 	"CreatePolygonRgn",
 	"CreatePopupMenu",
-	"CreateProcessA",
-	"CreateProcessW",
+	"CreateProcess",
 	"CreateRectRgn",
 	"CreateSolidBrush",
 	"CreateStreamOnHGlobal",
-	"CreateWindowExA",
-	"CreateWindowExW",
-	"DEVMODEA_1sizeof",
-	"DEVMODEW_1sizeof",
+	"CreateWindowEx",
+	"DEVMODE_1sizeof",
 	"DIBSECTION_1sizeof",
 	"DOCHOSTUIINFO_1sizeof",
 	"DOCINFO_1sizeof",
 	"DRAWITEMSTRUCT_1sizeof",
 	"DROPFILES_1sizeof",
 	"DTTOPTS_1sizeof",
-	"DefFrameProcA",
-	"DefFrameProcW",
-	"DefMDIChildProcA",
-	"DefMDIChildProcW",
-	"DefWindowProcA",
-	"DefWindowProcW",
+	"DefFrameProc",
+	"DefMDIChildProc",
+	"DefWindowProc",
 	"DeferWindowPos",
 	"DeleteDC",
 	"DeleteEnhMetaFile",
@@ -165,21 +141,17 @@ char * OS_nativeFunctionNames[] = {
 	"DestroyIcon",
 	"DestroyMenu",
 	"DestroyWindow",
-	"DispatchMessageA",
-	"DispatchMessageW",
-	"DocumentPropertiesA",
-	"DocumentPropertiesW",
+	"DispatchMessage",
+	"DocumentProperties",
 	"DragDetect",
 	"DragFinish",
-	"DragQueryFileA",
-	"DragQueryFileW",
+	"DragQueryFile",
 	"DrawEdge",
 	"DrawFocusRect",
 	"DrawFrameControl",
 	"DrawIconEx",
 	"DrawMenuBar",
-	"DrawTextA",
-	"DrawTextW",
+	"DrawText",
 	"DrawThemeBackground",
 	"DrawThemeText",
 	"DuplicateHandle",
@@ -197,29 +169,22 @@ char * OS_nativeFunctionNames[] = {
 	"EndPaint",
 	"EnumDisplayMonitors",
 	"EnumEnhMetaFile",
-	"EnumFontFamiliesA",
-	"EnumFontFamiliesW",
-	"EnumSystemLanguageGroupsA",
-	"EnumSystemLanguageGroupsW",
-	"EnumSystemLocalesA",
-	"EnumSystemLocalesW",
+	"EnumFontFamilies",
+	"EnumSystemLanguageGroups",
+	"EnumSystemLocales",
 	"EqualRect",
 	"ExcludeClipRect",
-	"ExpandEnvironmentStringsA",
-	"ExpandEnvironmentStringsW",
+	"ExpandEnvironmentStrings",
 	"ExtCreatePen",
 	"ExtCreateRegion",
-	"ExtTextOutA",
-	"ExtTextOutW",
-	"ExtractIconExA",
-	"ExtractIconExW",
+	"ExtTextOut",
+	"ExtractIconEx",
 	"FILETIME_1sizeof",
 	"FLICK_1DATA_1sizeof",
 	"FLICK_1POINT_1sizeof",
 	"FileTimeToSystemTime",
 	"FillRect",
-	"FormatMessageA",
-	"FormatMessageW",
+	"FormatMessage",
 	"GCP_1RESULTS_1sizeof",
 	"GESTURECONFIG_1sizeof",
 	"GESTUREINFO_1sizeof",
@@ -235,22 +200,16 @@ char * OS_nativeFunctionNames[] = {
 	"GetBkColor",
 	"GetCapture",
 	"GetCaretPos",
-	"GetCharABCWidthsA",
-	"GetCharABCWidthsW",
-	"GetCharWidthA",
-	"GetCharWidthW",
-	"GetCharacterPlacementA",
-	"GetCharacterPlacementW",
-	"GetClassInfoA",
-	"GetClassInfoW",
-	"GetClassNameA",
-	"GetClassNameW",
+	"GetCharABCWidths",
+	"GetCharWidth",
+	"GetCharacterPlacement",
+	"GetClassInfo",
+	"GetClassName",
 	"GetClientRect",
 	"GetClipBox",
 	"GetClipRgn",
 	"GetClipboardData",
-	"GetClipboardFormatNameA",
-	"GetClipboardFormatNameW",
+	"GetClipboardFormatName",
 	"GetComboBoxInfo",
 	"GetCurrentObject",
 	"GetCurrentProcess",
@@ -274,7 +233,7 @@ char * OS_nativeFunctionNames[] = {
 	"GetForegroundWindow",
 	"GetGUIThreadInfo",
 	"GetGestureInfo",
-	"GetGlyphIndicesW",
+	"GetGlyphIndices",
 	"GetGraphicsMode",
 	"GetIconInfo",
 	"GetKeyState",
@@ -286,101 +245,64 @@ char * OS_nativeFunctionNames[] = {
 	"GetLayeredWindowAttributes",
 	"GetLayout",
 	"GetLibraryHandle",
-	"GetLocaleInfoA",
-	"GetLocaleInfoW",
+	"GetLocaleInfo",
 	"GetMenu",
 	"GetMenuBarInfo",
 	"GetMenuDefaultItem",
 	"GetMenuInfo",
 	"GetMenuItemCount",
-	"GetMenuItemInfoA",
-	"GetMenuItemInfoW",
+	"GetMenuItemInfo",
 	"GetMenuItemRect",
-	"GetMessageA",
+	"GetMessage",
 	"GetMessagePos",
 	"GetMessageTime",
-	"GetMessageW",
 	"GetMetaRgn",
-	"GetModuleFileNameA",
-	"GetModuleFileNameW",
-	"GetModuleHandleA",
-	"GetModuleHandleW",
-	"GetMonitorInfoA",
-	"GetMonitorInfoW",
+	"GetModuleFileName",
+	"GetModuleHandle",
+	"GetMonitorInfo",
 	"GetNearestPaletteIndex",
 #ifndef JNI64
-	"GetObjectA__III",
-#else
-	"GetObjectA__JIJ",
-#endif
-#ifndef JNI64
-	"GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2",
+	"GetObject__III",
 #else
-	"GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2",
+	"GetObject__JIJ",
 #endif
 #ifndef JNI64
-	"GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+	"GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2",
 #else
-	"GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+	"GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2",
 #endif
 #ifndef JNI64
-	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+	"GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
 #else
-	"GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+	"GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2",
 #endif
 #ifndef JNI64
-	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2",
+	"GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
 #else
-	"GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2",
+	"GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
 #endif
 #ifndef JNI64
-	"GetObjectW__III",
+	"GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2",
 #else
-	"GetObjectW__JIJ",
+	"GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2",
 #endif
-#ifndef JNI64
-	"GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2",
-#else
-	"GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2",
-#endif
-#ifndef JNI64
-	"GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
-#else
-	"GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2",
-#endif
-#ifndef JNI64
-	"GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
-#else
-	"GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
-#endif
-#ifndef JNI64
-	"GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2",
-#else
-	"GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2",
-#endif
-	"GetOpenFileNameA",
-	"GetOpenFileNameW",
-	"GetOutlineTextMetricsA",
-	"GetOutlineTextMetricsW",
+	"GetOpenFileName",
+	"GetOutlineTextMetrics",
 	"GetPaletteEntries",
 	"GetParent",
 	"GetPixel",
 	"GetPolyFillMode",
 	"GetProcessHeap",
-	"GetProfileStringA",
-	"GetProfileStringW",
-	"GetPropA",
-	"GetPropW",
+	"GetProfileString",
+	"GetProp",
 	"GetROP2",
 	"GetRandomRgn",
 	"GetRegionData",
 	"GetRgnBox",
-	"GetSaveFileNameA",
-	"GetSaveFileNameW",
+	"GetSaveFileName",
 	"GetScrollBarInfo",
 	"GetScrollInfo",
-	"GetStartupInfoA",
-	"GetStartupInfoW",
+	"GetStartupInfo",
 	"GetStockObject",
 	"GetSysColor",
 	"GetSysColorBrush",
@@ -389,10 +311,8 @@ char * OS_nativeFunctionNames[] = {
 	"GetSystemMetrics",
 	"GetSystemPaletteEntries",
 	"GetTextColor",
-	"GetTextExtentPoint32A",
-	"GetTextExtentPoint32W",
-	"GetTextMetricsA",
-	"GetTextMetricsW",
+	"GetTextExtentPoint32",
+	"GetTextMetrics",
 	"GetThemePartSize",
 	"GetThemeTextExtent",
 	"GetTouchInputInfo",
@@ -401,21 +321,16 @@ char * OS_nativeFunctionNames[] = {
 	"GetVersion",
 	"GetWindow",
 	"GetWindowDC",
-	"GetWindowLongA",
-	"GetWindowLongPtrA",
-	"GetWindowLongPtrW",
-	"GetWindowLongW",
+	"GetWindowLong",
+	"GetWindowLongPtr",
 	"GetWindowOrgEx",
 	"GetWindowPlacement",
 	"GetWindowRect",
 	"GetWindowRgn",
-	"GetWindowTextA",
-	"GetWindowTextLengthA",
-	"GetWindowTextLengthW",
-	"GetWindowTextW",
+	"GetWindowText",
+	"GetWindowTextLength",
 	"GetWindowThreadProcessId",
-	"GlobalAddAtomA",
-	"GlobalAddAtomW",
+	"GlobalAddAtom",
 	"GlobalAlloc",
 	"GlobalFree",
 	"GlobalLock",
@@ -454,34 +369,22 @@ char * OS_nativeFunctionNames[] = {
 	"ImmAssociateContext",
 	"ImmCreateContext",
 	"ImmDestroyContext",
-	"ImmEscapeA",
-	"ImmEscapeW",
-	"ImmGetCompositionFontA",
-	"ImmGetCompositionFontW",
-#ifndef JNI64
-	"ImmGetCompositionStringA__II_3BI",
-#else
-	"ImmGetCompositionStringA__JI_3BI",
-#endif
+	"ImmEscape",
+	"ImmGetCompositionFont",
 #ifndef JNI64
-	"ImmGetCompositionStringA__II_3II",
+	"ImmGetCompositionString__II_3BI",
 #else
-	"ImmGetCompositionStringA__JI_3II",
+	"ImmGetCompositionString__JI_3BI",
 #endif
 #ifndef JNI64
-	"ImmGetCompositionStringW__II_3BI",
+	"ImmGetCompositionString__II_3CI",
 #else
-	"ImmGetCompositionStringW__JI_3BI",
+	"ImmGetCompositionString__JI_3CI",
 #endif
 #ifndef JNI64
-	"ImmGetCompositionStringW__II_3CI",
+	"ImmGetCompositionString__II_3II",
 #else
-	"ImmGetCompositionStringW__JI_3CI",
-#endif
-#ifndef JNI64
-	"ImmGetCompositionStringW__II_3II",
-#else
-	"ImmGetCompositionStringW__JI_3II",
+	"ImmGetCompositionString__JI_3II",
 #endif
 	"ImmGetContext",
 	"ImmGetConversionStatus",
@@ -490,19 +393,15 @@ char * OS_nativeFunctionNames[] = {
 	"ImmNotifyIME",
 	"ImmReleaseContext",
 	"ImmSetCandidateWindow",
-	"ImmSetCompositionFontA",
-	"ImmSetCompositionFontW",
+	"ImmSetCompositionFont",
 	"ImmSetCompositionWindow",
 	"ImmSetConversionStatus",
 	"ImmSetOpenStatus",
 	"InitCommonControls",
 	"InitCommonControlsEx",
-	"InsertMenuItemA",
-	"InsertMenuItemW",
-	"InternetGetCookieA",
-	"InternetGetCookieW",
-	"InternetSetCookieA",
-	"InternetSetCookieW",
+	"InsertMenuItem",
+	"InternetGetCookie",
+	"InternetSetCookie",
 	"InternetSetOption",
 	"IntersectClipRect",
 	"IntersectRect",
@@ -520,8 +419,7 @@ char * OS_nativeFunctionNames[] = {
 	"LITEM_1sizeof",
 	"LODWORD",
 	"LOGBRUSH_1sizeof",
-	"LOGFONTA_1sizeof",
-	"LOGFONTW_1sizeof",
+	"LOGFONT_1sizeof",
 	"LOGPEN_1sizeof",
 	"LOWORD",
 	"LPtoDP",
@@ -530,14 +428,10 @@ char * OS_nativeFunctionNames[] = {
 	"LVINSERTMARK_1sizeof",
 	"LVITEM_1sizeof",
 	"LineTo",
-	"LoadBitmapA",
-	"LoadBitmapW",
-	"LoadCursorA",
-	"LoadCursorW",
-	"LoadIconA",
-	"LoadIconW",
-	"LoadImageA",
-	"LoadImageW",
+	"LoadBitmap",
+	"LoadCursor",
+	"LoadIcon",
+	"LoadImage",
 	"LocalFree",
 	"MAKELPARAM",
 	"MAKELRESULT",
@@ -554,8 +448,7 @@ char * OS_nativeFunctionNames[] = {
 	"MOUSEINPUT_1sizeof",
 	"MSG_1sizeof",
 	"MapViewOfFile",
-	"MapVirtualKeyA",
-	"MapVirtualKeyW",
+	"MapVirtualKey",
 #ifndef JNI64
 	"MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I",
 #else
@@ -567,8 +460,7 @@ char * OS_nativeFunctionNames[] = {
 	"MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I",
 #endif
 	"MessageBeep",
-	"MessageBoxA",
-	"MessageBoxW",
+	"MessageBox",
 	"ModifyWorldTransform",
 	"MonitorFromWindow",
 #ifndef JNI64
@@ -577,14 +469,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__JJI",
 #endif
 #ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I",
-#else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I",
-#endif
-#ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I",
+	"MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I",
 #else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I",
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I",
 #endif
 #ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I",
@@ -612,14 +499,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I",
 #endif
 #ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I",
+	"MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I",
 #else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I",
-#endif
-#ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I",
-#else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I",
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I",
 #endif
 #ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I",
@@ -657,14 +539,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I",
 #endif
 #ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I",
-#else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I",
-#endif
-#ifndef JNI64
-	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I",
+	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I",
 #else
-	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I",
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I",
 #endif
 #ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I",
@@ -763,14 +640,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI",
 #endif
 #ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II",
-#else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI",
-#endif
-#ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II",
 #else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI",
 #endif
 #ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II",
@@ -813,14 +685,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI",
 #endif
 #ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II",
 #else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI",
-#endif
-#ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II",
-#else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI",
 #endif
 #ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II",
@@ -913,14 +780,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI",
 #endif
 #ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II",
 #else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI",
-#endif
-#ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II",
-#else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI",
 #endif
 #ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II",
@@ -979,14 +841,9 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI",
 #endif
 #ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II",
 #else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI",
-#endif
-#ifndef JNI64
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II",
-#else
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI",
 #endif
 #ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II",
@@ -1063,28 +920,23 @@ char * OS_nativeFunctionNames[] = {
 	"NMTOOLBAR_1sizeof",
 	"NMTREEVIEW_1sizeof",
 	"NMTTCUSTOMDRAW_1sizeof",
-	"NMTTDISPINFOA_1sizeof",
-	"NMTTDISPINFOW_1sizeof",
+	"NMTTDISPINFO_1sizeof",
 	"NMTVCUSTOMDRAW_1sizeof",
 	"NMTVDISPINFO_1sizeof",
 	"NMTVITEMCHANGE_1sizeof",
 	"NMUPDOWN_1sizeof",
-	"NONCLIENTMETRICSA_1sizeof",
-	"NONCLIENTMETRICSW_1sizeof",
-	"NOTIFYICONDATAA_1V2_1SIZE",
-	"NOTIFYICONDATAW_1V2_1SIZE",
+	"NONCLIENTMETRICS_1sizeof",
+	"NOTIFYICONDATA_1V2_1SIZE",
 	"NotifyWinEvent",
 	"OFNOTIFY_1sizeof",
 	"OPENFILENAME_1sizeof",
-	"OUTLINETEXTMETRICA_1sizeof",
-	"OUTLINETEXTMETRICW_1sizeof",
+	"OUTLINETEXTMETRIC_1sizeof",
 	"OffsetRect",
 	"OffsetRgn",
 	"OleInitialize",
 	"OleUninitialize",
 	"OpenClipboard",
-	"OpenPrinterA",
-	"OpenPrinterW",
+	"OpenPrinter",
 	"OpenProcess",
 	"OpenThemeData",
 	"PAINTSTRUCT_1sizeof",
@@ -1099,17 +951,13 @@ char * OS_nativeFunctionNames[] = {
 	"PSPropertyKeyFromString",
 	"PatBlt",
 	"PathIsExe",
-	"PeekMessageA",
-	"PeekMessageW",
+	"PeekMessage",
 	"Pie",
 	"Polygon",
 	"Polyline",
-	"PostMessageA",
-	"PostMessageW",
-	"PostThreadMessageA",
-	"PostThreadMessageW",
-	"PrintDlgA",
-	"PrintDlgW",
+	"PostMessage",
+	"PostThreadMessage",
+	"PrintDlg",
 	"PrintWindow",
 	"PtInRect",
 	"PtInRegion",
@@ -1120,48 +968,29 @@ char * OS_nativeFunctionNames[] = {
 	"Rectangle",
 	"RedrawWindow",
 	"RegCloseKey",
-	"RegCreateKeyExA",
-	"RegCreateKeyExW",
-	"RegDeleteValueA",
-	"RegDeleteValueW",
-	"RegEnumKeyExA",
-	"RegEnumKeyExW",
-	"RegOpenKeyExA",
-	"RegOpenKeyExW",
-#ifndef JNI64
-	"RegQueryValueExA__I_3BI_3I_3B_3I",
-#else
-	"RegQueryValueExA__J_3BJ_3I_3B_3I",
-#endif
-#ifndef JNI64
-	"RegQueryValueExA__I_3BI_3I_3I_3I",
-#else
-	"RegQueryValueExA__J_3BJ_3I_3I_3I",
-#endif
+	"RegCreateKeyEx",
+	"RegDeleteValue",
+	"RegEnumKeyEx",
+	"RegOpenKeyEx",
 #ifndef JNI64
-	"RegQueryValueExW__I_3CI_3I_3C_3I",
+	"RegQueryValueEx__I_3CI_3I_3C_3I",
 #else
-	"RegQueryValueExW__J_3CJ_3I_3C_3I",
+	"RegQueryValueEx__J_3CJ_3I_3C_3I",
 #endif
 #ifndef JNI64
-	"RegQueryValueExW__I_3CI_3I_3I_3I",
+	"RegQueryValueEx__I_3CI_3I_3I_3I",
 #else
-	"RegQueryValueExW__J_3CJ_3I_3I_3I",
+	"RegQueryValueEx__J_3CJ_3I_3I_3I",
 #endif
-	"RegSetValueExA",
-	"RegSetValueExW",
-	"RegisterClassA",
-	"RegisterClassW",
-	"RegisterClipboardFormatA",
-	"RegisterClipboardFormatW",
+	"RegSetValueEx",
+	"RegisterClass",
+	"RegisterClipboardFormat",
 	"RegisterTouchWindow",
-	"RegisterWindowMessageA",
-	"RegisterWindowMessageW",
+	"RegisterWindowMessage",
 	"ReleaseCapture",
 	"ReleaseDC",
 	"RemoveMenu",
-	"RemovePropA",
-	"RemovePropW",
+	"RemoveProp",
 	"ReplyMessage",
 	"RestoreDC",
 	"RoundRect",
@@ -1178,20 +1007,16 @@ char * OS_nativeFunctionNames[] = {
 	"SCRIPT_1STRING_1ANALYSIS_1sizeof",
 	"SCROLLBARINFO_1sizeof",
 	"SCROLLINFO_1sizeof",
-	"SHBrowseForFolderA",
-	"SHBrowseForFolderW",
+	"SHBrowseForFolder",
 	"SHCreateItemFromParsingName",
 	"SHCreateItemFromRelativeName",
 	"SHCreateItemInKnownFolder",
 	"SHDRAGIMAGE_1sizeof",
 	"SHELLEXECUTEINFO_1sizeof",
-	"SHFILEINFOA_1sizeof",
-	"SHFILEINFOW_1sizeof",
-	"SHGetFileInfoA",
-	"SHGetFileInfoW",
+	"SHFILEINFO_1sizeof",
+	"SHGetFileInfo",
 	"SHGetMalloc",
-	"SHGetPathFromIDListA",
-	"SHGetPathFromIDListW",
+	"SHGetPathFromIDList",
 	"SIZE_1sizeof",
 	"STARTUPINFO_1sizeof",
 	"SYSTEMTIME_1sizeof",
@@ -1223,339 +1048,154 @@ char * OS_nativeFunctionNames[] = {
 	"SelectPalette",
 	"SendInput",
 #ifndef JNI64
-	"SendMessageA__IIII",
-#else
-	"SendMessageA__JIJJ",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2",
-#else
-	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2",
-#endif
-#ifndef JNI64
-	"SendMessageA__III_3B",
-#else
-	"SendMessageA__JIJ_3B",
-#endif
-#ifndef JNI64
-	"SendMessageA__III_3C",
-#else
-	"SendMessageA__JIJ_3C",
-#endif
-#ifndef JNI64
-	"SendMessageA__III_3I",
-#else
-	"SendMessageA__JIJ_3I",
-#endif
-#ifndef JNI64
-	"SendMessageA__III_3S",
-#else
-	"SendMessageA__JIJ_3S",
-#endif
-#ifndef JNI64
-	"SendMessageA__II_3II",
-#else
-	"SendMessageA__JI_3JJ",
-#endif
-#ifndef JNI64
-	"SendMessageA__II_3I_3I",
-#else
-	"SendMessageA__JI_3I_3I",
-#endif
-#ifndef JNI64
-	"SendMessageW__IIII",
-#else
-	"SendMessageW__JIJJ",
-#endif
-#ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
-#else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
-#endif
-#ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
-#else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
-#endif
-#ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2",
+	"SendMessage__IIII",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2",
+	"SendMessage__JIJJ",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2",
 #else
-	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__III_3C",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2",
 #else
-	"SendMessageW__JIJ_3C",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__III_3I",
+	"SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2",
 #else
-	"SendMessageW__JIJ_3I",
+	"SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2",
 #endif
 #ifndef JNI64
-	"SendMessageW__III_3S",
+	"SendMessage__III_3C",
 #else
-	"SendMessageW__JIJ_3S",
+	"SendMessage__JIJ_3C",
 #endif
 #ifndef JNI64
-	"SendMessageW__II_3II",
+	"SendMessage__III_3I",
 #else
-	"SendMessageW__JI_3JJ",
+	"SendMessage__JIJ_3I",
 #endif
 #ifndef JNI64
-	"SendMessageW__II_3I_3I",
+	"SendMessage__II_3I_3I",
 #else
-	"SendMessageW__JI_3I_3I",
+	"SendMessage__JI_3I_3I",
 #endif
 	"SetActiveWindow",
 	"SetBkColor",
@@ -1567,8 +1207,7 @@ char * OS_nativeFunctionNames[] = {
 	"SetCursor",
 	"SetCursorPos",
 	"SetDIBColorTable",
-	"SetDllDirectoryA",
-	"SetDllDirectoryW",
+	"SetDllDirectory",
 	"SetErrorMode",
 	"SetFocus",
 	"SetForegroundWindow",
@@ -1579,16 +1218,14 @@ char * OS_nativeFunctionNames[] = {
 	"SetMenu",
 	"SetMenuDefaultItem",
 	"SetMenuInfo",
-	"SetMenuItemInfoA",
-	"SetMenuItemInfoW",
+	"SetMenuItemInfo",
 	"SetMetaRgn",
 	"SetPaletteEntries",
 	"SetParent",
 	"SetPixel",
 	"SetPolyFillMode",
 	"SetProcessDPIAware",
-	"SetPropA",
-	"SetPropW",
+	"SetProp",
 	"SetROP2",
 	"SetRect",
 	"SetRectRgn",
@@ -1596,47 +1233,34 @@ char * OS_nativeFunctionNames[] = {
 	"SetStretchBltMode",
 	"SetTextColor",
 	"SetTimer",
-	"SetWindowLongA",
-	"SetWindowLongPtrA",
-	"SetWindowLongPtrW",
-	"SetWindowLongW",
+	"SetWindowLong",
+	"SetWindowLongPtr",
 	"SetWindowOrgEx",
 	"SetWindowPlacement",
 	"SetWindowPos",
 	"SetWindowRgn",
-	"SetWindowTextA",
-	"SetWindowTextW",
+	"SetWindowText",
 	"SetWindowTheme",
-	"SetWindowsHookExA",
-	"SetWindowsHookExW",
+	"SetWindowsHookEx",
 	"SetWorldTransform",
-	"ShellExecuteExA",
-	"ShellExecuteExW",
-	"Shell_1NotifyIconA",
-	"Shell_1NotifyIconW",
+	"ShellExecuteEx",
+	"Shell_1NotifyIcon",
 	"ShowCaret",
 	"ShowOwnedPopups",
 	"ShowScrollBar",
 	"ShowWindow",
-	"StartDocA",
-	"StartDocW",
+	"StartDoc",
 	"StartPage",
 	"StretchBlt",
-	"StrokePath",
-	"SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I",
-	"SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I",
-	"SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I",
-	"SystemParametersInfoA__II_3II",
-	"SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I",
-	"SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I",
-	"SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I",
-	"SystemParametersInfoW__II_3II",
+	"SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I",
+	"SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I",
+	"SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I",
+	"SystemParametersInfo__II_3II",
 	"TBBUTTONINFO_1sizeof",
 	"TBBUTTON_1sizeof",
 	"TCHITTESTINFO_1sizeof",
 	"TCITEM_1sizeof",
-	"TEXTMETRICA_1sizeof",
-	"TEXTMETRICW_1sizeof",
+	"TEXTMETRIC_1sizeof",
 	"TF_1DA_1COLOR_1sizeof",
 	"TF_1DISPLAYATTRIBUTE_1sizeof",
 	"TOOLINFO_1sizeof",
@@ -1649,12 +1273,10 @@ char * OS_nativeFunctionNames[] = {
 	"TVITEMEX_1sizeof",
 	"TVITEM_1sizeof",
 	"TVSORTCB_1sizeof",
-	"ToAscii",
 	"ToUnicode",
 	"TrackMouseEvent",
 	"TrackPopupMenu",
-	"TranslateAcceleratorA",
-	"TranslateAcceleratorW",
+	"TranslateAccelerator",
 	"TranslateCharsetInfo",
 	"TranslateMDISysAccel",
 	"TranslateMessage",
@@ -1663,15 +1285,12 @@ char * OS_nativeFunctionNames[] = {
 	"UDACCEL_1sizeof",
 	"UnhookWindowsHookEx",
 	"UnmapViewOfFile",
-	"UnregisterClassA",
-	"UnregisterClassW",
+	"UnregisterClass",
 	"UnregisterTouchWindow",
 	"UpdateWindow",
-	"UrlCreateFromPathA",
-	"UrlCreateFromPathW",
+	"UrlCreateFromPath",
 	"ValidateRect",
-	"VkKeyScanA",
-	"VkKeyScanW",
+	"VkKeyScan",
 #ifndef JNI64
 	"VtblCall__II",
 #else
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 04e13f26c5..8e2fb4ee60 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
@@ -36,14 +36,12 @@ typedef enum {
 	AbortDoc_FUNC,
 	ActivateActCtx_FUNC,
 	ActivateKeyboardLayout_FUNC,
-	AddFontResourceExA_FUNC,
-	AddFontResourceExW_FUNC,
+	AddFontResourceEx_FUNC,
 	AdjustWindowRectEx_FUNC,
 	AllowSetForegroundWindow_FUNC,
 	AlphaBlend_FUNC,
 	Arc_FUNC,
-	AssocQueryStringA_FUNC,
-	AssocQueryStringW_FUNC,
+	AssocQueryString_FUNC,
 	BITMAPINFOHEADER_1sizeof_FUNC,
 	BITMAP_1sizeof_FUNC,
 	BLENDFUNCTION_1sizeof_FUNC,
@@ -73,18 +71,12 @@ typedef enum {
 	CRYPT_1INTEGER_1BLOB_1sizeof_FUNC,
 	CRYPT_1OBJID_1BLOB_1sizeof_FUNC,
 	CallNextHookEx_FUNC,
-	CallWindowProcA_FUNC,
-	CallWindowProcW_FUNC,
-	CertNameToStrA_FUNC,
-	CertNameToStrW_FUNC,
-	CharLowerA_FUNC,
-	CharLowerW_FUNC,
-	CharUpperA_FUNC,
-	CharUpperW_FUNC,
-	ChooseColorA_FUNC,
-	ChooseColorW_FUNC,
-	ChooseFontA_FUNC,
-	ChooseFontW_FUNC,
+	CallWindowProc_FUNC,
+	CertNameToStr_FUNC,
+	CharLower_FUNC,
+	CharUpper_FUNC,
+	ChooseColor_FUNC,
+	ChooseFont_FUNC,
 	ClientToScreen_FUNC,
 	CloseClipboard_FUNC,
 	CloseEnhMetaFile_FUNC,
@@ -101,17 +93,14 @@ typedef enum {
 	CombineRgn_FUNC,
 	CommDlgExtendedError_FUNC,
 	CopyImage_FUNC,
-	CreateAcceleratorTableA_FUNC,
-	CreateAcceleratorTableW_FUNC,
-	CreateActCtxA_FUNC,
-	CreateActCtxW_FUNC,
+	CreateAcceleratorTable_FUNC,
+	CreateActCtx_FUNC,
 	CreateBitmap_FUNC,
 	CreateCaret_FUNC,
 	CreateCompatibleBitmap_FUNC,
 	CreateCompatibleDC_FUNC,
 	CreateCursor_FUNC,
-	CreateDCA_FUNC,
-	CreateDCW_FUNC,
+	CreateDC_FUNC,
 #ifndef JNI64
 	CreateDIBSection__III_3III_FUNC,
 #else
@@ -122,20 +111,13 @@ typedef enum {
 #else
 	CreateDIBSection__J_3BI_3JJI_FUNC,
 #endif
-	CreateEnhMetaFileA_FUNC,
-	CreateEnhMetaFileW_FUNC,
+	CreateEnhMetaFile_FUNC,
 #ifndef JNI64
-	CreateFontIndirectA__I_FUNC,
+	CreateFontIndirect__I_FUNC,
 #else
-	CreateFontIndirectA__J_FUNC,
+	CreateFontIndirect__J_FUNC,
 #endif
-	CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
-#ifndef JNI64
-	CreateFontIndirectW__I_FUNC,
-#else
-	CreateFontIndirectW__J_FUNC,
-#endif
-	CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
+	CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC,
 	CreateIconIndirect_FUNC,
 	CreateMenu_FUNC,
 	CreatePalette_FUNC,
@@ -143,27 +125,21 @@ typedef enum {
 	CreatePen_FUNC,
 	CreatePolygonRgn_FUNC,
 	CreatePopupMenu_FUNC,
-	CreateProcessA_FUNC,
-	CreateProcessW_FUNC,
+	CreateProcess_FUNC,
 	CreateRectRgn_FUNC,
 	CreateSolidBrush_FUNC,
 	CreateStreamOnHGlobal_FUNC,
-	CreateWindowExA_FUNC,
-	CreateWindowExW_FUNC,
-	DEVMODEA_1sizeof_FUNC,
-	DEVMODEW_1sizeof_FUNC,
+	CreateWindowEx_FUNC,
+	DEVMODE_1sizeof_FUNC,
 	DIBSECTION_1sizeof_FUNC,
 	DOCHOSTUIINFO_1sizeof_FUNC,
 	DOCINFO_1sizeof_FUNC,
 	DRAWITEMSTRUCT_1sizeof_FUNC,
 	DROPFILES_1sizeof_FUNC,
 	DTTOPTS_1sizeof_FUNC,
-	DefFrameProcA_FUNC,
-	DefFrameProcW_FUNC,
-	DefMDIChildProcA_FUNC,
-	DefMDIChildProcW_FUNC,
-	DefWindowProcA_FUNC,
-	DefWindowProcW_FUNC,
+	DefFrameProc_FUNC,
+	DefMDIChildProc_FUNC,
+	DefWindowProc_FUNC,
 	DeferWindowPos_FUNC,
 	DeleteDC_FUNC,
 	DeleteEnhMetaFile_FUNC,
@@ -175,21 +151,17 @@ typedef enum {
 	DestroyIcon_FUNC,
 	DestroyMenu_FUNC,
 	DestroyWindow_FUNC,
-	DispatchMessageA_FUNC,
-	DispatchMessageW_FUNC,
-	DocumentPropertiesA_FUNC,
-	DocumentPropertiesW_FUNC,
+	DispatchMessage_FUNC,
+	DocumentProperties_FUNC,
 	DragDetect_FUNC,
 	DragFinish_FUNC,
-	DragQueryFileA_FUNC,
-	DragQueryFileW_FUNC,
+	DragQueryFile_FUNC,
 	DrawEdge_FUNC,
 	DrawFocusRect_FUNC,
 	DrawFrameControl_FUNC,
 	DrawIconEx_FUNC,
 	DrawMenuBar_FUNC,
-	DrawTextA_FUNC,
-	DrawTextW_FUNC,
+	DrawText_FUNC,
 	DrawThemeBackground_FUNC,
 	DrawThemeText_FUNC,
 	DuplicateHandle_FUNC,
@@ -207,29 +179,22 @@ typedef enum {
 	EndPaint_FUNC,
 	EnumDisplayMonitors_FUNC,
 	EnumEnhMetaFile_FUNC,
-	EnumFontFamiliesA_FUNC,
-	EnumFontFamiliesW_FUNC,
-	EnumSystemLanguageGroupsA_FUNC,
-	EnumSystemLanguageGroupsW_FUNC,
-	EnumSystemLocalesA_FUNC,
-	EnumSystemLocalesW_FUNC,
+	EnumFontFamilies_FUNC,
+	EnumSystemLanguageGroups_FUNC,
+	EnumSystemLocales_FUNC,
 	EqualRect_FUNC,
 	ExcludeClipRect_FUNC,
-	ExpandEnvironmentStringsA_FUNC,
-	ExpandEnvironmentStringsW_FUNC,
+	ExpandEnvironmentStrings_FUNC,
 	ExtCreatePen_FUNC,
 	ExtCreateRegion_FUNC,
-	ExtTextOutA_FUNC,
-	ExtTextOutW_FUNC,
-	ExtractIconExA_FUNC,
-	ExtractIconExW_FUNC,
+	ExtTextOut_FUNC,
+	ExtractIconEx_FUNC,
 	FILETIME_1sizeof_FUNC,
 	FLICK_1DATA_1sizeof_FUNC,
 	FLICK_1POINT_1sizeof_FUNC,
 	FileTimeToSystemTime_FUNC,
 	FillRect_FUNC,
-	FormatMessageA_FUNC,
-	FormatMessageW_FUNC,
+	FormatMessage_FUNC,
 	GCP_1RESULTS_1sizeof_FUNC,
 	GESTURECONFIG_1sizeof_FUNC,
 	GESTUREINFO_1sizeof_FUNC,
@@ -245,22 +210,16 @@ typedef enum {
 	GetBkColor_FUNC,
 	GetCapture_FUNC,
 	GetCaretPos_FUNC,
-	GetCharABCWidthsA_FUNC,
-	GetCharABCWidthsW_FUNC,
-	GetCharWidthA_FUNC,
-	GetCharWidthW_FUNC,
-	GetCharacterPlacementA_FUNC,
-	GetCharacterPlacementW_FUNC,
-	GetClassInfoA_FUNC,
-	GetClassInfoW_FUNC,
-	GetClassNameA_FUNC,
-	GetClassNameW_FUNC,
+	GetCharABCWidths_FUNC,
+	GetCharWidth_FUNC,
+	GetCharacterPlacement_FUNC,
+	GetClassInfo_FUNC,
+	GetClassName_FUNC,
 	GetClientRect_FUNC,
 	GetClipBox_FUNC,
 	GetClipRgn_FUNC,
 	GetClipboardData_FUNC,
-	GetClipboardFormatNameA_FUNC,
-	GetClipboardFormatNameW_FUNC,
+	GetClipboardFormatName_FUNC,
 	GetComboBoxInfo_FUNC,
 	GetCurrentObject_FUNC,
 	GetCurrentProcess_FUNC,
@@ -284,7 +243,7 @@ typedef enum {
 	GetForegroundWindow_FUNC,
 	GetGUIThreadInfo_FUNC,
 	GetGestureInfo_FUNC,
-	GetGlyphIndicesW_FUNC,
+	GetGlyphIndices_FUNC,
 	GetGraphicsMode_FUNC,
 	GetIconInfo_FUNC,
 	GetKeyState_FUNC,
@@ -296,101 +255,64 @@ typedef enum {
 	GetLayeredWindowAttributes_FUNC,
 	GetLayout_FUNC,
 	GetLibraryHandle_FUNC,
-	GetLocaleInfoA_FUNC,
-	GetLocaleInfoW_FUNC,
+	GetLocaleInfo_FUNC,
 	GetMenu_FUNC,
 	GetMenuBarInfo_FUNC,
 	GetMenuDefaultItem_FUNC,
 	GetMenuInfo_FUNC,
 	GetMenuItemCount_FUNC,
-	GetMenuItemInfoA_FUNC,
-	GetMenuItemInfoW_FUNC,
+	GetMenuItemInfo_FUNC,
 	GetMenuItemRect_FUNC,
-	GetMessageA_FUNC,
+	GetMessage_FUNC,
 	GetMessagePos_FUNC,
 	GetMessageTime_FUNC,
-	GetMessageW_FUNC,
 	GetMetaRgn_FUNC,
-	GetModuleFileNameA_FUNC,
-	GetModuleFileNameW_FUNC,
-	GetModuleHandleA_FUNC,
-	GetModuleHandleW_FUNC,
-	GetMonitorInfoA_FUNC,
-	GetMonitorInfoW_FUNC,
+	GetModuleFileName_FUNC,
+	GetModuleHandle_FUNC,
+	GetMonitorInfo_FUNC,
 	GetNearestPaletteIndex_FUNC,
 #ifndef JNI64
-	GetObjectA__III_FUNC,
-#else
-	GetObjectA__JIJ_FUNC,
-#endif
-#ifndef JNI64
-	GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+	GetObject__III_FUNC,
 #else
-	GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+	GetObject__JIJ_FUNC,
 #endif
 #ifndef JNI64
-	GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+	GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
 #else
-	GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+	GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
 #endif
 #ifndef JNI64
-	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+	GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
 #else
-	GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+	GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
 #endif
 #ifndef JNI64
-	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
+	GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
 #else
-	GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
+	GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
 #endif
 #ifndef JNI64
-	GetObjectW__III_FUNC,
+	GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC,
 #else
-	GetObjectW__JIJ_FUNC,
+	GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC,
 #endif
-#ifndef JNI64
-	GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
-#else
-	GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
-#endif
-#ifndef JNI64
-	GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
-#else
-	GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
-#endif
-#ifndef JNI64
-	GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
-#else
-	GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
-#endif
-#ifndef JNI64
-	GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
-#else
-	GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
-#endif
-	GetOpenFileNameA_FUNC,
-	GetOpenFileNameW_FUNC,
-	GetOutlineTextMetricsA_FUNC,
-	GetOutlineTextMetricsW_FUNC,
+	GetOpenFileName_FUNC,
+	GetOutlineTextMetrics_FUNC,
 	GetPaletteEntries_FUNC,
 	GetParent_FUNC,
 	GetPixel_FUNC,
 	GetPolyFillMode_FUNC,
 	GetProcessHeap_FUNC,
-	GetProfileStringA_FUNC,
-	GetProfileStringW_FUNC,
-	GetPropA_FUNC,
-	GetPropW_FUNC,
+	GetProfileString_FUNC,
+	GetProp_FUNC,
 	GetROP2_FUNC,
 	GetRandomRgn_FUNC,
 	GetRegionData_FUNC,
 	GetRgnBox_FUNC,
-	GetSaveFileNameA_FUNC,
-	GetSaveFileNameW_FUNC,
+	GetSaveFileName_FUNC,
 	GetScrollBarInfo_FUNC,
 	GetScrollInfo_FUNC,
-	GetStartupInfoA_FUNC,
-	GetStartupInfoW_FUNC,
+	GetStartupInfo_FUNC,
 	GetStockObject_FUNC,
 	GetSysColor_FUNC,
 	GetSysColorBrush_FUNC,
@@ -399,10 +321,8 @@ typedef enum {
 	GetSystemMetrics_FUNC,
 	GetSystemPaletteEntries_FUNC,
 	GetTextColor_FUNC,
-	GetTextExtentPoint32A_FUNC,
-	GetTextExtentPoint32W_FUNC,
-	GetTextMetricsA_FUNC,
-	GetTextMetricsW_FUNC,
+	GetTextExtentPoint32_FUNC,
+	GetTextMetrics_FUNC,
 	GetThemePartSize_FUNC,
 	GetThemeTextExtent_FUNC,
 	GetTouchInputInfo_FUNC,
@@ -411,21 +331,16 @@ typedef enum {
 	GetVersion_FUNC,
 	GetWindow_FUNC,
 	GetWindowDC_FUNC,
-	GetWindowLongA_FUNC,
-	GetWindowLongPtrA_FUNC,
-	GetWindowLongPtrW_FUNC,
-	GetWindowLongW_FUNC,
+	GetWindowLong_FUNC,
+	GetWindowLongPtr_FUNC,
 	GetWindowOrgEx_FUNC,
 	GetWindowPlacement_FUNC,
 	GetWindowRect_FUNC,
 	GetWindowRgn_FUNC,
-	GetWindowTextA_FUNC,
-	GetWindowTextLengthA_FUNC,
-	GetWindowTextLengthW_FUNC,
-	GetWindowTextW_FUNC,
+	GetWindowText_FUNC,
+	GetWindowTextLength_FUNC,
 	GetWindowThreadProcessId_FUNC,
-	GlobalAddAtomA_FUNC,
-	GlobalAddAtomW_FUNC,
+	GlobalAddAtom_FUNC,
 	GlobalAlloc_FUNC,
 	GlobalFree_FUNC,
 	GlobalLock_FUNC,
@@ -464,34 +379,22 @@ typedef enum {
 	ImmAssociateContext_FUNC,
 	ImmCreateContext_FUNC,
 	ImmDestroyContext_FUNC,
-	ImmEscapeA_FUNC,
-	ImmEscapeW_FUNC,
-	ImmGetCompositionFontA_FUNC,
-	ImmGetCompositionFontW_FUNC,
-#ifndef JNI64
-	ImmGetCompositionStringA__II_3BI_FUNC,
-#else
-	ImmGetCompositionStringA__JI_3BI_FUNC,
-#endif
+	ImmEscape_FUNC,
+	ImmGetCompositionFont_FUNC,
 #ifndef JNI64
-	ImmGetCompositionStringA__II_3II_FUNC,
+	ImmGetCompositionString__II_3BI_FUNC,
 #else
-	ImmGetCompositionStringA__JI_3II_FUNC,
+	ImmGetCompositionString__JI_3BI_FUNC,
 #endif
 #ifndef JNI64
-	ImmGetCompositionStringW__II_3BI_FUNC,
+	ImmGetCompositionString__II_3CI_FUNC,
 #else
-	ImmGetCompositionStringW__JI_3BI_FUNC,
+	ImmGetCompositionString__JI_3CI_FUNC,
 #endif
 #ifndef JNI64
-	ImmGetCompositionStringW__II_3CI_FUNC,
+	ImmGetCompositionString__II_3II_FUNC,
 #else
-	ImmGetCompositionStringW__JI_3CI_FUNC,
-#endif
-#ifndef JNI64
-	ImmGetCompositionStringW__II_3II_FUNC,
-#else
-	ImmGetCompositionStringW__JI_3II_FUNC,
+	ImmGetCompositionString__JI_3II_FUNC,
 #endif
 	ImmGetContext_FUNC,
 	ImmGetConversionStatus_FUNC,
@@ -500,19 +403,15 @@ typedef enum {
 	ImmNotifyIME_FUNC,
 	ImmReleaseContext_FUNC,
 	ImmSetCandidateWindow_FUNC,
-	ImmSetCompositionFontA_FUNC,
-	ImmSetCompositionFontW_FUNC,
+	ImmSetCompositionFont_FUNC,
 	ImmSetCompositionWindow_FUNC,
 	ImmSetConversionStatus_FUNC,
 	ImmSetOpenStatus_FUNC,
 	InitCommonControls_FUNC,
 	InitCommonControlsEx_FUNC,
-	InsertMenuItemA_FUNC,
-	InsertMenuItemW_FUNC,
-	InternetGetCookieA_FUNC,
-	InternetGetCookieW_FUNC,
-	InternetSetCookieA_FUNC,
-	InternetSetCookieW_FUNC,
+	InsertMenuItem_FUNC,
+	InternetGetCookie_FUNC,
+	InternetSetCookie_FUNC,
 	InternetSetOption_FUNC,
 	IntersectClipRect_FUNC,
 	IntersectRect_FUNC,
@@ -530,8 +429,7 @@ typedef enum {
 	LITEM_1sizeof_FUNC,
 	LODWORD_FUNC,
 	LOGBRUSH_1sizeof_FUNC,
-	LOGFONTA_1sizeof_FUNC,
-	LOGFONTW_1sizeof_FUNC,
+	LOGFONT_1sizeof_FUNC,
 	LOGPEN_1sizeof_FUNC,
 	LOWORD_FUNC,
 	LPtoDP_FUNC,
@@ -540,14 +438,10 @@ typedef enum {
 	LVINSERTMARK_1sizeof_FUNC,
 	LVITEM_1sizeof_FUNC,
 	LineTo_FUNC,
-	LoadBitmapA_FUNC,
-	LoadBitmapW_FUNC,
-	LoadCursorA_FUNC,
-	LoadCursorW_FUNC,
-	LoadIconA_FUNC,
-	LoadIconW_FUNC,
-	LoadImageA_FUNC,
-	LoadImageW_FUNC,
+	LoadBitmap_FUNC,
+	LoadCursor_FUNC,
+	LoadIcon_FUNC,
+	LoadImage_FUNC,
 	LocalFree_FUNC,
 	MAKELPARAM_FUNC,
 	MAKELRESULT_FUNC,
@@ -564,8 +458,7 @@ typedef enum {
 	MOUSEINPUT_1sizeof_FUNC,
 	MSG_1sizeof_FUNC,
 	MapViewOfFile_FUNC,
-	MapVirtualKeyA_FUNC,
-	MapVirtualKeyW_FUNC,
+	MapVirtualKey_FUNC,
 #ifndef JNI64
 	MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
 #else
@@ -577,8 +470,7 @@ typedef enum {
 	MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
 #endif
 	MessageBeep_FUNC,
-	MessageBoxA_FUNC,
-	MessageBoxW_FUNC,
+	MessageBox_FUNC,
 	ModifyWorldTransform_FUNC,
 	MonitorFromWindow_FUNC,
 #ifndef JNI64
@@ -587,14 +479,9 @@ typedef enum {
 	MoveMemory__JJI_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC,
-#else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEA_2I_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC,
+	MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC,
 #else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODEW_2I_FUNC,
+	MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC,
@@ -622,14 +509,9 @@ typedef enum {
 	MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC,
+	MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC,
 #else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC,
-#else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC,
+	MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC,
@@ -667,14 +549,9 @@ typedef enum {
 	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC,
-#else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC,
+	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC,
 #else
-	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC,
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC,
@@ -773,14 +650,9 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2II_FUNC,
-#else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEA_2JI_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC,
 #else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODEW_2JI_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC,
@@ -823,14 +695,9 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC,
 #else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC,
-#else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC,
@@ -923,14 +790,9 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC,
 #else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC,
-#else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC,
@@ -989,14 +851,9 @@ typedef enum {
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC,
 #endif
 #ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC,
 #else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC,
-#endif
-#ifndef JNI64
-	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC,
-#else
-	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC,
 #endif
 #ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II_FUNC,
@@ -1073,28 +930,23 @@ typedef enum {
 	NMTOOLBAR_1sizeof_FUNC,
 	NMTREEVIEW_1sizeof_FUNC,
 	NMTTCUSTOMDRAW_1sizeof_FUNC,
-	NMTTDISPINFOA_1sizeof_FUNC,
-	NMTTDISPINFOW_1sizeof_FUNC,
+	NMTTDISPINFO_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,
+	NONCLIENTMETRICS_1sizeof_FUNC,
+	NOTIFYICONDATA_1V2_1SIZE_FUNC,
 	NotifyWinEvent_FUNC,
 	OFNOTIFY_1sizeof_FUNC,
 	OPENFILENAME_1sizeof_FUNC,
-	OUTLINETEXTMETRICA_1sizeof_FUNC,
-	OUTLINETEXTMETRICW_1sizeof_FUNC,
+	OUTLINETEXTMETRIC_1sizeof_FUNC,
 	OffsetRect_FUNC,
 	OffsetRgn_FUNC,
 	OleInitialize_FUNC,
 	OleUninitialize_FUNC,
 	OpenClipboard_FUNC,
-	OpenPrinterA_FUNC,
-	OpenPrinterW_FUNC,
+	OpenPrinter_FUNC,
 	OpenProcess_FUNC,
 	OpenThemeData_FUNC,
 	PAINTSTRUCT_1sizeof_FUNC,
@@ -1109,17 +961,13 @@ typedef enum {
 	PSPropertyKeyFromString_FUNC,
 	PatBlt_FUNC,
 	PathIsExe_FUNC,
-	PeekMessageA_FUNC,
-	PeekMessageW_FUNC,
+	PeekMessage_FUNC,
 	Pie_FUNC,
 	Polygon_FUNC,
 	Polyline_FUNC,
-	PostMessageA_FUNC,
-	PostMessageW_FUNC,
-	PostThreadMessageA_FUNC,
-	PostThreadMessageW_FUNC,
-	PrintDlgA_FUNC,
-	PrintDlgW_FUNC,
+	PostMessage_FUNC,
+	PostThreadMessage_FUNC,
+	PrintDlg_FUNC,
 	PrintWindow_FUNC,
 	PtInRect_FUNC,
 	PtInRegion_FUNC,
@@ -1130,48 +978,29 @@ typedef enum {
 	Rectangle_FUNC,
 	RedrawWindow_FUNC,
 	RegCloseKey_FUNC,
-	RegCreateKeyExA_FUNC,
-	RegCreateKeyExW_FUNC,
-	RegDeleteValueA_FUNC,
-	RegDeleteValueW_FUNC,
-	RegEnumKeyExA_FUNC,
-	RegEnumKeyExW_FUNC,
-	RegOpenKeyExA_FUNC,
-	RegOpenKeyExW_FUNC,
-#ifndef JNI64
-	RegQueryValueExA__I_3BI_3I_3B_3I_FUNC,
-#else
-	RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC,
-#endif
-#ifndef JNI64
-	RegQueryValueExA__I_3BI_3I_3I_3I_FUNC,
-#else
-	RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC,
-#endif
+	RegCreateKeyEx_FUNC,
+	RegDeleteValue_FUNC,
+	RegEnumKeyEx_FUNC,
+	RegOpenKeyEx_FUNC,
 #ifndef JNI64
-	RegQueryValueExW__I_3CI_3I_3C_3I_FUNC,
+	RegQueryValueEx__I_3CI_3I_3C_3I_FUNC,
 #else
-	RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC,
+	RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC,
 #endif
 #ifndef JNI64
-	RegQueryValueExW__I_3CI_3I_3I_3I_FUNC,
+	RegQueryValueEx__I_3CI_3I_3I_3I_FUNC,
 #else
-	RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC,
+	RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC,
 #endif
-	RegSetValueExA_FUNC,
-	RegSetValueExW_FUNC,
-	RegisterClassA_FUNC,
-	RegisterClassW_FUNC,
-	RegisterClipboardFormatA_FUNC,
-	RegisterClipboardFormatW_FUNC,
+	RegSetValueEx_FUNC,
+	RegisterClass_FUNC,
+	RegisterClipboardFormat_FUNC,
 	RegisterTouchWindow_FUNC,
-	RegisterWindowMessageA_FUNC,
-	RegisterWindowMessageW_FUNC,
+	RegisterWindowMessage_FUNC,
 	ReleaseCapture_FUNC,
 	ReleaseDC_FUNC,
 	RemoveMenu_FUNC,
-	RemovePropA_FUNC,
-	RemovePropW_FUNC,
+	RemoveProp_FUNC,
 	ReplyMessage_FUNC,
 	RestoreDC_FUNC,
 	RoundRect_FUNC,
@@ -1188,20 +1017,16 @@ typedef enum {
 	SCRIPT_1STRING_1ANALYSIS_1sizeof_FUNC,
 	SCROLLBARINFO_1sizeof_FUNC,
 	SCROLLINFO_1sizeof_FUNC,
-	SHBrowseForFolderA_FUNC,
-	SHBrowseForFolderW_FUNC,
+	SHBrowseForFolder_FUNC,
 	SHCreateItemFromParsingName_FUNC,
 	SHCreateItemFromRelativeName_FUNC,
 	SHCreateItemInKnownFolder_FUNC,
 	SHDRAGIMAGE_1sizeof_FUNC,
 	SHELLEXECUTEINFO_1sizeof_FUNC,
-	SHFILEINFOA_1sizeof_FUNC,
-	SHFILEINFOW_1sizeof_FUNC,
-	SHGetFileInfoA_FUNC,
-	SHGetFileInfoW_FUNC,
+	SHFILEINFO_1sizeof_FUNC,
+	SHGetFileInfo_FUNC,
 	SHGetMalloc_FUNC,
-	SHGetPathFromIDListA_FUNC,
-	SHGetPathFromIDListW_FUNC,
+	SHGetPathFromIDList_FUNC,
 	SIZE_1sizeof_FUNC,
 	STARTUPINFO_1sizeof_FUNC,
 	SYSTEMTIME_1sizeof_FUNC,
@@ -1233,339 +1058,154 @@ typedef enum {
 	SelectPalette_FUNC,
 	SendInput_FUNC,
 #ifndef JNI64
-	SendMessageA__IIII_FUNC,
-#else
-	SendMessageA__JIJJ_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
-#else
-	SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__III_3B_FUNC,
-#else
-	SendMessageA__JIJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__III_3C_FUNC,
-#else
-	SendMessageA__JIJ_3C_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__III_3I_FUNC,
-#else
-	SendMessageA__JIJ_3I_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__III_3S_FUNC,
-#else
-	SendMessageA__JIJ_3S_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__II_3II_FUNC,
-#else
-	SendMessageA__JI_3JJ_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageA__II_3I_3I_FUNC,
-#else
-	SendMessageA__JI_3I_3I_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageW__IIII_FUNC,
-#else
-	SendMessageW__JIJJ_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
-#else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
-#else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
-#endif
-#ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+	SendMessage__IIII_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+	SendMessage__JIJJ_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
 #else
-	SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__III_3C_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
 #else
-	SendMessageW__JIJ_3C_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__III_3I_FUNC,
+	SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
 #else
-	SendMessageW__JIJ_3I_FUNC,
+	SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__III_3S_FUNC,
+	SendMessage__III_3C_FUNC,
 #else
-	SendMessageW__JIJ_3S_FUNC,
+	SendMessage__JIJ_3C_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__II_3II_FUNC,
+	SendMessage__III_3I_FUNC,
 #else
-	SendMessageW__JI_3JJ_FUNC,
+	SendMessage__JIJ_3I_FUNC,
 #endif
 #ifndef JNI64
-	SendMessageW__II_3I_3I_FUNC,
+	SendMessage__II_3I_3I_FUNC,
 #else
-	SendMessageW__JI_3I_3I_FUNC,
+	SendMessage__JI_3I_3I_FUNC,
 #endif
 	SetActiveWindow_FUNC,
 	SetBkColor_FUNC,
@@ -1577,8 +1217,7 @@ typedef enum {
 	SetCursor_FUNC,
 	SetCursorPos_FUNC,
 	SetDIBColorTable_FUNC,
-	SetDllDirectoryA_FUNC,
-	SetDllDirectoryW_FUNC,
+	SetDllDirectory_FUNC,
 	SetErrorMode_FUNC,
 	SetFocus_FUNC,
 	SetForegroundWindow_FUNC,
@@ -1589,16 +1228,14 @@ typedef enum {
 	SetMenu_FUNC,
 	SetMenuDefaultItem_FUNC,
 	SetMenuInfo_FUNC,
-	SetMenuItemInfoA_FUNC,
-	SetMenuItemInfoW_FUNC,
+	SetMenuItemInfo_FUNC,
 	SetMetaRgn_FUNC,
 	SetPaletteEntries_FUNC,
 	SetParent_FUNC,
 	SetPixel_FUNC,
 	SetPolyFillMode_FUNC,
 	SetProcessDPIAware_FUNC,
-	SetPropA_FUNC,
-	SetPropW_FUNC,
+	SetProp_FUNC,
 	SetROP2_FUNC,
 	SetRect_FUNC,
 	SetRectRgn_FUNC,
@@ -1606,47 +1243,34 @@ typedef enum {
 	SetStretchBltMode_FUNC,
 	SetTextColor_FUNC,
 	SetTimer_FUNC,
-	SetWindowLongA_FUNC,
-	SetWindowLongPtrA_FUNC,
-	SetWindowLongPtrW_FUNC,
-	SetWindowLongW_FUNC,
+	SetWindowLong_FUNC,
+	SetWindowLongPtr_FUNC,
 	SetWindowOrgEx_FUNC,
 	SetWindowPlacement_FUNC,
 	SetWindowPos_FUNC,
 	SetWindowRgn_FUNC,
-	SetWindowTextA_FUNC,
-	SetWindowTextW_FUNC,
+	SetWindowText_FUNC,
 	SetWindowTheme_FUNC,
-	SetWindowsHookExA_FUNC,
-	SetWindowsHookExW_FUNC,
+	SetWindowsHookEx_FUNC,
 	SetWorldTransform_FUNC,
-	ShellExecuteExA_FUNC,
-	ShellExecuteExW_FUNC,
-	Shell_1NotifyIconA_FUNC,
-	Shell_1NotifyIconW_FUNC,
+	ShellExecuteEx_FUNC,
+	Shell_1NotifyIcon_FUNC,
 	ShowCaret_FUNC,
 	ShowOwnedPopups_FUNC,
 	ShowScrollBar_FUNC,
 	ShowWindow_FUNC,
-	StartDocA_FUNC,
-	StartDocW_FUNC,
+	StartDoc_FUNC,
 	StartPage_FUNC,
 	StretchBlt_FUNC,
-	StrokePath_FUNC,
-	SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC,
-	SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSA_2I_FUNC,
-	SystemParametersInfoA__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
-	SystemParametersInfoA__II_3II_FUNC,
-	SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC,
-	SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICSW_2I_FUNC,
-	SystemParametersInfoW__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
-	SystemParametersInfoW__II_3II_FUNC,
+	SystemParametersInfo__IILorg_eclipse_swt_internal_win32_HIGHCONTRAST_2I_FUNC,
+	SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I_FUNC,
+	SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
+	SystemParametersInfo__II_3II_FUNC,
 	TBBUTTONINFO_1sizeof_FUNC,
 	TBBUTTON_1sizeof_FUNC,
 	TCHITTESTINFO_1sizeof_FUNC,
 	TCITEM_1sizeof_FUNC,
-	TEXTMETRICA_1sizeof_FUNC,
-	TEXTMETRICW_1sizeof_FUNC,
+	TEXTMETRIC_1sizeof_FUNC,
 	TF_1DA_1COLOR_1sizeof_FUNC,
 	TF_1DISPLAYATTRIBUTE_1sizeof_FUNC,
 	TOOLINFO_1sizeof_FUNC,
@@ -1659,12 +1283,10 @@ typedef enum {
 	TVITEMEX_1sizeof_FUNC,
 	TVITEM_1sizeof_FUNC,
 	TVSORTCB_1sizeof_FUNC,
-	ToAscii_FUNC,
 	ToUnicode_FUNC,
 	TrackMouseEvent_FUNC,
 	TrackPopupMenu_FUNC,
-	TranslateAcceleratorA_FUNC,
-	TranslateAcceleratorW_FUNC,
+	TranslateAccelerator_FUNC,
 	TranslateCharsetInfo_FUNC,
 	TranslateMDISysAccel_FUNC,
 	TranslateMessage_FUNC,
@@ -1673,15 +1295,12 @@ typedef enum {
 	UDACCEL_1sizeof_FUNC,
 	UnhookWindowsHookEx_FUNC,
 	UnmapViewOfFile_FUNC,
-	UnregisterClassA_FUNC,
-	UnregisterClassW_FUNC,
+	UnregisterClass_FUNC,
 	UnregisterTouchWindow_FUNC,
 	UpdateWindow_FUNC,
-	UrlCreateFromPathA_FUNC,
-	UrlCreateFromPathW_FUNC,
+	UrlCreateFromPath_FUNC,
 	ValidateRect_FUNC,
-	VkKeyScanA_FUNC,
-	VkKeyScanW_FUNC,
+	VkKeyScan_FUNC,
 #ifndef JNI64
 	VtblCall__II_FUNC,
 #else
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 d9885ba69e..0f420fa214 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
@@ -1148,7 +1148,7 @@ void setCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB *
 typedef struct DEVMODE_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID dmSpecVersion, dmDriverVersion, dmSize, dmDriverExtra, dmFields, dmOrientation, dmPaperSize, dmPaperLength, dmPaperWidth, dmScale, dmCopies, dmDefaultSource, dmPrintQuality, dmColor, dmDuplex, dmYResolution, dmTTOption, dmCollate, dmLogPixels, dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmNup, dmDisplayFrequency, dmICMMethod, dmICMIntent, dmMediaType, dmDitherType, dmReserved1, dmReserved2, dmPanningWidth, dmPanningHeight;
+	jfieldID dmDeviceName, dmSpecVersion, dmDriverVersion, dmSize, dmDriverExtra, dmFields, dmOrientation, dmPaperSize, dmPaperLength, dmPaperWidth, dmScale, dmCopies, dmDefaultSource, dmPrintQuality, dmColor, dmDuplex, dmYResolution, dmTTOption, dmCollate, dmFormName, dmLogPixels, dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmNup, dmDisplayFrequency, dmICMMethod, dmICMIntent, dmMediaType, dmDitherType, dmReserved1, dmReserved2, dmPanningWidth, dmPanningHeight;
 } DEVMODE_FID_CACHE;
 
 DEVMODE_FID_CACHE DEVMODEFc;
@@ -1157,6 +1157,7 @@ void cacheDEVMODEFields(JNIEnv *env, jobject lpObject)
 {
 	if (DEVMODEFc.cached) return;
 	DEVMODEFc.clazz = (*env)->GetObjectClass(env, lpObject);
+	DEVMODEFc.dmDeviceName = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmDeviceName", "[C");
 	DEVMODEFc.dmSpecVersion = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmSpecVersion", "S");
 	DEVMODEFc.dmDriverVersion = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmDriverVersion", "S");
 	DEVMODEFc.dmSize = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmSize", "S");
@@ -1175,6 +1176,7 @@ void cacheDEVMODEFields(JNIEnv *env, jobject lpObject)
 	DEVMODEFc.dmYResolution = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmYResolution", "S");
 	DEVMODEFc.dmTTOption = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmTTOption", "S");
 	DEVMODEFc.dmCollate = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmCollate", "S");
+	DEVMODEFc.dmFormName = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmFormName", "[C");
 	DEVMODEFc.dmLogPixels = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmLogPixels", "S");
 	DEVMODEFc.dmBitsPerPel = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmBitsPerPel", "I");
 	DEVMODEFc.dmPelsWidth = (*env)->GetFieldID(env, DEVMODEFc.clazz, "dmPelsWidth", "I");
@@ -1195,6 +1197,10 @@ void cacheDEVMODEFields(JNIEnv *env, jobject lpObject)
 DEVMODE *getDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct)
 {
 	if (!DEVMODEFc.cached) cacheDEVMODEFields(env, lpObject);
+	{
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEFc.dmDeviceName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName) / sizeof(jchar), (jchar *)lpStruct->dmDeviceName);
+	}
 	lpStruct->dmSpecVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSpecVersion);
 	lpStruct->dmDriverVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDriverVersion);
 	lpStruct->dmSize = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSize);
@@ -1213,6 +1219,10 @@ DEVMODE *getDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct)
 	lpStruct->dmYResolution = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmYResolution);
 	lpStruct->dmTTOption = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmTTOption);
 	lpStruct->dmCollate = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmCollate);
+	{
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEFc.dmFormName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName) / sizeof(jchar), (jchar *)lpStruct->dmFormName);
+	}
 	lpStruct->dmLogPixels = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmLogPixels);
 	lpStruct->dmBitsPerPel = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel);
 	lpStruct->dmPelsWidth = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPelsWidth);
@@ -1233,109 +1243,10 @@ DEVMODE *getDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct)
 void setDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct)
 {
 	if (!DEVMODEFc.cached) cacheDEVMODEFields(env, lpObject);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSpecVersion, (jshort)lpStruct->dmSpecVersion);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDriverVersion, (jshort)lpStruct->dmDriverVersion);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSize, (jshort)lpStruct->dmSize);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDriverExtra, (jshort)lpStruct->dmDriverExtra);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmFields, (jint)lpStruct->dmFields);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmOrientation, (jshort)lpStruct->dmOrientation);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperSize, (jshort)lpStruct->dmPaperSize);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperLength, (jshort)lpStruct->dmPaperLength);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperWidth, (jshort)lpStruct->dmPaperWidth);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmScale, (jshort)lpStruct->dmScale);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmCopies, (jshort)lpStruct->dmCopies);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDefaultSource, (jshort)lpStruct->dmDefaultSource);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPrintQuality, (jshort)lpStruct->dmPrintQuality);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmColor, (jshort)lpStruct->dmColor);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDuplex, (jshort)lpStruct->dmDuplex);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmYResolution, (jshort)lpStruct->dmYResolution);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmTTOption, (jshort)lpStruct->dmTTOption);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmCollate, (jshort)lpStruct->dmCollate);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmLogPixels, (jshort)lpStruct->dmLogPixels);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel, (jint)lpStruct->dmBitsPerPel);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPelsWidth, (jint)lpStruct->dmPelsWidth);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPelsHeight, (jint)lpStruct->dmPelsHeight);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmNup, (jint)lpStruct->dmNup);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmDisplayFrequency, (jint)lpStruct->dmDisplayFrequency);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmICMMethod, (jint)lpStruct->dmICMMethod);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmICMIntent, (jint)lpStruct->dmICMIntent);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmMediaType, (jint)lpStruct->dmMediaType);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmDitherType, (jint)lpStruct->dmDitherType);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmReserved1, (jint)lpStruct->dmReserved1);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmReserved2, (jint)lpStruct->dmReserved2);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningWidth, (jint)lpStruct->dmPanningWidth);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningHeight, (jint)lpStruct->dmPanningHeight);
-}
-#endif
-
-#ifndef NO_DEVMODEA
-typedef struct DEVMODEA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dmDeviceName, dmFormName;
-} DEVMODEA_FID_CACHE;
-
-DEVMODEA_FID_CACHE DEVMODEAFc;
-
-void cacheDEVMODEAFields(JNIEnv *env, jobject lpObject)
-{
-	if (DEVMODEAFc.cached) return;
-	cacheDEVMODEFields(env, lpObject);
-	DEVMODEAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DEVMODEAFc.dmDeviceName = (*env)->GetFieldID(env, DEVMODEAFc.clazz, "dmDeviceName", "[B");
-	DEVMODEAFc.dmFormName = (*env)->GetFieldID(env, DEVMODEAFc.clazz, "dmFormName", "[B");
-	DEVMODEAFc.cached = 1;
-}
-
-DEVMODEA *getDEVMODEAFields(JNIEnv *env, jobject lpObject, DEVMODEA *lpStruct)
-{
-	if (!DEVMODEAFc.cached) cacheDEVMODEAFields(env, lpObject);
-	lpStruct->dmSpecVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSpecVersion);
-	lpStruct->dmDriverVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDriverVersion);
-	lpStruct->dmSize = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSize);
-	lpStruct->dmDriverExtra = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDriverExtra);
-	lpStruct->dmFields = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmFields);
-	lpStruct->dmOrientation = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmOrientation);
-	lpStruct->dmPaperSize = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperSize);
-	lpStruct->dmPaperLength = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperLength);
-	lpStruct->dmPaperWidth = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperWidth);
-	lpStruct->dmScale = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmScale);
-	lpStruct->dmCopies = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmCopies);
-	lpStruct->dmDefaultSource = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDefaultSource);
-	lpStruct->dmPrintQuality = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPrintQuality);
-	lpStruct->dmColor = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmColor);
-	lpStruct->dmDuplex = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDuplex);
-	lpStruct->dmYResolution = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmYResolution);
-	lpStruct->dmTTOption = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmTTOption);
-	lpStruct->dmCollate = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmCollate);
-	lpStruct->dmLogPixels = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmLogPixels);
-	lpStruct->dmBitsPerPel = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel);
-	lpStruct->dmPelsWidth = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPelsWidth);
-	lpStruct->dmPelsHeight = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPelsHeight);
-	lpStruct->dmNup = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmNup);
-	lpStruct->dmDisplayFrequency = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmDisplayFrequency);
-	lpStruct->dmICMMethod = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmICMMethod);
-	lpStruct->dmICMIntent = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmICMIntent);
-	lpStruct->dmMediaType = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmMediaType);
-	lpStruct->dmDitherType = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmDitherType);
-	lpStruct->dmReserved1 = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmReserved1);
-	lpStruct->dmReserved2 = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmReserved2);
-	lpStruct->dmPanningWidth = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPanningWidth);
-	lpStruct->dmPanningHeight = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPanningHeight);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DEVMODEAFc.dmDeviceName);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName), (jbyte *)lpStruct->dmDeviceName);
-	}
 	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DEVMODEAFc.dmFormName);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName), (jbyte *)lpStruct->dmFormName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEFc.dmDeviceName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName) / sizeof(jchar), (jchar *)lpStruct->dmDeviceName);
 	}
-	return lpStruct;
-}
-
-void setDEVMODEAFields(JNIEnv *env, jobject lpObject, DEVMODEA *lpStruct)
-{
-	if (!DEVMODEAFc.cached) cacheDEVMODEAFields(env, lpObject);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSpecVersion, (jshort)lpStruct->dmSpecVersion);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDriverVersion, (jshort)lpStruct->dmDriverVersion);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSize, (jshort)lpStruct->dmSize);
@@ -1354,117 +1265,10 @@ void setDEVMODEAFields(JNIEnv *env, jobject lpObject, DEVMODEA *lpStruct)
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmYResolution, (jshort)lpStruct->dmYResolution);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmTTOption, (jshort)lpStruct->dmTTOption);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmCollate, (jshort)lpStruct->dmCollate);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmLogPixels, (jshort)lpStruct->dmLogPixels);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel, (jint)lpStruct->dmBitsPerPel);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPelsWidth, (jint)lpStruct->dmPelsWidth);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPelsHeight, (jint)lpStruct->dmPelsHeight);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmNup, (jint)lpStruct->dmNup);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmDisplayFrequency, (jint)lpStruct->dmDisplayFrequency);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmICMMethod, (jint)lpStruct->dmICMMethod);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmICMIntent, (jint)lpStruct->dmICMIntent);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmMediaType, (jint)lpStruct->dmMediaType);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmDitherType, (jint)lpStruct->dmDitherType);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmReserved1, (jint)lpStruct->dmReserved1);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmReserved2, (jint)lpStruct->dmReserved2);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningWidth, (jint)lpStruct->dmPanningWidth);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningHeight, (jint)lpStruct->dmPanningHeight);
 	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DEVMODEAFc.dmDeviceName);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName), (jbyte *)lpStruct->dmDeviceName);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, DEVMODEAFc.dmFormName);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName), (jbyte *)lpStruct->dmFormName);
-	}
-}
-#endif
-
-#ifndef NO_DEVMODEW
-typedef struct DEVMODEW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dmDeviceName, dmFormName;
-} DEVMODEW_FID_CACHE;
-
-DEVMODEW_FID_CACHE DEVMODEWFc;
-
-void cacheDEVMODEWFields(JNIEnv *env, jobject lpObject)
-{
-	if (DEVMODEWFc.cached) return;
-	cacheDEVMODEFields(env, lpObject);
-	DEVMODEWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DEVMODEWFc.dmDeviceName = (*env)->GetFieldID(env, DEVMODEWFc.clazz, "dmDeviceName", "[C");
-	DEVMODEWFc.dmFormName = (*env)->GetFieldID(env, DEVMODEWFc.clazz, "dmFormName", "[C");
-	DEVMODEWFc.cached = 1;
-}
-
-DEVMODEW *getDEVMODEWFields(JNIEnv *env, jobject lpObject, DEVMODEW *lpStruct)
-{
-	if (!DEVMODEWFc.cached) cacheDEVMODEWFields(env, lpObject);
-	lpStruct->dmSpecVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSpecVersion);
-	lpStruct->dmDriverVersion = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDriverVersion);
-	lpStruct->dmSize = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmSize);
-	lpStruct->dmDriverExtra = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDriverExtra);
-	lpStruct->dmFields = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmFields);
-	lpStruct->dmOrientation = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmOrientation);
-	lpStruct->dmPaperSize = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperSize);
-	lpStruct->dmPaperLength = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperLength);
-	lpStruct->dmPaperWidth = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPaperWidth);
-	lpStruct->dmScale = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmScale);
-	lpStruct->dmCopies = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmCopies);
-	lpStruct->dmDefaultSource = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDefaultSource);
-	lpStruct->dmPrintQuality = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmPrintQuality);
-	lpStruct->dmColor = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmColor);
-	lpStruct->dmDuplex = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmDuplex);
-	lpStruct->dmYResolution = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmYResolution);
-	lpStruct->dmTTOption = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmTTOption);
-	lpStruct->dmCollate = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmCollate);
-	lpStruct->dmLogPixels = (*env)->GetShortField(env, lpObject, DEVMODEFc.dmLogPixels);
-	lpStruct->dmBitsPerPel = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel);
-	lpStruct->dmPelsWidth = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPelsWidth);
-	lpStruct->dmPelsHeight = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPelsHeight);
-	lpStruct->dmNup = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmNup);
-	lpStruct->dmDisplayFrequency = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmDisplayFrequency);
-	lpStruct->dmICMMethod = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmICMMethod);
-	lpStruct->dmICMIntent = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmICMIntent);
-	lpStruct->dmMediaType = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmMediaType);
-	lpStruct->dmDitherType = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmDitherType);
-	lpStruct->dmReserved1 = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmReserved1);
-	lpStruct->dmReserved2 = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmReserved2);
-	lpStruct->dmPanningWidth = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPanningWidth);
-	lpStruct->dmPanningHeight = (*env)->GetIntField(env, lpObject, DEVMODEFc.dmPanningHeight);
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEWFc.dmDeviceName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName) / sizeof(jchar), (jchar *)lpStruct->dmDeviceName);
-	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEWFc.dmFormName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName) / sizeof(jchar), (jchar *)lpStruct->dmFormName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEFc.dmFormName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName) / sizeof(jchar), (jchar *)lpStruct->dmFormName);
 	}
-	return lpStruct;
-}
-
-void setDEVMODEWFields(JNIEnv *env, jobject lpObject, DEVMODEW *lpStruct)
-{
-	if (!DEVMODEWFc.cached) cacheDEVMODEWFields(env, lpObject);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSpecVersion, (jshort)lpStruct->dmSpecVersion);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDriverVersion, (jshort)lpStruct->dmDriverVersion);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmSize, (jshort)lpStruct->dmSize);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDriverExtra, (jshort)lpStruct->dmDriverExtra);
-	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmFields, (jint)lpStruct->dmFields);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmOrientation, (jshort)lpStruct->dmOrientation);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperSize, (jshort)lpStruct->dmPaperSize);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperLength, (jshort)lpStruct->dmPaperLength);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPaperWidth, (jshort)lpStruct->dmPaperWidth);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmScale, (jshort)lpStruct->dmScale);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmCopies, (jshort)lpStruct->dmCopies);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDefaultSource, (jshort)lpStruct->dmDefaultSource);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmPrintQuality, (jshort)lpStruct->dmPrintQuality);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmColor, (jshort)lpStruct->dmColor);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmDuplex, (jshort)lpStruct->dmDuplex);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmYResolution, (jshort)lpStruct->dmYResolution);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmTTOption, (jshort)lpStruct->dmTTOption);
-	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmCollate, (jshort)lpStruct->dmCollate);
 	(*env)->SetShortField(env, lpObject, DEVMODEFc.dmLogPixels, (jshort)lpStruct->dmLogPixels);
 	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmBitsPerPel, (jint)lpStruct->dmBitsPerPel);
 	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPelsWidth, (jint)lpStruct->dmPelsWidth);
@@ -1479,14 +1283,6 @@ void setDEVMODEWFields(JNIEnv *env, jobject lpObject, DEVMODEW *lpStruct)
 	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmReserved2, (jint)lpStruct->dmReserved2);
 	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningWidth, (jint)lpStruct->dmPanningWidth);
 	(*env)->SetIntField(env, lpObject, DEVMODEFc.dmPanningHeight, (jint)lpStruct->dmPanningHeight);
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEWFc.dmDeviceName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmDeviceName) / sizeof(jchar), (jchar *)lpStruct->dmDeviceName);
-	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, DEVMODEWFc.dmFormName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->dmFormName) / sizeof(jchar), (jchar *)lpStruct->dmFormName);
-	}
 }
 #endif
 
@@ -1937,7 +1733,7 @@ void cacheEXTLOGFONTWFields(JNIEnv *env, jobject lpObject)
 {
 	if (EXTLOGFONTWFc.cached) return;
 	EXTLOGFONTWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	EXTLOGFONTWFc.elfLogFont = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfLogFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
+	EXTLOGFONTWFc.elfLogFont = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfLogFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
 	EXTLOGFONTWFc.elfFullName = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfFullName", "[C");
 	EXTLOGFONTWFc.elfStyle = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfStyle", "[C");
 	EXTLOGFONTWFc.elfVersion = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfVersion", "I");
@@ -1955,7 +1751,7 @@ EXTLOGFONTW *getEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lp
 	if (!EXTLOGFONTWFc.cached) cacheEXTLOGFONTWFields(env, lpObject);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfLogFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->elfLogFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->elfLogFont);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
@@ -1986,7 +1782,7 @@ void setEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lpStruct)
 	if (!EXTLOGFONTWFc.cached) cacheEXTLOGFONTWFields(env, lpObject);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfLogFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->elfLogFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->elfLogFont);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
@@ -2857,7 +2653,7 @@ void setLOGBRUSHFields(JNIEnv *env, jobject lpObject, LOGBRUSH *lpStruct)
 typedef struct LOGFONT_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID lfHeight, lfWidth, lfEscapement, lfOrientation, lfWeight, lfItalic, lfUnderline, lfStrikeOut, lfCharSet, lfOutPrecision, lfClipPrecision, lfQuality, lfPitchAndFamily;
+	jfieldID lfHeight, lfWidth, lfEscapement, lfOrientation, lfWeight, lfItalic, lfUnderline, lfStrikeOut, lfCharSet, lfOutPrecision, lfClipPrecision, lfQuality, lfPitchAndFamily, lfFaceName;
 } LOGFONT_FID_CACHE;
 
 LOGFONT_FID_CACHE LOGFONTFc;
@@ -2879,6 +2675,7 @@ void cacheLOGFONTFields(JNIEnv *env, jobject lpObject)
 	LOGFONTFc.lfClipPrecision = (*env)->GetFieldID(env, LOGFONTFc.clazz, "lfClipPrecision", "B");
 	LOGFONTFc.lfQuality = (*env)->GetFieldID(env, LOGFONTFc.clazz, "lfQuality", "B");
 	LOGFONTFc.lfPitchAndFamily = (*env)->GetFieldID(env, LOGFONTFc.clazz, "lfPitchAndFamily", "B");
+	LOGFONTFc.lfFaceName = (*env)->GetFieldID(env, LOGFONTFc.clazz, "lfFaceName", "[C");
 	LOGFONTFc.cached = 1;
 }
 
@@ -2898,136 +2695,16 @@ LOGFONT *getLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct)
 	lpStruct->lfClipPrecision = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfClipPrecision);
 	lpStruct->lfQuality = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfQuality);
 	lpStruct->lfPitchAndFamily = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily);
-	return lpStruct;
-}
-
-void setLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct)
-{
-	if (!LOGFONTFc.cached) cacheLOGFONTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfHeight, (jint)lpStruct->lfHeight);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfWidth, (jint)lpStruct->lfWidth);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfEscapement, (jint)lpStruct->lfEscapement);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfOrientation, (jint)lpStruct->lfOrientation);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfWeight, (jint)lpStruct->lfWeight);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfItalic, (jbyte)lpStruct->lfItalic);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfUnderline, (jbyte)lpStruct->lfUnderline);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfStrikeOut, (jbyte)lpStruct->lfStrikeOut);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfCharSet, (jbyte)lpStruct->lfCharSet);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfOutPrecision, (jbyte)lpStruct->lfOutPrecision);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfClipPrecision, (jbyte)lpStruct->lfClipPrecision);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfQuality, (jbyte)lpStruct->lfQuality);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily, (jbyte)lpStruct->lfPitchAndFamily);
-}
-#endif
-
-#ifndef NO_LOGFONTA
-typedef struct LOGFONTA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lfFaceName;
-} LOGFONTA_FID_CACHE;
-
-LOGFONTA_FID_CACHE LOGFONTAFc;
-
-void cacheLOGFONTAFields(JNIEnv *env, jobject lpObject)
-{
-	if (LOGFONTAFc.cached) return;
-	cacheLOGFONTFields(env, lpObject);
-	LOGFONTAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	LOGFONTAFc.lfFaceName = (*env)->GetFieldID(env, LOGFONTAFc.clazz, "lfFaceName", "[B");
-	LOGFONTAFc.cached = 1;
-}
-
-LOGFONTA *getLOGFONTAFields(JNIEnv *env, jobject lpObject, LOGFONTA *lpStruct)
-{
-	if (!LOGFONTAFc.cached) cacheLOGFONTAFields(env, lpObject);
-	lpStruct->lfHeight = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfHeight);
-	lpStruct->lfWidth = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfWidth);
-	lpStruct->lfEscapement = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfEscapement);
-	lpStruct->lfOrientation = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfOrientation);
-	lpStruct->lfWeight = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfWeight);
-	lpStruct->lfItalic = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfItalic);
-	lpStruct->lfUnderline = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfUnderline);
-	lpStruct->lfStrikeOut = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfStrikeOut);
-	lpStruct->lfCharSet = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfCharSet);
-	lpStruct->lfOutPrecision = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfOutPrecision);
-	lpStruct->lfClipPrecision = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfClipPrecision);
-	lpStruct->lfQuality = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfQuality);
-	lpStruct->lfPitchAndFamily = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily);
 	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, LOGFONTAFc.lfFaceName);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName), (jbyte *)lpStruct->lfFaceName);
-	}
-	return lpStruct;
-}
-
-void setLOGFONTAFields(JNIEnv *env, jobject lpObject, LOGFONTA *lpStruct)
-{
-	if (!LOGFONTAFc.cached) cacheLOGFONTAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfHeight, (jint)lpStruct->lfHeight);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfWidth, (jint)lpStruct->lfWidth);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfEscapement, (jint)lpStruct->lfEscapement);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfOrientation, (jint)lpStruct->lfOrientation);
-	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfWeight, (jint)lpStruct->lfWeight);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfItalic, (jbyte)lpStruct->lfItalic);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfUnderline, (jbyte)lpStruct->lfUnderline);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfStrikeOut, (jbyte)lpStruct->lfStrikeOut);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfCharSet, (jbyte)lpStruct->lfCharSet);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfOutPrecision, (jbyte)lpStruct->lfOutPrecision);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfClipPrecision, (jbyte)lpStruct->lfClipPrecision);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfQuality, (jbyte)lpStruct->lfQuality);
-	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily, (jbyte)lpStruct->lfPitchAndFamily);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, LOGFONTAFc.lfFaceName);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName), (jbyte *)lpStruct->lfFaceName);
-	}
-}
-#endif
-
-#ifndef NO_LOGFONTW
-typedef struct LOGFONTW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lfFaceName;
-} LOGFONTW_FID_CACHE;
-
-LOGFONTW_FID_CACHE LOGFONTWFc;
-
-void cacheLOGFONTWFields(JNIEnv *env, jobject lpObject)
-{
-	if (LOGFONTWFc.cached) return;
-	cacheLOGFONTFields(env, lpObject);
-	LOGFONTWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	LOGFONTWFc.lfFaceName = (*env)->GetFieldID(env, LOGFONTWFc.clazz, "lfFaceName", "[C");
-	LOGFONTWFc.cached = 1;
-}
-
-LOGFONTW *getLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct)
-{
-	if (!LOGFONTWFc.cached) cacheLOGFONTWFields(env, lpObject);
-	lpStruct->lfHeight = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfHeight);
-	lpStruct->lfWidth = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfWidth);
-	lpStruct->lfEscapement = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfEscapement);
-	lpStruct->lfOrientation = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfOrientation);
-	lpStruct->lfWeight = (*env)->GetIntField(env, lpObject, LOGFONTFc.lfWeight);
-	lpStruct->lfItalic = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfItalic);
-	lpStruct->lfUnderline = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfUnderline);
-	lpStruct->lfStrikeOut = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfStrikeOut);
-	lpStruct->lfCharSet = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfCharSet);
-	lpStruct->lfOutPrecision = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfOutPrecision);
-	lpStruct->lfClipPrecision = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfClipPrecision);
-	lpStruct->lfQuality = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfQuality);
-	lpStruct->lfPitchAndFamily = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily);
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTWFc.lfFaceName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTFc.lfFaceName);
 	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / sizeof(jchar), (jchar *)lpStruct->lfFaceName);
 	}
 	return lpStruct;
 }
 
-void setLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct)
+void setLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct)
 {
-	if (!LOGFONTWFc.cached) cacheLOGFONTWFields(env, lpObject);
+	if (!LOGFONTFc.cached) cacheLOGFONTFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfHeight, (jint)lpStruct->lfHeight);
 	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfWidth, (jint)lpStruct->lfWidth);
 	(*env)->SetIntField(env, lpObject, LOGFONTFc.lfEscapement, (jint)lpStruct->lfEscapement);
@@ -3042,7 +2719,7 @@ void setLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct)
 	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfQuality, (jbyte)lpStruct->lfQuality);
 	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily, (jbyte)lpStruct->lfPitchAndFamily);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTWFc.lfFaceName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTFc.lfFaceName);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / sizeof(jchar), (jchar *)lpStruct->lfFaceName);
 	}
 }
@@ -4715,7 +4392,7 @@ void setNMTTCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMTTCUSTOMDRAW *lpSt
 typedef struct NMTTDISPINFO_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID lpszText, hinst, uFlags, lParam;
+	jfieldID lpszText, szText, hinst, uFlags, lParam;
 } NMTTDISPINFO_FID_CACHE;
 
 NMTTDISPINFO_FID_CACHE NMTTDISPINFOFc;
@@ -4726,6 +4403,7 @@ void cacheNMTTDISPINFOFields(JNIEnv *env, jobject lpObject)
 	cacheNMHDRFields(env, lpObject);
 	NMTTDISPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMTTDISPINFOFc.lpszText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lpszText", I_J);
+	NMTTDISPINFOFc.szText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "szText", "[C");
 	NMTTDISPINFOFc.hinst = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "hinst", I_J);
 	NMTTDISPINFOFc.uFlags = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "uFlags", "I");
 	NMTTDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lParam", I_J);
@@ -4737,6 +4415,10 @@ NMTTDISPINFO *getNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO
 	if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
+	{
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOFc.szText);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
+	}
 	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
 	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
@@ -4748,105 +4430,13 @@ void setNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO *lpStruct
 	if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
-}
-#endif
-
-#ifndef NO_NMTTDISPINFOA
-typedef struct NMTTDISPINFOA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szText;
-} NMTTDISPINFOA_FID_CACHE;
-
-NMTTDISPINFOA_FID_CACHE NMTTDISPINFOAFc;
-
-void cacheNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject)
-{
-	if (NMTTDISPINFOAFc.cached) return;
-	cacheNMTTDISPINFOFields(env, lpObject);
-	NMTTDISPINFOAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NMTTDISPINFOAFc.szText = (*env)->GetFieldID(env, NMTTDISPINFOAFc.clazz, "szText", "[B");
-	NMTTDISPINFOAFc.cached = 1;
-}
-
-NMTTDISPINFOA *getNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOA *lpStruct)
-{
-	if (!NMTTDISPINFOAFc.cached) cacheNMTTDISPINFOAFields(env, lpObject);
-	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
-	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
-	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOAFc.szText);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText), (jbyte *)lpStruct->szText);
-	}
-	return lpStruct;
-}
-
-void setNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOA *lpStruct)
-{
-	if (!NMTTDISPINFOAFc.cached) cacheNMTTDISPINFOAFields(env, lpObject);
-	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOAFc.szText);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText), (jbyte *)lpStruct->szText);
-	}
-}
-#endif
-
-#ifndef NO_NMTTDISPINFOW
-typedef struct NMTTDISPINFOW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szText;
-} NMTTDISPINFOW_FID_CACHE;
-
-NMTTDISPINFOW_FID_CACHE NMTTDISPINFOWFc;
-
-void cacheNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject)
-{
-	if (NMTTDISPINFOWFc.cached) return;
-	cacheNMTTDISPINFOFields(env, lpObject);
-	NMTTDISPINFOWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NMTTDISPINFOWFc.szText = (*env)->GetFieldID(env, NMTTDISPINFOWFc.clazz, "szText", "[C");
-	NMTTDISPINFOWFc.cached = 1;
-}
-
-NMTTDISPINFOW *getNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOW *lpStruct)
-{
-	if (!NMTTDISPINFOWFc.cached) cacheNMTTDISPINFOWFields(env, lpObject);
-	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
-	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
-	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOWFc.szText);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOFc.szText);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
 	}
-	return lpStruct;
-}
-
-void setNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOW *lpStruct)
-{
-	if (!NMTTDISPINFOWFc.cached) cacheNMTTDISPINFOWFields(env, lpObject);
-	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
 	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
 	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
 	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOWFc.szText);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
-	}
 }
 #endif
 
@@ -5038,7 +4628,7 @@ void setNMUPDOWNFields(JNIEnv *env, jobject lpObject, NMUPDOWN *lpStruct)
 typedef struct NONCLIENTMETRICS_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID cbSize, iBorderWidth, iScrollWidth, iScrollHeight, iCaptionWidth, iCaptionHeight, iSmCaptionWidth, iSmCaptionHeight, iMenuWidth, iMenuHeight;
+	jfieldID cbSize, iBorderWidth, iScrollWidth, iScrollHeight, iCaptionWidth, iCaptionHeight, lfCaptionFont, iSmCaptionWidth, iSmCaptionHeight, lfSmCaptionFont, iMenuWidth, iMenuHeight, lfMenuFont, lfStatusFont, lfMessageFont;
 } NONCLIENTMETRICS_FID_CACHE;
 
 NONCLIENTMETRICS_FID_CACHE NONCLIENTMETRICSFc;
@@ -5053,10 +4643,15 @@ void cacheNONCLIENTMETRICSFields(JNIEnv *env, jobject lpObject)
 	NONCLIENTMETRICSFc.iScrollHeight = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iScrollHeight", "I");
 	NONCLIENTMETRICSFc.iCaptionWidth = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iCaptionWidth", "I");
 	NONCLIENTMETRICSFc.iCaptionHeight = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iCaptionHeight", "I");
+	NONCLIENTMETRICSFc.lfCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "lfCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
 	NONCLIENTMETRICSFc.iSmCaptionWidth = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iSmCaptionWidth", "I");
 	NONCLIENTMETRICSFc.iSmCaptionHeight = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iSmCaptionHeight", "I");
+	NONCLIENTMETRICSFc.lfSmCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "lfSmCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
 	NONCLIENTMETRICSFc.iMenuWidth = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iMenuWidth", "I");
 	NONCLIENTMETRICSFc.iMenuHeight = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "iMenuHeight", "I");
+	NONCLIENTMETRICSFc.lfMenuFont = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "lfMenuFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
+	NONCLIENTMETRICSFc.lfStatusFont = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "lfStatusFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
+	NONCLIENTMETRICSFc.lfMessageFont = (*env)->GetFieldID(env, NONCLIENTMETRICSFc.clazz, "lfMessageFont", "Lorg/eclipse/swt/internal/win32/LOGFONT;");
 	NONCLIENTMETRICSFc.cached = 1;
 }
 
@@ -5069,213 +4664,65 @@ NONCLIENTMETRICS *getNONCLIENTMETRICSFields(JNIEnv *env, jobject lpObject, NONCL
 	lpStruct->iScrollHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight);
 	lpStruct->iCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth);
 	lpStruct->iCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight);
-	lpStruct->iSmCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth);
-	lpStruct->iSmCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight);
-	lpStruct->iMenuWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth);
-	lpStruct->iMenuHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight);
-	return lpStruct;
-}
-
-void setNONCLIENTMETRICSFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICS *lpStruct)
-{
-	if (!NONCLIENTMETRICSFc.cached) cacheNONCLIENTMETRICSFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iBorderWidth, (jint)lpStruct->iBorderWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollWidth, (jint)lpStruct->iScrollWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight, (jint)lpStruct->iScrollHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth, (jint)lpStruct->iCaptionWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight, (jint)lpStruct->iCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth, (jint)lpStruct->iSmCaptionWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight, (jint)lpStruct->iSmCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth, (jint)lpStruct->iMenuWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight, (jint)lpStruct->iMenuHeight);
-}
-#endif
-
-#ifndef NO_NONCLIENTMETRICSA
-typedef struct NONCLIENTMETRICSA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lfCaptionFont, lfSmCaptionFont, lfMenuFont, lfStatusFont, lfMessageFont;
-} NONCLIENTMETRICSA_FID_CACHE;
-
-NONCLIENTMETRICSA_FID_CACHE NONCLIENTMETRICSAFc;
-
-void cacheNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject)
-{
-	if (NONCLIENTMETRICSAFc.cached) return;
-	cacheNONCLIENTMETRICSFields(env, lpObject);
-	NONCLIENTMETRICSAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NONCLIENTMETRICSAFc.lfCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSAFc.clazz, "lfCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONTA;");
-	NONCLIENTMETRICSAFc.lfSmCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSAFc.clazz, "lfSmCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONTA;");
-	NONCLIENTMETRICSAFc.lfMenuFont = (*env)->GetFieldID(env, NONCLIENTMETRICSAFc.clazz, "lfMenuFont", "Lorg/eclipse/swt/internal/win32/LOGFONTA;");
-	NONCLIENTMETRICSAFc.lfStatusFont = (*env)->GetFieldID(env, NONCLIENTMETRICSAFc.clazz, "lfStatusFont", "Lorg/eclipse/swt/internal/win32/LOGFONTA;");
-	NONCLIENTMETRICSAFc.lfMessageFont = (*env)->GetFieldID(env, NONCLIENTMETRICSAFc.clazz, "lfMessageFont", "Lorg/eclipse/swt/internal/win32/LOGFONTA;");
-	NONCLIENTMETRICSAFc.cached = 1;
-}
-
-NONCLIENTMETRICSA *getNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSA *lpStruct)
-{
-	if (!NONCLIENTMETRICSAFc.cached) cacheNONCLIENTMETRICSAFields(env, lpObject);
-	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.cbSize);
-	lpStruct->iBorderWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iBorderWidth);
-	lpStruct->iScrollWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollWidth);
-	lpStruct->iScrollHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight);
-	lpStruct->iCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth);
-	lpStruct->iCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight);
-	lpStruct->iSmCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth);
-	lpStruct->iSmCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight);
-	lpStruct->iMenuWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth);
-	lpStruct->iMenuHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfCaptionFont);
-	if (lpObject1 != NULL) getLOGFONTAFields(env, lpObject1, &lpStruct->lfCaptionFont);
-	}
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfSmCaptionFont);
-	if (lpObject1 != NULL) getLOGFONTAFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfCaptionFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->lfCaptionFont);
 	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfMenuFont);
-	if (lpObject1 != NULL) getLOGFONTAFields(env, lpObject1, &lpStruct->lfMenuFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfStatusFont);
-	if (lpObject1 != NULL) getLOGFONTAFields(env, lpObject1, &lpStruct->lfStatusFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfMessageFont);
-	if (lpObject1 != NULL) getLOGFONTAFields(env, lpObject1, &lpStruct->lfMessageFont);
-	}
-	return lpStruct;
-}
-
-void setNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSA *lpStruct)
-{
-	if (!NONCLIENTMETRICSAFc.cached) cacheNONCLIENTMETRICSAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iBorderWidth, (jint)lpStruct->iBorderWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollWidth, (jint)lpStruct->iScrollWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight, (jint)lpStruct->iScrollHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth, (jint)lpStruct->iCaptionWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight, (jint)lpStruct->iCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth, (jint)lpStruct->iSmCaptionWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight, (jint)lpStruct->iSmCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth, (jint)lpStruct->iMenuWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight, (jint)lpStruct->iMenuHeight);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfCaptionFont);
-	if (lpObject1 != NULL) setLOGFONTAFields(env, lpObject1, &lpStruct->lfCaptionFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfSmCaptionFont);
-	if (lpObject1 != NULL) setLOGFONTAFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfMenuFont);
-	if (lpObject1 != NULL) setLOGFONTAFields(env, lpObject1, &lpStruct->lfMenuFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfStatusFont);
-	if (lpObject1 != NULL) setLOGFONTAFields(env, lpObject1, &lpStruct->lfStatusFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSAFc.lfMessageFont);
-	if (lpObject1 != NULL) setLOGFONTAFields(env, lpObject1, &lpStruct->lfMessageFont);
-	}
-}
-#endif
-
-#ifndef NO_NONCLIENTMETRICSW
-typedef struct NONCLIENTMETRICSW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lfCaptionFont, lfSmCaptionFont, lfMenuFont, lfStatusFont, lfMessageFont;
-} NONCLIENTMETRICSW_FID_CACHE;
-
-NONCLIENTMETRICSW_FID_CACHE NONCLIENTMETRICSWFc;
-
-void cacheNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject)
-{
-	if (NONCLIENTMETRICSWFc.cached) return;
-	cacheNONCLIENTMETRICSFields(env, lpObject);
-	NONCLIENTMETRICSWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NONCLIENTMETRICSWFc.lfCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSWFc.clazz, "lfCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
-	NONCLIENTMETRICSWFc.lfSmCaptionFont = (*env)->GetFieldID(env, NONCLIENTMETRICSWFc.clazz, "lfSmCaptionFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
-	NONCLIENTMETRICSWFc.lfMenuFont = (*env)->GetFieldID(env, NONCLIENTMETRICSWFc.clazz, "lfMenuFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
-	NONCLIENTMETRICSWFc.lfStatusFont = (*env)->GetFieldID(env, NONCLIENTMETRICSWFc.clazz, "lfStatusFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
-	NONCLIENTMETRICSWFc.lfMessageFont = (*env)->GetFieldID(env, NONCLIENTMETRICSWFc.clazz, "lfMessageFont", "Lorg/eclipse/swt/internal/win32/LOGFONTW;");
-	NONCLIENTMETRICSWFc.cached = 1;
-}
-
-NONCLIENTMETRICSW *getNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSW *lpStruct)
-{
-	if (!NONCLIENTMETRICSWFc.cached) cacheNONCLIENTMETRICSWFields(env, lpObject);
-	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.cbSize);
-	lpStruct->iBorderWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iBorderWidth);
-	lpStruct->iScrollWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollWidth);
-	lpStruct->iScrollHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight);
-	lpStruct->iCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth);
-	lpStruct->iCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight);
 	lpStruct->iSmCaptionWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth);
 	lpStruct->iSmCaptionHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight);
-	lpStruct->iMenuWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth);
-	lpStruct->iMenuHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfCaptionFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->lfCaptionFont);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfSmCaptionFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfSmCaptionFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
 	}
+	lpStruct->iMenuWidth = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth);
+	lpStruct->iMenuHeight = (*env)->GetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfMenuFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->lfMenuFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfMenuFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->lfMenuFont);
 	}
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfStatusFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->lfStatusFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfStatusFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->lfStatusFont);
 	}
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfMessageFont);
-	if (lpObject1 != NULL) getLOGFONTWFields(env, lpObject1, &lpStruct->lfMessageFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfMessageFont);
+	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->lfMessageFont);
 	}
 	return lpStruct;
 }
 
-void setNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSW *lpStruct)
+void setNONCLIENTMETRICSFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICS *lpStruct)
 {
-	if (!NONCLIENTMETRICSWFc.cached) cacheNONCLIENTMETRICSWFields(env, lpObject);
+	if (!NONCLIENTMETRICSFc.cached) cacheNONCLIENTMETRICSFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iBorderWidth, (jint)lpStruct->iBorderWidth);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollWidth, (jint)lpStruct->iScrollWidth);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iScrollHeight, (jint)lpStruct->iScrollHeight);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionWidth, (jint)lpStruct->iCaptionWidth);
 	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iCaptionHeight, (jint)lpStruct->iCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth, (jint)lpStruct->iSmCaptionWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight, (jint)lpStruct->iSmCaptionHeight);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth, (jint)lpStruct->iMenuWidth);
-	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight, (jint)lpStruct->iMenuHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfCaptionFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->lfCaptionFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfCaptionFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->lfCaptionFont);
 	}
+	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionWidth, (jint)lpStruct->iSmCaptionWidth);
+	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iSmCaptionHeight, (jint)lpStruct->iSmCaptionHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfSmCaptionFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfSmCaptionFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->lfSmCaptionFont);
 	}
+	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuWidth, (jint)lpStruct->iMenuWidth);
+	(*env)->SetIntField(env, lpObject, NONCLIENTMETRICSFc.iMenuHeight, (jint)lpStruct->iMenuHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfMenuFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->lfMenuFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfMenuFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->lfMenuFont);
 	}
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfStatusFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->lfStatusFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfStatusFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->lfStatusFont);
 	}
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSWFc.lfMessageFont);
-	if (lpObject1 != NULL) setLOGFONTWFields(env, lpObject1, &lpStruct->lfMessageFont);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NONCLIENTMETRICSFc.lfMessageFont);
+	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->lfMessageFont);
 	}
 }
 #endif
@@ -5284,7 +4731,7 @@ void setNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSW
 typedef struct NOTIFYICONDATA_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID cbSize, hWnd, uID, uFlags, uCallbackMessage, hIcon, dwState, dwStateMask, uVersion, dwInfoFlags;
+	jfieldID cbSize, hWnd, uID, uFlags, uCallbackMessage, hIcon, szTip, dwState, dwStateMask, szInfo, szInfoTitle, uVersion, dwInfoFlags;
 } NOTIFYICONDATA_FID_CACHE;
 
 NOTIFYICONDATA_FID_CACHE NOTIFYICONDATAFc;
@@ -5299,8 +4746,11 @@ void cacheNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject)
 	NOTIFYICONDATAFc.uFlags = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uFlags", "I");
 	NOTIFYICONDATAFc.uCallbackMessage = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uCallbackMessage", "I");
 	NOTIFYICONDATAFc.hIcon = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hIcon", I_J);
+	NOTIFYICONDATAFc.szTip = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "szTip", "[C");
 	NOTIFYICONDATAFc.dwState = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwState", "I");
 	NOTIFYICONDATAFc.dwStateMask = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwStateMask", "I");
+	NOTIFYICONDATAFc.szInfo = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "szInfo", "[C");
+	NOTIFYICONDATAFc.szInfoTitle = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "szInfoTitle", "[C");
 	NOTIFYICONDATAFc.uVersion = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uVersion", "I");
 	NOTIFYICONDATAFc.dwInfoFlags = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwInfoFlags", "I");
 	NOTIFYICONDATAFc.cached = 1;
@@ -5315,178 +4765,50 @@ NOTIFYICONDATA *getNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICO
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
 	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
 	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
-	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
-	lpStruct->dwStateMask = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask);
-	lpStruct->uVersion = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion);
-	lpStruct->dwInfoFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags);
-	return lpStruct;
-}
-
-void setNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpStruct)
-{
-	if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
-	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask, (jint)lpStruct->dwStateMask);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion, (jint)lpStruct->uVersion);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags, (jint)lpStruct->dwInfoFlags);
-}
-#endif
-
-#ifndef NO_NOTIFYICONDATAA
-typedef struct NOTIFYICONDATAA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szTip, szInfo, szInfoTitle;
-} NOTIFYICONDATAA_FID_CACHE;
-
-NOTIFYICONDATAA_FID_CACHE NOTIFYICONDATAAFc;
-
-void cacheNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject)
-{
-	if (NOTIFYICONDATAAFc.cached) return;
-	cacheNOTIFYICONDATAFields(env, lpObject);
-	NOTIFYICONDATAAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NOTIFYICONDATAAFc.szTip = (*env)->GetFieldID(env, NOTIFYICONDATAAFc.clazz, "szTip", "[B");
-	NOTIFYICONDATAAFc.szInfo = (*env)->GetFieldID(env, NOTIFYICONDATAAFc.clazz, "szInfo", "[B");
-	NOTIFYICONDATAAFc.szInfoTitle = (*env)->GetFieldID(env, NOTIFYICONDATAAFc.clazz, "szInfoTitle", "[B");
-	NOTIFYICONDATAAFc.cached = 1;
-}
-
-NOTIFYICONDATAA *getNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAA *lpStruct)
-{
-	if (!NOTIFYICONDATAAFc.cached) cacheNOTIFYICONDATAAFields(env, lpObject);
-	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize);
-	lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd);
-	lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID);
-	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
-	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
-	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
-	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
-	lpStruct->dwStateMask = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask);
-	lpStruct->uVersion = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion);
-	lpStruct->dwInfoFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szTip);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip), (jbyte *)lpStruct->szTip);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szInfo);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo), (jbyte *)lpStruct->szInfo);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szInfoTitle);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle), (jbyte *)lpStruct->szInfoTitle);
-	}
-	return lpStruct;
-}
-
-void setNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAA *lpStruct)
-{
-	if (!NOTIFYICONDATAAFc.cached) cacheNOTIFYICONDATAAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
-	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask, (jint)lpStruct->dwStateMask);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion, (jint)lpStruct->uVersion);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags, (jint)lpStruct->dwInfoFlags);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szTip);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip), (jbyte *)lpStruct->szTip);
-	}
 	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szInfo);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo), (jbyte *)lpStruct->szInfo);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAAFc.szInfoTitle);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle), (jbyte *)lpStruct->szInfoTitle);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szTip);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip);
 	}
-}
-#endif
-
-#ifndef NO_NOTIFYICONDATAW
-typedef struct NOTIFYICONDATAW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szTip, szInfo, szInfoTitle;
-} NOTIFYICONDATAW_FID_CACHE;
-
-NOTIFYICONDATAW_FID_CACHE NOTIFYICONDATAWFc;
-
-void cacheNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject)
-{
-	if (NOTIFYICONDATAWFc.cached) return;
-	cacheNOTIFYICONDATAFields(env, lpObject);
-	NOTIFYICONDATAWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NOTIFYICONDATAWFc.szTip = (*env)->GetFieldID(env, NOTIFYICONDATAWFc.clazz, "szTip", "[C");
-	NOTIFYICONDATAWFc.szInfo = (*env)->GetFieldID(env, NOTIFYICONDATAWFc.clazz, "szInfo", "[C");
-	NOTIFYICONDATAWFc.szInfoTitle = (*env)->GetFieldID(env, NOTIFYICONDATAWFc.clazz, "szInfoTitle", "[C");
-	NOTIFYICONDATAWFc.cached = 1;
-}
-
-NOTIFYICONDATAW *getNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lpStruct)
-{
-	if (!NOTIFYICONDATAWFc.cached) cacheNOTIFYICONDATAWFields(env, lpObject);
-	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize);
-	lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd);
-	lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID);
-	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
-	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
-	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
 	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
 	lpStruct->dwStateMask = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask);
-	lpStruct->uVersion = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion);
-	lpStruct->dwInfoFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szTip);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip);
-	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfo);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szInfo);
 	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / sizeof(jchar), (jchar *)lpStruct->szInfo);
 	}
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfoTitle);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szInfoTitle);
 	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / sizeof(jchar), (jchar *)lpStruct->szInfoTitle);
 	}
+	lpStruct->uVersion = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion);
+	lpStruct->dwInfoFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags);
 	return lpStruct;
 }
 
-void setNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lpStruct)
+void setNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpStruct)
 {
-	if (!NOTIFYICONDATAWFc.cached) cacheNOTIFYICONDATAWFields(env, lpObject);
+	if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
 	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask, (jint)lpStruct->dwStateMask);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion, (jint)lpStruct->uVersion);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags, (jint)lpStruct->dwInfoFlags);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szTip);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szTip);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip);
 	}
+	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
+	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwStateMask, (jint)lpStruct->dwStateMask);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfo);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szInfo);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / sizeof(jchar), (jchar *)lpStruct->szInfo);
 	}
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfoTitle);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szInfoTitle);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / sizeof(jchar), (jchar *)lpStruct->szInfoTitle);
 	}
+	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uVersion, (jint)lpStruct->uVersion);
+	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwInfoFlags, (jint)lpStruct->dwInfoFlags);
 }
 #endif
 
@@ -5628,7 +4950,7 @@ void setOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME *lpStruct
 typedef struct OUTLINETEXTMETRIC_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID otmSize, otmFiller, otmPanoseNumber_bFamilyType, otmPanoseNumber_bSerifStyle, otmPanoseNumber_bWeight, otmPanoseNumber_bProportion, otmPanoseNumber_bContrast, otmPanoseNumber_bStrokeVariation, otmPanoseNumber_bArmStyle, otmPanoseNumber_bLetterform, otmPanoseNumber_bMidline, otmPanoseNumber_bXHeight, otmfsSelection, otmfsType, otmsCharSlopeRise, otmsCharSlopeRun, otmItalicAngle, otmEMSquare, otmAscent, otmDescent, otmLineGap, otmsCapEmHeight, otmsXHeight, otmrcFontBox, otmMacAscent, otmMacDescent, otmMacLineGap, otmusMinimumPPEM, otmptSubscriptSize, otmptSubscriptOffset, otmptSuperscriptSize, otmptSuperscriptOffset, otmsStrikeoutSize, otmsStrikeoutPosition, otmsUnderscoreSize, otmsUnderscorePosition, otmpFamilyName, otmpFaceName, otmpStyleName, otmpFullName;
+	jfieldID otmSize, otmTextMetrics, otmFiller, otmPanoseNumber_bFamilyType, otmPanoseNumber_bSerifStyle, otmPanoseNumber_bWeight, otmPanoseNumber_bProportion, otmPanoseNumber_bContrast, otmPanoseNumber_bStrokeVariation, otmPanoseNumber_bArmStyle, otmPanoseNumber_bLetterform, otmPanoseNumber_bMidline, otmPanoseNumber_bXHeight, otmfsSelection, otmfsType, otmsCharSlopeRise, otmsCharSlopeRun, otmItalicAngle, otmEMSquare, otmAscent, otmDescent, otmLineGap, otmsCapEmHeight, otmsXHeight, otmrcFontBox, otmMacAscent, otmMacDescent, otmMacLineGap, otmusMinimumPPEM, otmptSubscriptSize, otmptSubscriptOffset, otmptSuperscriptSize, otmptSuperscriptOffset, otmsStrikeoutSize, otmsStrikeoutPosition, otmsUnderscoreSize, otmsUnderscorePosition, otmpFamilyName, otmpFaceName, otmpStyleName, otmpFullName;
 } OUTLINETEXTMETRIC_FID_CACHE;
 
 OUTLINETEXTMETRIC_FID_CACHE OUTLINETEXTMETRICFc;
@@ -5638,6 +4960,7 @@ void cacheOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject)
 	if (OUTLINETEXTMETRICFc.cached) return;
 	OUTLINETEXTMETRICFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	OUTLINETEXTMETRICFc.otmSize = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmSize", "I");
+	OUTLINETEXTMETRICFc.otmTextMetrics = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmTextMetrics", "Lorg/eclipse/swt/internal/win32/TEXTMETRIC;");
 	OUTLINETEXTMETRICFc.otmFiller = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmFiller", "B");
 	OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmPanoseNumber_bFamilyType", "B");
 	OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmPanoseNumber_bSerifStyle", "B");
@@ -5684,6 +5007,10 @@ OUTLINETEXTMETRIC *getOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUT
 {
 	if (!OUTLINETEXTMETRICFc.cached) cacheOUTLINETEXTMETRICFields(env, lpObject);
 	lpStruct->otmSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize);
+	{
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmTextMetrics);
+	if (lpObject1 != NULL) getTEXTMETRICFields(env, lpObject1, &lpStruct->otmTextMetrics);
+	}
 	lpStruct->otmFiller = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller);
 	lpStruct->otmPanoseNumber.bFamilyType = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType);
 	lpStruct->otmPanoseNumber.bSerifStyle = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle);
@@ -5745,150 +5072,10 @@ void setOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRIC
 {
 	if (!OUTLINETEXTMETRICFc.cached) cacheOUTLINETEXTMETRICFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize, (jint)lpStruct->otmSize);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller, (jbyte)lpStruct->otmFiller);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType, (jbyte)lpStruct->otmPanoseNumber.bFamilyType);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle, (jbyte)lpStruct->otmPanoseNumber.bSerifStyle);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bWeight, (jbyte)lpStruct->otmPanoseNumber.bWeight);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bProportion, (jbyte)lpStruct->otmPanoseNumber.bProportion);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bContrast, (jbyte)lpStruct->otmPanoseNumber.bContrast);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bStrokeVariation, (jbyte)lpStruct->otmPanoseNumber.bStrokeVariation);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bArmStyle, (jbyte)lpStruct->otmPanoseNumber.bArmStyle);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bLetterform, (jbyte)lpStruct->otmPanoseNumber.bLetterform);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bMidline, (jbyte)lpStruct->otmPanoseNumber.bMidline);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bXHeight, (jbyte)lpStruct->otmPanoseNumber.bXHeight);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsSelection, (jint)lpStruct->otmfsSelection);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsType, (jint)lpStruct->otmfsType);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRise, (jint)lpStruct->otmsCharSlopeRise);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRun, (jint)lpStruct->otmsCharSlopeRun);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmItalicAngle, (jint)lpStruct->otmItalicAngle);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmEMSquare, (jint)lpStruct->otmEMSquare);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmAscent, (jint)lpStruct->otmAscent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmDescent, (jint)lpStruct->otmDescent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmLineGap, (jint)lpStruct->otmLineGap);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCapEmHeight, (jint)lpStruct->otmsCapEmHeight);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsXHeight, (jint)lpStruct->otmsXHeight);
 	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmrcFontBox);
-	if (lpObject1 != NULL) setRECTFields(env, lpObject1, &lpStruct->otmrcFontBox);
-	}
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacAscent, (jint)lpStruct->otmMacAscent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacDescent, (jint)lpStruct->otmMacDescent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacLineGap, (jint)lpStruct->otmMacLineGap);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmusMinimumPPEM, (jint)lpStruct->otmusMinimumPPEM);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptSize);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptOffset);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptOffset);
+	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmTextMetrics);
+	if (lpObject1 != NULL) setTEXTMETRICFields(env, lpObject1, &lpStruct->otmTextMetrics);
 	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptSize);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptOffset);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptOffset);
-	}
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutSize, (jint)lpStruct->otmsStrikeoutSize);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
-}
-#endif
-
-#ifndef NO_OUTLINETEXTMETRICA
-typedef struct OUTLINETEXTMETRICA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID otmTextMetrics;
-} OUTLINETEXTMETRICA_FID_CACHE;
-
-OUTLINETEXTMETRICA_FID_CACHE OUTLINETEXTMETRICAFc;
-
-void cacheOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject)
-{
-	if (OUTLINETEXTMETRICAFc.cached) return;
-	cacheOUTLINETEXTMETRICFields(env, lpObject);
-	OUTLINETEXTMETRICAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	OUTLINETEXTMETRICAFc.otmTextMetrics = (*env)->GetFieldID(env, OUTLINETEXTMETRICAFc.clazz, "otmTextMetrics", "Lorg/eclipse/swt/internal/win32/TEXTMETRICA;");
-	OUTLINETEXTMETRICAFc.cached = 1;
-}
-
-OUTLINETEXTMETRICA *getOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICA *lpStruct)
-{
-	if (!OUTLINETEXTMETRICAFc.cached) cacheOUTLINETEXTMETRICAFields(env, lpObject);
-	lpStruct->otmSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize);
-	lpStruct->otmFiller = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller);
-	lpStruct->otmPanoseNumber.bFamilyType = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType);
-	lpStruct->otmPanoseNumber.bSerifStyle = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle);
-	lpStruct->otmPanoseNumber.bWeight = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bWeight);
-	lpStruct->otmPanoseNumber.bProportion = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bProportion);
-	lpStruct->otmPanoseNumber.bContrast = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bContrast);
-	lpStruct->otmPanoseNumber.bStrokeVariation = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bStrokeVariation);
-	lpStruct->otmPanoseNumber.bArmStyle = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bArmStyle);
-	lpStruct->otmPanoseNumber.bLetterform = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bLetterform);
-	lpStruct->otmPanoseNumber.bMidline = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bMidline);
-	lpStruct->otmPanoseNumber.bXHeight = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bXHeight);
-	lpStruct->otmfsSelection = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsSelection);
-	lpStruct->otmfsType = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsType);
-	lpStruct->otmsCharSlopeRise = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRise);
-	lpStruct->otmsCharSlopeRun = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRun);
-	lpStruct->otmItalicAngle = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmItalicAngle);
-	lpStruct->otmEMSquare = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmEMSquare);
-	lpStruct->otmAscent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmAscent);
-	lpStruct->otmDescent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmDescent);
-	lpStruct->otmLineGap = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmLineGap);
-	lpStruct->otmsCapEmHeight = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCapEmHeight);
-	lpStruct->otmsXHeight = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsXHeight);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmrcFontBox);
-	if (lpObject1 != NULL) getRECTFields(env, lpObject1, &lpStruct->otmrcFontBox);
-	}
-	lpStruct->otmMacAscent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacAscent);
-	lpStruct->otmMacDescent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacDescent);
-	lpStruct->otmMacLineGap = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacLineGap);
-	lpStruct->otmusMinimumPPEM = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmusMinimumPPEM);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptSize);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptOffset);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptOffset);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptSize);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptOffset);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptOffset);
-	}
-	lpStruct->otmsStrikeoutSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutSize);
-	lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition);
-	lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize);
-	lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition);
-	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
-	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
-	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
-	lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICAFc.otmTextMetrics);
-	if (lpObject1 != NULL) getTEXTMETRICAFields(env, lpObject1, &lpStruct->otmTextMetrics);
-	}
-	return lpStruct;
-}
-
-void setOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICA *lpStruct)
-{
-	if (!OUTLINETEXTMETRICAFc.cached) cacheOUTLINETEXTMETRICAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize, (jint)lpStruct->otmSize);
 	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller, (jbyte)lpStruct->otmFiller);
 	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType, (jbyte)lpStruct->otmPanoseNumber.bFamilyType);
 	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle, (jbyte)lpStruct->otmPanoseNumber.bSerifStyle);
@@ -5943,158 +5130,6 @@ void setOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRI
 	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
 	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
 	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICAFc.otmTextMetrics);
-	if (lpObject1 != NULL) setTEXTMETRICAFields(env, lpObject1, &lpStruct->otmTextMetrics);
-	}
-}
-#endif
-
-#ifndef NO_OUTLINETEXTMETRICW
-typedef struct OUTLINETEXTMETRICW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID otmTextMetrics;
-} OUTLINETEXTMETRICW_FID_CACHE;
-
-OUTLINETEXTMETRICW_FID_CACHE OUTLINETEXTMETRICWFc;
-
-void cacheOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject)
-{
-	if (OUTLINETEXTMETRICWFc.cached) return;
-	cacheOUTLINETEXTMETRICFields(env, lpObject);
-	OUTLINETEXTMETRICWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	OUTLINETEXTMETRICWFc.otmTextMetrics = (*env)->GetFieldID(env, OUTLINETEXTMETRICWFc.clazz, "otmTextMetrics", "Lorg/eclipse/swt/internal/win32/TEXTMETRICW;");
-	OUTLINETEXTMETRICWFc.cached = 1;
-}
-
-OUTLINETEXTMETRICW *getOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICW *lpStruct)
-{
-	if (!OUTLINETEXTMETRICWFc.cached) cacheOUTLINETEXTMETRICWFields(env, lpObject);
-	lpStruct->otmSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize);
-	lpStruct->otmFiller = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller);
-	lpStruct->otmPanoseNumber.bFamilyType = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType);
-	lpStruct->otmPanoseNumber.bSerifStyle = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle);
-	lpStruct->otmPanoseNumber.bWeight = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bWeight);
-	lpStruct->otmPanoseNumber.bProportion = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bProportion);
-	lpStruct->otmPanoseNumber.bContrast = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bContrast);
-	lpStruct->otmPanoseNumber.bStrokeVariation = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bStrokeVariation);
-	lpStruct->otmPanoseNumber.bArmStyle = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bArmStyle);
-	lpStruct->otmPanoseNumber.bLetterform = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bLetterform);
-	lpStruct->otmPanoseNumber.bMidline = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bMidline);
-	lpStruct->otmPanoseNumber.bXHeight = (*env)->GetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bXHeight);
-	lpStruct->otmfsSelection = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsSelection);
-	lpStruct->otmfsType = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsType);
-	lpStruct->otmsCharSlopeRise = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRise);
-	lpStruct->otmsCharSlopeRun = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRun);
-	lpStruct->otmItalicAngle = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmItalicAngle);
-	lpStruct->otmEMSquare = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmEMSquare);
-	lpStruct->otmAscent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmAscent);
-	lpStruct->otmDescent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmDescent);
-	lpStruct->otmLineGap = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmLineGap);
-	lpStruct->otmsCapEmHeight = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCapEmHeight);
-	lpStruct->otmsXHeight = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsXHeight);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmrcFontBox);
-	if (lpObject1 != NULL) getRECTFields(env, lpObject1, &lpStruct->otmrcFontBox);
-	}
-	lpStruct->otmMacAscent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacAscent);
-	lpStruct->otmMacDescent = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacDescent);
-	lpStruct->otmMacLineGap = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacLineGap);
-	lpStruct->otmusMinimumPPEM = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmusMinimumPPEM);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptSize);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptOffset);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptOffset);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptSize);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptOffset);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptOffset);
-	}
-	lpStruct->otmsStrikeoutSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutSize);
-	lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition);
-	lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize);
-	lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition);
-	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
-	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
-	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
-	lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICWFc.otmTextMetrics);
-	if (lpObject1 != NULL) getTEXTMETRICWFields(env, lpObject1, &lpStruct->otmTextMetrics);
-	}
-	return lpStruct;
-}
-
-void setOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICW *lpStruct)
-{
-	if (!OUTLINETEXTMETRICWFc.cached) cacheOUTLINETEXTMETRICWFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmSize, (jint)lpStruct->otmSize);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmFiller, (jbyte)lpStruct->otmFiller);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bFamilyType, (jbyte)lpStruct->otmPanoseNumber.bFamilyType);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bSerifStyle, (jbyte)lpStruct->otmPanoseNumber.bSerifStyle);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bWeight, (jbyte)lpStruct->otmPanoseNumber.bWeight);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bProportion, (jbyte)lpStruct->otmPanoseNumber.bProportion);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bContrast, (jbyte)lpStruct->otmPanoseNumber.bContrast);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bStrokeVariation, (jbyte)lpStruct->otmPanoseNumber.bStrokeVariation);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bArmStyle, (jbyte)lpStruct->otmPanoseNumber.bArmStyle);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bLetterform, (jbyte)lpStruct->otmPanoseNumber.bLetterform);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bMidline, (jbyte)lpStruct->otmPanoseNumber.bMidline);
-	(*env)->SetByteField(env, lpObject, OUTLINETEXTMETRICFc.otmPanoseNumber_bXHeight, (jbyte)lpStruct->otmPanoseNumber.bXHeight);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsSelection, (jint)lpStruct->otmfsSelection);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmfsType, (jint)lpStruct->otmfsType);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRise, (jint)lpStruct->otmsCharSlopeRise);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCharSlopeRun, (jint)lpStruct->otmsCharSlopeRun);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmItalicAngle, (jint)lpStruct->otmItalicAngle);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmEMSquare, (jint)lpStruct->otmEMSquare);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmAscent, (jint)lpStruct->otmAscent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmDescent, (jint)lpStruct->otmDescent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmLineGap, (jint)lpStruct->otmLineGap);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsCapEmHeight, (jint)lpStruct->otmsCapEmHeight);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsXHeight, (jint)lpStruct->otmsXHeight);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmrcFontBox);
-	if (lpObject1 != NULL) setRECTFields(env, lpObject1, &lpStruct->otmrcFontBox);
-	}
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacAscent, (jint)lpStruct->otmMacAscent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacDescent, (jint)lpStruct->otmMacDescent);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmMacLineGap, (jint)lpStruct->otmMacLineGap);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmusMinimumPPEM, (jint)lpStruct->otmusMinimumPPEM);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptSize);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSubscriptOffset);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSubscriptOffset);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptSize);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptSize);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICFc.otmptSuperscriptOffset);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->otmptSuperscriptOffset);
-	}
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutSize, (jint)lpStruct->otmsStrikeoutSize);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
-	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICWFc.otmTextMetrics);
-	if (lpObject1 != NULL) setTEXTMETRICWFields(env, lpObject1, &lpStruct->otmTextMetrics);
-	}
 }
 #endif
 
@@ -7291,7 +6326,7 @@ void setSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject, SHELLEXECUTEINFO *
 typedef struct SHFILEINFO_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID hIcon, iIcon, dwAttributes;
+	jfieldID hIcon, iIcon, dwAttributes, szDisplayName, szTypeName;
 } SHFILEINFO_FID_CACHE;
 
 SHFILEINFO_FID_CACHE SHFILEINFOFc;
@@ -7303,6 +6338,8 @@ void cacheSHFILEINFOFields(JNIEnv *env, jobject lpObject)
 	SHFILEINFOFc.hIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "hIcon", I_J);
 	SHFILEINFOFc.iIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "iIcon", "I");
 	SHFILEINFOFc.dwAttributes = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "dwAttributes", "I");
+	SHFILEINFOFc.szDisplayName = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "szDisplayName", "[C");
+	SHFILEINFOFc.szTypeName = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "szTypeName", "[C");
 	SHFILEINFOFc.cached = 1;
 }
 
@@ -7312,119 +6349,29 @@ SHFILEINFO *getSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStr
 	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
 	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
 	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
-	return lpStruct;
-}
-
-void setSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct)
-{
-	if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject);
-	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
-}
-#endif
-
-#ifndef NO_SHFILEINFOA
-typedef struct SHFILEINFOA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szDisplayName, szTypeName;
-} SHFILEINFOA_FID_CACHE;
-
-SHFILEINFOA_FID_CACHE SHFILEINFOAFc;
-
-void cacheSHFILEINFOAFields(JNIEnv *env, jobject lpObject)
-{
-	if (SHFILEINFOAFc.cached) return;
-	cacheSHFILEINFOFields(env, lpObject);
-	SHFILEINFOAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	SHFILEINFOAFc.szDisplayName = (*env)->GetFieldID(env, SHFILEINFOAFc.clazz, "szDisplayName", "[B");
-	SHFILEINFOAFc.szTypeName = (*env)->GetFieldID(env, SHFILEINFOAFc.clazz, "szTypeName", "[B");
-	SHFILEINFOAFc.cached = 1;
-}
-
-SHFILEINFOA *getSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct)
-{
-	if (!SHFILEINFOAFc.cached) cacheSHFILEINFOAFields(env, lpObject);
-	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
-	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
-	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOAFc.szDisplayName);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName), (jbyte *)lpStruct->szDisplayName);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOAFc.szTypeName);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName), (jbyte *)lpStruct->szTypeName);
-	}
-	return lpStruct;
-}
-
-void setSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct)
-{
-	if (!SHFILEINFOAFc.cached) cacheSHFILEINFOAFields(env, lpObject);
-	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOAFc.szDisplayName);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName), (jbyte *)lpStruct->szDisplayName);
-	}
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOAFc.szTypeName);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName), (jbyte *)lpStruct->szTypeName);
-	}
-}
-#endif
-
-#ifndef NO_SHFILEINFOW
-typedef struct SHFILEINFOW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID szDisplayName, szTypeName;
-} SHFILEINFOW_FID_CACHE;
-
-SHFILEINFOW_FID_CACHE SHFILEINFOWFc;
-
-void cacheSHFILEINFOWFields(JNIEnv *env, jobject lpObject)
-{
-	if (SHFILEINFOWFc.cached) return;
-	cacheSHFILEINFOFields(env, lpObject);
-	SHFILEINFOWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	SHFILEINFOWFc.szDisplayName = (*env)->GetFieldID(env, SHFILEINFOWFc.clazz, "szDisplayName", "[C");
-	SHFILEINFOWFc.szTypeName = (*env)->GetFieldID(env, SHFILEINFOWFc.clazz, "szTypeName", "[C");
-	SHFILEINFOWFc.cached = 1;
-}
-
-SHFILEINFOW *getSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct)
-{
-	if (!SHFILEINFOWFc.cached) cacheSHFILEINFOWFields(env, lpObject);
-	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
-	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
-	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szDisplayName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOFc.szDisplayName);
 	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / sizeof(jchar), (jchar *)lpStruct->szDisplayName);
 	}
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szTypeName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOFc.szTypeName);
 	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / sizeof(jchar), (jchar *)lpStruct->szTypeName);
 	}
 	return lpStruct;
 }
 
-void setSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct)
+void setSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct)
 {
-	if (!SHFILEINFOWFc.cached) cacheSHFILEINFOWFields(env, lpObject);
+	if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject);
 	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szDisplayName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOFc.szDisplayName);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / sizeof(jchar), (jchar *)lpStruct->szDisplayName);
 	}
 	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szTypeName);
+	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOFc.szTypeName);
 	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / sizeof(jchar), (jchar *)lpStruct->szTypeName);
 	}
 }
@@ -7792,7 +6739,7 @@ void setTCITEMFields(JNIEnv *env, jobject lpObject, TCITEM *lpStruct)
 typedef struct TEXTMETRIC_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID tmHeight, tmAscent, tmDescent, tmInternalLeading, tmExternalLeading, tmAveCharWidth, tmMaxCharWidth, tmWeight, tmOverhang, tmDigitizedAspectX, tmDigitizedAspectY, tmItalic, tmUnderlined, tmStruckOut, tmPitchAndFamily, tmCharSet;
+	jfieldID tmHeight, tmAscent, tmDescent, tmInternalLeading, tmExternalLeading, tmAveCharWidth, tmMaxCharWidth, tmWeight, tmOverhang, tmDigitizedAspectX, tmDigitizedAspectY, tmFirstChar, tmLastChar, tmDefaultChar, tmBreakChar, tmItalic, tmUnderlined, tmStruckOut, tmPitchAndFamily, tmCharSet;
 } TEXTMETRIC_FID_CACHE;
 
 TEXTMETRIC_FID_CACHE TEXTMETRICFc;
@@ -7812,6 +6759,10 @@ void cacheTEXTMETRICFields(JNIEnv *env, jobject lpObject)
 	TEXTMETRICFc.tmOverhang = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmOverhang", "I");
 	TEXTMETRICFc.tmDigitizedAspectX = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmDigitizedAspectX", "I");
 	TEXTMETRICFc.tmDigitizedAspectY = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmDigitizedAspectY", "I");
+	TEXTMETRICFc.tmFirstChar = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmFirstChar", "C");
+	TEXTMETRICFc.tmLastChar = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmLastChar", "C");
+	TEXTMETRICFc.tmDefaultChar = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmDefaultChar", "C");
+	TEXTMETRICFc.tmBreakChar = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmBreakChar", "C");
 	TEXTMETRICFc.tmItalic = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmItalic", "B");
 	TEXTMETRICFc.tmUnderlined = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmUnderlined", "B");
 	TEXTMETRICFc.tmStruckOut = (*env)->GetFieldID(env, TEXTMETRICFc.clazz, "tmStruckOut", "B");
@@ -7834,6 +6785,10 @@ TEXTMETRIC *getTEXTMETRICFields(JNIEnv *env, jobject lpObject, TEXTMETRIC *lpStr
 	lpStruct->tmOverhang = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmOverhang);
 	lpStruct->tmDigitizedAspectX = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX);
 	lpStruct->tmDigitizedAspectY = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY);
+	lpStruct->tmFirstChar = (*env)->GetCharField(env, lpObject, TEXTMETRICFc.tmFirstChar);
+	lpStruct->tmLastChar = (*env)->GetCharField(env, lpObject, TEXTMETRICFc.tmLastChar);
+	lpStruct->tmDefaultChar = (*env)->GetCharField(env, lpObject, TEXTMETRICFc.tmDefaultChar);
+	lpStruct->tmBreakChar = (*env)->GetCharField(env, lpObject, TEXTMETRICFc.tmBreakChar);
 	lpStruct->tmItalic = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmItalic);
 	lpStruct->tmUnderlined = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined);
 	lpStruct->tmStruckOut = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut);
@@ -7856,6 +6811,10 @@ void setTEXTMETRICFields(JNIEnv *env, jobject lpObject, TEXTMETRIC *lpStruct)
 	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmOverhang, (jint)lpStruct->tmOverhang);
 	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX, (jint)lpStruct->tmDigitizedAspectX);
 	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY, (jint)lpStruct->tmDigitizedAspectY);
+	(*env)->SetCharField(env, lpObject, TEXTMETRICFc.tmFirstChar, (jchar)lpStruct->tmFirstChar);
+	(*env)->SetCharField(env, lpObject, TEXTMETRICFc.tmLastChar, (jchar)lpStruct->tmLastChar);
+	(*env)->SetCharField(env, lpObject, TEXTMETRICFc.tmDefaultChar, (jchar)lpStruct->tmDefaultChar);
+	(*env)->SetCharField(env, lpObject, TEXTMETRICFc.tmBreakChar, (jchar)lpStruct->tmBreakChar);
 	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmItalic, (jbyte)lpStruct->tmItalic);
 	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined, (jbyte)lpStruct->tmUnderlined);
 	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut, (jbyte)lpStruct->tmStruckOut);
@@ -7864,152 +6823,6 @@ void setTEXTMETRICFields(JNIEnv *env, jobject lpObject, TEXTMETRIC *lpStruct)
 }
 #endif
 
-#ifndef NO_TEXTMETRICA
-typedef struct TEXTMETRICA_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID tmFirstChar, tmLastChar, tmDefaultChar, tmBreakChar;
-} TEXTMETRICA_FID_CACHE;
-
-TEXTMETRICA_FID_CACHE TEXTMETRICAFc;
-
-void cacheTEXTMETRICAFields(JNIEnv *env, jobject lpObject)
-{
-	if (TEXTMETRICAFc.cached) return;
-	cacheTEXTMETRICFields(env, lpObject);
-	TEXTMETRICAFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	TEXTMETRICAFc.tmFirstChar = (*env)->GetFieldID(env, TEXTMETRICAFc.clazz, "tmFirstChar", "B");
-	TEXTMETRICAFc.tmLastChar = (*env)->GetFieldID(env, TEXTMETRICAFc.clazz, "tmLastChar", "B");
-	TEXTMETRICAFc.tmDefaultChar = (*env)->GetFieldID(env, TEXTMETRICAFc.clazz, "tmDefaultChar", "B");
-	TEXTMETRICAFc.tmBreakChar = (*env)->GetFieldID(env, TEXTMETRICAFc.clazz, "tmBreakChar", "B");
-	TEXTMETRICAFc.cached = 1;
-}
-
-TEXTMETRICA *getTEXTMETRICAFields(JNIEnv *env, jobject lpObject, TEXTMETRICA *lpStruct)
-{
-	if (!TEXTMETRICAFc.cached) cacheTEXTMETRICAFields(env, lpObject);
-	lpStruct->tmHeight = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmHeight);
-	lpStruct->tmAscent = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmAscent);
-	lpStruct->tmDescent = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDescent);
-	lpStruct->tmInternalLeading = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmInternalLeading);
-	lpStruct->tmExternalLeading = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmExternalLeading);
-	lpStruct->tmAveCharWidth = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmAveCharWidth);
-	lpStruct->tmMaxCharWidth = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmMaxCharWidth);
-	lpStruct->tmWeight = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmWeight);
-	lpStruct->tmOverhang = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmOverhang);
-	lpStruct->tmDigitizedAspectX = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX);
-	lpStruct->tmDigitizedAspectY = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY);
-	lpStruct->tmItalic = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmItalic);
-	lpStruct->tmUnderlined = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined);
-	lpStruct->tmStruckOut = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut);
-	lpStruct->tmPitchAndFamily = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmPitchAndFamily);
-	lpStruct->tmCharSet = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmCharSet);
-	lpStruct->tmFirstChar = (*env)->GetByteField(env, lpObject, TEXTMETRICAFc.tmFirstChar);
-	lpStruct->tmLastChar = (*env)->GetByteField(env, lpObject, TEXTMETRICAFc.tmLastChar);
-	lpStruct->tmDefaultChar = (*env)->GetByteField(env, lpObject, TEXTMETRICAFc.tmDefaultChar);
-	lpStruct->tmBreakChar = (*env)->GetByteField(env, lpObject, TEXTMETRICAFc.tmBreakChar);
-	return lpStruct;
-}
-
-void setTEXTMETRICAFields(JNIEnv *env, jobject lpObject, TEXTMETRICA *lpStruct)
-{
-	if (!TEXTMETRICAFc.cached) cacheTEXTMETRICAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmHeight, (jint)lpStruct->tmHeight);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmAscent, (jint)lpStruct->tmAscent);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDescent, (jint)lpStruct->tmDescent);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmInternalLeading, (jint)lpStruct->tmInternalLeading);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmExternalLeading, (jint)lpStruct->tmExternalLeading);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmAveCharWidth, (jint)lpStruct->tmAveCharWidth);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmMaxCharWidth, (jint)lpStruct->tmMaxCharWidth);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmWeight, (jint)lpStruct->tmWeight);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmOverhang, (jint)lpStruct->tmOverhang);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX, (jint)lpStruct->tmDigitizedAspectX);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY, (jint)lpStruct->tmDigitizedAspectY);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmItalic, (jbyte)lpStruct->tmItalic);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined, (jbyte)lpStruct->tmUnderlined);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut, (jbyte)lpStruct->tmStruckOut);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmPitchAndFamily, (jbyte)lpStruct->tmPitchAndFamily);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmCharSet, (jbyte)lpStruct->tmCharSet);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICAFc.tmFirstChar, (jbyte)lpStruct->tmFirstChar);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICAFc.tmLastChar, (jbyte)lpStruct->tmLastChar);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICAFc.tmDefaultChar, (jbyte)lpStruct->tmDefaultChar);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICAFc.tmBreakChar, (jbyte)lpStruct->tmBreakChar);
-}
-#endif
-
-#ifndef NO_TEXTMETRICW
-typedef struct TEXTMETRICW_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID tmFirstChar, tmLastChar, tmDefaultChar, tmBreakChar;
-} TEXTMETRICW_FID_CACHE;
-
-TEXTMETRICW_FID_CACHE TEXTMETRICWFc;
-
-void cacheTEXTMETRICWFields(JNIEnv *env, jobject lpObject)
-{
-	if (TEXTMETRICWFc.cached) return;
-	cacheTEXTMETRICFields(env, lpObject);
-	TEXTMETRICWFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	TEXTMETRICWFc.tmFirstChar = (*env)->GetFieldID(env, TEXTMETRICWFc.clazz, "tmFirstChar", "C");
-	TEXTMETRICWFc.tmLastChar = (*env)->GetFieldID(env, TEXTMETRICWFc.clazz, "tmLastChar", "C");
-	TEXTMETRICWFc.tmDefaultChar = (*env)->GetFieldID(env, TEXTMETRICWFc.clazz, "tmDefaultChar", "C");
-	TEXTMETRICWFc.tmBreakChar = (*env)->GetFieldID(env, TEXTMETRICWFc.clazz, "tmBreakChar", "C");
-	TEXTMETRICWFc.cached = 1;
-}
-
-TEXTMETRICW *getTEXTMETRICWFields(JNIEnv *env, jobject lpObject, TEXTMETRICW *lpStruct)
-{
-	if (!TEXTMETRICWFc.cached) cacheTEXTMETRICWFields(env, lpObject);
-	lpStruct->tmHeight = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmHeight);
-	lpStruct->tmAscent = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmAscent);
-	lpStruct->tmDescent = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDescent);
-	lpStruct->tmInternalLeading = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmInternalLeading);
-	lpStruct->tmExternalLeading = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmExternalLeading);
-	lpStruct->tmAveCharWidth = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmAveCharWidth);
-	lpStruct->tmMaxCharWidth = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmMaxCharWidth);
-	lpStruct->tmWeight = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmWeight);
-	lpStruct->tmOverhang = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmOverhang);
-	lpStruct->tmDigitizedAspectX = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX);
-	lpStruct->tmDigitizedAspectY = (*env)->GetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY);
-	lpStruct->tmItalic = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmItalic);
-	lpStruct->tmUnderlined = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined);
-	lpStruct->tmStruckOut = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut);
-	lpStruct->tmPitchAndFamily = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmPitchAndFamily);
-	lpStruct->tmCharSet = (*env)->GetByteField(env, lpObject, TEXTMETRICFc.tmCharSet);
-	lpStruct->tmFirstChar = (*env)->GetCharField(env, lpObject, TEXTMETRICWFc.tmFirstChar);
-	lpStruct->tmLastChar = (*env)->GetCharField(env, lpObject, TEXTMETRICWFc.tmLastChar);
-	lpStruct->tmDefaultChar = (*env)->GetCharField(env, lpObject, TEXTMETRICWFc.tmDefaultChar);
-	lpStruct->tmBreakChar = (*env)->GetCharField(env, lpObject, TEXTMETRICWFc.tmBreakChar);
-	return lpStruct;
-}
-
-void setTEXTMETRICWFields(JNIEnv *env, jobject lpObject, TEXTMETRICW *lpStruct)
-{
-	if (!TEXTMETRICWFc.cached) cacheTEXTMETRICWFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmHeight, (jint)lpStruct->tmHeight);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmAscent, (jint)lpStruct->tmAscent);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDescent, (jint)lpStruct->tmDescent);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmInternalLeading, (jint)lpStruct->tmInternalLeading);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmExternalLeading, (jint)lpStruct->tmExternalLeading);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmAveCharWidth, (jint)lpStruct->tmAveCharWidth);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmMaxCharWidth, (jint)lpStruct->tmMaxCharWidth);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmWeight, (jint)lpStruct->tmWeight);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmOverhang, (jint)lpStruct->tmOverhang);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectX, (jint)lpStruct->tmDigitizedAspectX);
-	(*env)->SetIntField(env, lpObject, TEXTMETRICFc.tmDigitizedAspectY, (jint)lpStruct->tmDigitizedAspectY);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmItalic, (jbyte)lpStruct->tmItalic);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmUnderlined, (jbyte)lpStruct->tmUnderlined);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmStruckOut, (jbyte)lpStruct->tmStruckOut);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmPitchAndFamily, (jbyte)lpStruct->tmPitchAndFamily);
-	(*env)->SetByteField(env, lpObject, TEXTMETRICFc.tmCharSet, (jbyte)lpStruct->tmCharSet);
-	(*env)->SetCharField(env, lpObject, TEXTMETRICWFc.tmFirstChar, (jchar)lpStruct->tmFirstChar);
-	(*env)->SetCharField(env, lpObject, TEXTMETRICWFc.tmLastChar, (jchar)lpStruct->tmLastChar);
-	(*env)->SetCharField(env, lpObject, TEXTMETRICWFc.tmDefaultChar, (jchar)lpStruct->tmDefaultChar);
-	(*env)->SetCharField(env, lpObject, TEXTMETRICWFc.tmBreakChar, (jchar)lpStruct->tmBreakChar);
-}
-#endif
-
 #ifndef NO_TF_DA_COLOR
 typedef struct TF_DA_COLOR_FID_CACHE {
 	int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h
index 6c55f04edc..c704b10f8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h
@@ -293,30 +293,6 @@ void setDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct);
 #define DEVMODE_sizeof() 0
 #endif
 
-#ifndef NO_DEVMODEA
-void cacheDEVMODEAFields(JNIEnv *env, jobject lpObject);
-DEVMODEA *getDEVMODEAFields(JNIEnv *env, jobject lpObject, DEVMODEA *lpStruct);
-void setDEVMODEAFields(JNIEnv *env, jobject lpObject, DEVMODEA *lpStruct);
-#define DEVMODEA_sizeof() sizeof(DEVMODEA)
-#else
-#define cacheDEVMODEAFields(a,b)
-#define getDEVMODEAFields(a,b,c) NULL
-#define setDEVMODEAFields(a,b,c)
-#define DEVMODEA_sizeof() 0
-#endif
-
-#ifndef NO_DEVMODEW
-void cacheDEVMODEWFields(JNIEnv *env, jobject lpObject);
-DEVMODEW *getDEVMODEWFields(JNIEnv *env, jobject lpObject, DEVMODEW *lpStruct);
-void setDEVMODEWFields(JNIEnv *env, jobject lpObject, DEVMODEW *lpStruct);
-#define DEVMODEW_sizeof() sizeof(DEVMODEW)
-#else
-#define cacheDEVMODEWFields(a,b)
-#define getDEVMODEWFields(a,b,c) NULL
-#define setDEVMODEWFields(a,b,c)
-#define DEVMODEW_sizeof() 0
-#endif
-
 #ifndef NO_DIBSECTION
 void cacheDIBSECTIONFields(JNIEnv *env, jobject lpObject);
 DIBSECTION *getDIBSECTIONFields(JNIEnv *env, jobject lpObject, DIBSECTION *lpStruct);
@@ -665,30 +641,6 @@ void setLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct);
 #define LOGFONT_sizeof() 0
 #endif
 
-#ifndef NO_LOGFONTA
-void cacheLOGFONTAFields(JNIEnv *env, jobject lpObject);
-LOGFONTA *getLOGFONTAFields(JNIEnv *env, jobject lpObject, LOGFONTA *lpStruct);
-void setLOGFONTAFields(JNIEnv *env, jobject lpObject, LOGFONTA *lpStruct);
-#define LOGFONTA_sizeof() sizeof(LOGFONTA)
-#else
-#define cacheLOGFONTAFields(a,b)
-#define getLOGFONTAFields(a,b,c) NULL
-#define setLOGFONTAFields(a,b,c)
-#define LOGFONTA_sizeof() 0
-#endif
-
-#ifndef NO_LOGFONTW
-void cacheLOGFONTWFields(JNIEnv *env, jobject lpObject);
-LOGFONTW *getLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct);
-void setLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct);
-#define LOGFONTW_sizeof() sizeof(LOGFONTW)
-#else
-#define cacheLOGFONTWFields(a,b)
-#define getLOGFONTWFields(a,b,c) NULL
-#define setLOGFONTWFields(a,b,c)
-#define LOGFONTW_sizeof() 0
-#endif
-
 #ifndef NO_LOGPEN
 void cacheLOGPENFields(JNIEnv *env, jobject lpObject);
 LOGPEN *getLOGPENFields(JNIEnv *env, jobject lpObject, LOGPEN *lpStruct);
@@ -1073,30 +1025,6 @@ void setNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO *lpStruct
 #define NMTTDISPINFO_sizeof() 0
 #endif
 
-#ifndef NO_NMTTDISPINFOA
-void cacheNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject);
-NMTTDISPINFOA *getNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOA *lpStruct);
-void setNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOA *lpStruct);
-#define NMTTDISPINFOA_sizeof() sizeof(NMTTDISPINFOA)
-#else
-#define cacheNMTTDISPINFOAFields(a,b)
-#define getNMTTDISPINFOAFields(a,b,c) NULL
-#define setNMTTDISPINFOAFields(a,b,c)
-#define NMTTDISPINFOA_sizeof() 0
-#endif
-
-#ifndef NO_NMTTDISPINFOW
-void cacheNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject);
-NMTTDISPINFOW *getNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOW *lpStruct);
-void setNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOW *lpStruct);
-#define NMTTDISPINFOW_sizeof() sizeof(NMTTDISPINFOW)
-#else
-#define cacheNMTTDISPINFOWFields(a,b)
-#define getNMTTDISPINFOWFields(a,b,c) NULL
-#define setNMTTDISPINFOWFields(a,b,c)
-#define NMTTDISPINFOW_sizeof() 0
-#endif
-
 #ifndef NO_NMTVCUSTOMDRAW
 void cacheNMTVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject);
 NMTVCUSTOMDRAW *getNMTVCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMTVCUSTOMDRAW *lpStruct);
@@ -1157,30 +1085,6 @@ void setNONCLIENTMETRICSFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICS *
 #define NONCLIENTMETRICS_sizeof() 0
 #endif
 
-#ifndef NO_NONCLIENTMETRICSA
-void cacheNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject);
-NONCLIENTMETRICSA *getNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSA *lpStruct);
-void setNONCLIENTMETRICSAFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSA *lpStruct);
-#define NONCLIENTMETRICSA_sizeof() sizeof(NONCLIENTMETRICSA)
-#else
-#define cacheNONCLIENTMETRICSAFields(a,b)
-#define getNONCLIENTMETRICSAFields(a,b,c) NULL
-#define setNONCLIENTMETRICSAFields(a,b,c)
-#define NONCLIENTMETRICSA_sizeof() 0
-#endif
-
-#ifndef NO_NONCLIENTMETRICSW
-void cacheNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject);
-NONCLIENTMETRICSW *getNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSW *lpStruct);
-void setNONCLIENTMETRICSWFields(JNIEnv *env, jobject lpObject, NONCLIENTMETRICSW *lpStruct);
-#define NONCLIENTMETRICSW_sizeof() sizeof(NONCLIENTMETRICSW)
-#else
-#define cacheNONCLIENTMETRICSWFields(a,b)
-#define getNONCLIENTMETRICSWFields(a,b,c) NULL
-#define setNONCLIENTMETRICSWFields(a,b,c)
-#define NONCLIENTMETRICSW_sizeof() 0
-#endif
-
 #ifndef NO_NOTIFYICONDATA
 void cacheNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject);
 NOTIFYICONDATA *getNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpStruct);
@@ -1193,30 +1097,6 @@ void setNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpSt
 #define NOTIFYICONDATA_sizeof() 0
 #endif
 
-#ifndef NO_NOTIFYICONDATAA
-void cacheNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject);
-NOTIFYICONDATAA *getNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAA *lpStruct);
-void setNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAA *lpStruct);
-#define NOTIFYICONDATAA_sizeof() sizeof(NOTIFYICONDATAA)
-#else
-#define cacheNOTIFYICONDATAAFields(a,b)
-#define getNOTIFYICONDATAAFields(a,b,c) NULL
-#define setNOTIFYICONDATAAFields(a,b,c)
-#define NOTIFYICONDATAA_sizeof() 0
-#endif
-
-#ifndef NO_NOTIFYICONDATAW
-void cacheNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject);
-NOTIFYICONDATAW *getNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lpStruct);
-void setNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lpStruct);
-#define NOTIFYICONDATAW_sizeof() sizeof(NOTIFYICONDATAW)
-#else
-#define cacheNOTIFYICONDATAWFields(a,b)
-#define getNOTIFYICONDATAWFields(a,b,c) NULL
-#define setNOTIFYICONDATAWFields(a,b,c)
-#define NOTIFYICONDATAW_sizeof() 0
-#endif
-
 #ifndef NO_OFNOTIFY
 void cacheOFNOTIFYFields(JNIEnv *env, jobject lpObject);
 OFNOTIFY *getOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct);
@@ -1253,30 +1133,6 @@ void setOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRIC
 #define OUTLINETEXTMETRIC_sizeof() 0
 #endif
 
-#ifndef NO_OUTLINETEXTMETRICA
-void cacheOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject);
-OUTLINETEXTMETRICA *getOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICA *lpStruct);
-void setOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICA *lpStruct);
-#define OUTLINETEXTMETRICA_sizeof() sizeof(OUTLINETEXTMETRICA)
-#else
-#define cacheOUTLINETEXTMETRICAFields(a,b)
-#define getOUTLINETEXTMETRICAFields(a,b,c) NULL
-#define setOUTLINETEXTMETRICAFields(a,b,c)
-#define OUTLINETEXTMETRICA_sizeof() 0
-#endif
-
-#ifndef NO_OUTLINETEXTMETRICW
-void cacheOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject);
-OUTLINETEXTMETRICW *getOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICW *lpStruct);
-void setOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRICW *lpStruct);
-#define OUTLINETEXTMETRICW_sizeof() sizeof(OUTLINETEXTMETRICW)
-#else
-#define cacheOUTLINETEXTMETRICWFields(a,b)
-#define getOUTLINETEXTMETRICWFields(a,b,c) NULL
-#define setOUTLINETEXTMETRICWFields(a,b,c)
-#define OUTLINETEXTMETRICW_sizeof() 0
-#endif
-
 #ifndef NO_PAINTSTRUCT
 void cachePAINTSTRUCTFields(JNIEnv *env, jobject lpObject);
 PAINTSTRUCT *getPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct);
@@ -1553,30 +1409,6 @@ void setSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct);
 #define SHFILEINFO_sizeof() 0
 #endif
 
-#ifndef NO_SHFILEINFOA
-void cacheSHFILEINFOAFields(JNIEnv *env, jobject lpObject);
-SHFILEINFOA *getSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct);
-void setSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct);
-#define SHFILEINFOA_sizeof() sizeof(SHFILEINFOA)
-#else
-#define cacheSHFILEINFOAFields(a,b)
-#define getSHFILEINFOAFields(a,b,c) NULL
-#define setSHFILEINFOAFields(a,b,c)
-#define SHFILEINFOA_sizeof() 0
-#endif
-
-#ifndef NO_SHFILEINFOW
-void cacheSHFILEINFOWFields(JNIEnv *env, jobject lpObject);
-SHFILEINFOW *getSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct);
-void setSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct);
-#define SHFILEINFOW_sizeof() sizeof(SHFILEINFOW)
-#else
-#define cacheSHFILEINFOWFields(a,b)
-#define getSHFILEINFOWFields(a,b,c) NULL
-#define setSHFILEINFOWFields(a,b,c)
-#define SHFILEINFOW_sizeof() 0
-#endif
-
 #ifndef NO_SIZE
 void cacheSIZEFields(JNIEnv *env, jobject lpObject);
 SIZE *getSIZEFields(JNIEnv *env, jobject lpObject, SIZE *lpStruct);
@@ -1673,30 +1505,6 @@ void setTEXTMETRICFields(JNIEnv *env, jobject lpObject, TEXTMETRIC *lpStruct);
 #define TEXTMETRIC_sizeof() 0
 #endif
 
-#ifndef NO_TEXTMETRICA
-void cacheTEXTMETRICAFields(JNIEnv *env, jobject lpObject);
-TEXTMETRICA *getTEXTMETRICAFields(JNIEnv *env, jobject lpObject, TEXTMETRICA *lpStruct);
-void setTEXTMETRICAFields(JNIEnv *env, jobject lpObject, TEXTMETRICA *lpStruct);
-#define TEXTMETRICA_sizeof() sizeof(TEXTMETRICA)
-#else
-#define cacheTEXTMETRICAFields(a,b)
-#define getTEXTMETRICAFields(a,b,c) NULL
-#define setTEXTMETRICAFields(a,b,c)
-#define TEXTMETRICA_sizeof() 0
-#endif
-
-#ifndef NO_TEXTMETRICW
-void cacheTEXTMETRICWFields(JNIEnv *env, jobject lpObject);
-TEXTMETRICW *getTEXTMETRICWFields(JNIEnv *env, jobject lpObject, TEXTMETRICW *lpStruct);
-void setTEXTMETRICWFields(JNIEnv *env, jobject lpObject, TEXTMETRICW *lpStruct);
-#define TEXTMETRICW_sizeof() sizeof(TEXTMETRICW)
-#else
-#define cacheTEXTMETRICWFields(a,b)
-#define getTEXTMETRICWFields(a,b,c) NULL
-#define setTEXTMETRICWFields(a,b,c)
-#define TEXTMETRICW_sizeof() 0
-#endif
-
 #ifndef NO_TF_DA_COLOR
 void cacheTF_DA_COLORFields(JNIEnv *env, jobject lpObject);
 TF_DA_COLOR *getTF_DA_COLORFields(JNIEnv *env, jobject lpObject, TF_DA_COLOR *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODE.java
index 603024ef31..33b4de4111 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODE.java
@@ -13,7 +13,8 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class DEVMODE {
+public class DEVMODE {
+	public char[] dmDeviceName = new char[OS.CCHDEVICENAME];
 	public short dmSpecVersion;
 	public short dmDriverVersion;
 	public short dmSize;
@@ -32,6 +33,7 @@ public abstract class DEVMODE {
 	public short dmYResolution;
 	public short dmTTOption;
 	public short dmCollate;
+	public char[] dmFormName = new char[OS.CCHFORMNAME];
 	public short dmLogPixels;
 	public int dmBitsPerPel;
 	public int dmPelsWidth;
@@ -46,5 +48,5 @@ public abstract class DEVMODE {
 	public int dmReserved2;
 	public int dmPanningWidth;
 	public int dmPanningHeight;
-	public static final int sizeof = OS.IsUnicode ? OS.DEVMODEW_sizeof () : OS.DEVMODEA_sizeof ();
+	public static final int sizeof = OS.DEVMODE_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEA.java
deleted file mode 100644
index d5711fb12b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEA.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class DEVMODEA extends DEVMODE {
-	public byte[] dmDeviceName = new byte[OS.CCHDEVICENAME];
-	public byte[] dmFormName = new byte[OS.CCHFORMNAME];
-	public static final int sizeof = OS.DEVMODEA_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEW.java
deleted file mode 100644
index 636aced79f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DEVMODEW.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class DEVMODEW extends DEVMODE {
-	public char[] dmDeviceName = new char[OS.CCHDEVICENAME];
-	public char[] dmFormName = new char[OS.CCHFORMNAME];
-	public static final int sizeof = OS.DEVMODEW_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGFONTW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGFONTW.java
index d815ac1b00..5ca4ddb112 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGFONTW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGFONTW.java
@@ -14,7 +14,7 @@
 package org.eclipse.swt.internal.win32;
 
 public class EXTLOGFONTW {
-	public LOGFONTW elfLogFont = new LOGFONTW();
+	public LOGFONT elfLogFont = new LOGFONT();
 	public char[] elfFullName = new char[OS.LF_FULLFACESIZE];
 	public char[] elfStyle = new char[OS.LF_FACESIZE];
 	public int elfVersion;
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 2c4b942d4a..30e9628b9e 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
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class LOGFONT {
+public class LOGFONT {
 	public int lfHeight;
 	public int lfWidth;
 	public int lfEscapement;
@@ -27,5 +27,6 @@ public abstract class LOGFONT {
 	public byte lfClipPrecision;
 	public byte lfQuality;
 	public byte lfPitchAndFamily;
-	public static final int sizeof = OS.IsUnicode ? OS.LOGFONTW_sizeof () : OS.LOGFONTA_sizeof ();
+	public char[] lfFaceName = new char[OS.LF_FACESIZE];
+	public static final int sizeof = OS.LOGFONT_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
deleted file mode 100644
index f3e259dbcf..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTA.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class LOGFONTA extends LOGFONT {
-	public byte[] lfFaceName = new byte[OS.LF_FACESIZE];
-	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
deleted file mode 100644
index d44eaa4378..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONTW.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class LOGFONTW extends LOGFONT {
-	public char[] lfFaceName = new char[OS.LF_FACESIZE];
-	public static final int sizeof = OS.LOGFONTW_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 242885779e..815f919960 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
@@ -13,12 +13,13 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class NMTTDISPINFO extends NMHDR {
+public class NMTTDISPINFO extends NMHDR {
 	/** @field cast=(void *) */
 	public long /*int*/ lpszText;
+	public char[] szText = new char[80];
 	/** @field cast=(HINSTANCE) */
 	public long /*int*/ hinst;
 	public int uFlags;
 	public long /*int*/ lParam;
-	public static final int sizeof = OS.IsUnicode ? OS.NMTTDISPINFOW_sizeof () : OS.NMTTDISPINFOA_sizeof ();
+	public static final int sizeof = OS.NMTTDISPINFO_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
deleted file mode 100644
index d75df8ff9a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOA.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NMTTDISPINFOA extends NMTTDISPINFO {
-	public byte[] szText = new byte[80];
-	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
deleted file mode 100644
index 7ea77645ac..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFOW.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NMTTDISPINFOW extends NMTTDISPINFO {
-	public char[] szText = new char[80];
-	public static final int sizeof = OS.NMTTDISPINFOW_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 595cba8fa9..c2b3d86f43 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
@@ -13,17 +13,22 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class NONCLIENTMETRICS {
+public class NONCLIENTMETRICS {
 	public int cbSize;
 	public int iBorderWidth;
 	public int iScrollWidth;
 	public int iScrollHeight;
 	public int iCaptionWidth;
 	public int iCaptionHeight;
+	public LOGFONT lfCaptionFont = new LOGFONT ();
 	public int iSmCaptionWidth;
 	public int iSmCaptionHeight;
+	public LOGFONT lfSmCaptionFont = new LOGFONT ();
 	public int iMenuWidth;
 	public int iMenuHeight;
-	public static final int sizeof = OS.IsUnicode ? OS.NONCLIENTMETRICSW_sizeof () : OS.NONCLIENTMETRICSA_sizeof ();
+	public LOGFONT lfMenuFont = new LOGFONT ();
+	public LOGFONT lfStatusFont = new LOGFONT ();
+	public LOGFONT lfMessageFont = new LOGFONT ();
+	public static final int sizeof = OS.NONCLIENTMETRICS_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
deleted file mode 100644
index 7b60dbafff..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSA.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NONCLIENTMETRICSA extends NONCLIENTMETRICS {
-	public LOGFONTA lfCaptionFont = new LOGFONTA ();
-	public LOGFONTA lfSmCaptionFont = new LOGFONTA ();
-	public LOGFONTA lfMenuFont = new LOGFONTA ();
-	public LOGFONTA lfStatusFont = new LOGFONTA ();
-	public LOGFONTA lfMessageFont = new LOGFONTA ();
-	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
deleted file mode 100644
index a489bdd32c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NONCLIENTMETRICSW.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NONCLIENTMETRICSW extends NONCLIENTMETRICS {
-	public LOGFONTW lfCaptionFont = new LOGFONTW ();
-	public LOGFONTW lfSmCaptionFont = new LOGFONTW ();
-	public LOGFONTW lfMenuFont = new LOGFONTW ();
-	public LOGFONTW lfStatusFont = new LOGFONTW ();
-	public LOGFONTW lfMessageFont = new LOGFONTW ();
-	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 fa5f86d2c4..b3ff09169b 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
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class NOTIFYICONDATA {
+public class NOTIFYICONDATA {
 	public int cbSize;
 	/** @field cast=(HWND) */
 	public long /*int*/ hWnd;
@@ -22,8 +22,11 @@ public abstract class NOTIFYICONDATA {
 	public int uCallbackMessage;
 	/** @field cast=(HICON) */
 	public long /*int*/ hIcon;
+	public char szTip[] = new char [128];
 	public int dwState;
 	public int dwStateMask;
+	public char szInfo[] = new char [256];
+	public char szInfoTitle[] = new char [64];
 	public int uVersion;
 	public int dwInfoFlags;
 	public static final int sizeof = OS.NOTIFYICONDATA_V2_SIZE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java
deleted file mode 100644
index 408e7edc92..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NOTIFYICONDATAA extends NOTIFYICONDATA {
-	/** @field cast=(TCHAR) */
-	public byte szTip[] = new byte [128];
-	/** @field cast=(TCHAR) */
-	public byte szInfo[] = new byte [256];
-	/** @field cast=(TCHAR) */
-	public byte szInfoTitle[] = new byte [64];
-	public static final int sizeof = OS.NOTIFYICONDATAA_V2_SIZE;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java
deleted file mode 100644
index 59f6711e7c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class NOTIFYICONDATAW extends NOTIFYICONDATA {
-	/** @field cast=(TCHAR) */
-	public char szTip[] = new char [128];
-	/** @field cast=(TCHAR) */
-	public char szInfo[] = new char [256];
-	/** @field cast=(TCHAR) */
-	public char szInfoTitle[] = new char [64];
-	public static final int sizeof = OS.NOTIFYICONDATAW_V2_SIZE;
-}
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 9aa574d32e..3e0eb8a503 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
@@ -26,7 +26,6 @@ public class OS extends C {
 	* SWT Windows flags
 	*/
 	public static final boolean IsDBLocale;
-	public static final boolean IsUnicode = true;
 	public static final int WIN32_VERSION;
 
 	public static final String NO_MANIFEST = "org.eclipse.swt.internal.win32.OS.NO_MANIFEST";
@@ -116,9 +115,7 @@ public class OS extends C {
 	public static final int BDR_SUNKEN = 0x000a;
 	public static final int BFFM_INITIALIZED = 0x1;
 	public static final int BFFM_SETSELECTION = 0x467;
-	public static final int BFFM_VALIDATEFAILED = IsUnicode ? 0x4 : 0x3;
-	public static final int BFFM_VALIDATEFAILEDW = 0x4;
-	public static final int BFFM_VALIDATEFAILEDA = 0x3;
+	public static final int BFFM_VALIDATEFAILED = 0x4;
 	public static final int BF_ADJUST = 0x2000;
 	public static final int BF_LEFT = 0x0001;
 	public static final int BF_TOP = 0x0002;
@@ -615,41 +612,25 @@ public class OS extends C {
 	public static final int HDM_DELETEITEM = HDM_FIRST + 2;
 	public static final int HDM_GETBITMAPMARGIN = HDM_FIRST + 21;
 	public static final int HDM_GETITEMCOUNT = 0x1200;
-	public static final int HDM_GETITEMA = HDM_FIRST + 3;
-	public static final int HDM_GETITEMW = HDM_FIRST + 11;
-	public static final int HDM_GETITEM = IsUnicode ? HDM_GETITEMW : HDM_GETITEMA;
+	public static final int HDM_GETITEM = HDM_FIRST + 11;
 	public static final int HDM_GETITEMRECT = HDM_FIRST + 7;
 	public static final int HDM_GETORDERARRAY = HDM_FIRST + 17;
 	public static final int HDM_HITTEST = HDM_FIRST + 6;
-	public static final int HDM_INSERTITEMA = HDM_FIRST + 1;
-	public static final int HDM_INSERTITEMW = HDM_FIRST + 10;
-	public static final int HDM_INSERTITEM = IsUnicode ? HDM_INSERTITEMW : HDM_INSERTITEMA;
+	public static final int HDM_INSERTITEM = HDM_FIRST + 10;
 	public static final int HDM_LAYOUT = HDM_FIRST + 5;
 	public static final int HDM_ORDERTOINDEX = HDM_FIRST + 15;
 	public static final int HDM_SETIMAGELIST = HDM_FIRST + 8;
-	public static final int HDM_SETITEMA = HDM_FIRST + 4;
-	public static final int HDM_SETITEMW = HDM_FIRST + 12;
-	public static final int HDM_SETITEM = IsUnicode ? HDM_SETITEMW : HDM_SETITEMA;
+	public static final int HDM_SETITEM = HDM_FIRST + 12;
 	public static final int HDM_SETORDERARRAY = HDM_FIRST + 18;
 	public static final int HDN_FIRST = 0xfffffed4;
 	public static final int HDN_BEGINDRAG = HDN_FIRST - 10;
-	public static final int HDN_BEGINTRACK = IsUnicode ? 0xfffffeba : 0xfffffece;
-	public static final int HDN_BEGINTRACKW = 0xfffffeba;
-	public static final int HDN_BEGINTRACKA = 0xfffffece;
-	public static final int HDN_DIVIDERDBLCLICKA = HDN_FIRST - 5;
-	public static final int HDN_DIVIDERDBLCLICKW = HDN_FIRST - 25;
-	public static final int HDN_DIVIDERDBLCLICK = IsUnicode ? HDN_DIVIDERDBLCLICKW : HDN_DIVIDERDBLCLICKA;
+	public static final int HDN_BEGINTRACK = 0xfffffeba;
+	public static final int HDN_DIVIDERDBLCLICK = HDN_FIRST - 25;
 	public static final int HDN_ENDDRAG = HDN_FIRST - 11;
-	public static final int HDN_ITEMCHANGED = IsUnicode ? 0xfffffebf : 0xfffffed3;
-	public static final int HDN_ITEMCHANGEDW = 0xfffffebf;
-	public static final int HDN_ITEMCHANGEDA = 0xfffffed3;
-	public static final int HDN_ITEMCHANGINGW = HDN_FIRST - 20;
-	public static final int HDN_ITEMCHANGINGA = HDN_FIRST;
-	public static final int HDN_ITEMCLICKW = HDN_FIRST - 22;
-	public static final int HDN_ITEMCLICKA = HDN_FIRST - 2;
-	public static final int HDN_ITEMDBLCLICKW = HDN_FIRST - 23;
-	public static final int HDN_ITEMDBLCLICKA = HDN_FIRST - 3;
-	public static final int HDN_ITEMDBLCLICK = IsUnicode ? HDN_ITEMDBLCLICKW : HDN_ITEMDBLCLICKA;
+	public static final int HDN_ITEMCHANGED = 0xfffffebf;
+	public static final int HDN_ITEMCHANGING = HDN_FIRST - 20;
+	public static final int HDN_ITEMCLICK = HDN_FIRST - 22;
+	public static final int HDN_ITEMDBLCLICK = HDN_FIRST - 23;
 	public static final int HDS_BUTTONS = 0x2;
 	public static final int HDS_CHECKBOXES = 0x400;
 	public static final int HDS_DRAGDROP = 0x0040;
@@ -852,9 +833,7 @@ public class OS extends C {
 	public static final int LVM_GETEXTENDEDLISTVIEWSTYLE = 0x1037;
 	public static final int LVM_GETHEADER = 0x101f;
 	public static final int LVM_GETIMAGELIST = 0x1002;
-	public static final int LVM_GETITEM = IsUnicode ? 0x104b : 0x1005;
-	public static final int LVM_GETITEMW = 0x104b;
-	public static final int LVM_GETITEMA = 0x1005;
+	public static final int LVM_GETITEM = 0x104b;
 	public static final int LVM_GETITEMCOUNT = 0x1004;
 	public static final int LVM_GETITEMRECT = 0x100e;
 	public static final int LVM_GETITEMSTATE = 0x102c;
@@ -894,13 +873,11 @@ public class OS extends C {
 	public static final int LVN_BEGINRDRAG = 0xffffff91;
 	public static final int LVN_COLUMNCLICK = 0xffffff94;
 	public static final int LVN_FIRST = 0xffffff9c;
-	public static final int LVN_GETDISPINFOA = LVN_FIRST - 50;
-	public static final int LVN_GETDISPINFOW = LVN_FIRST - 77;
+	public static final int LVN_GETDISPINFO = LVN_FIRST - 77;
 	public static final int LVN_ITEMACTIVATE = 0xffffff8e;
 	public static final int LVN_ITEMCHANGED = 0xffffff9b;
 	public static final int LVN_MARQUEEBEGIN = 0xffffff64;
-	public static final int LVN_ODFINDITEMA = LVN_FIRST - 52;
-	public static final int LVN_ODFINDITEMW = LVN_FIRST - 79;
+	public static final int LVN_ODFINDITEM = LVN_FIRST - 79;
 	public static final int LVN_ODSTATECHANGED = LVN_FIRST - 15;
 	public static final int LVP_LISTITEM = 1;
 	public static final int LVSCW_AUTOSIZE = 0xffffffff;
@@ -1063,9 +1040,7 @@ public class OS extends C {
 	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 = 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 NOTIFYICONDATA_V2_SIZE = NOTIFYICONDATA_V2_SIZE ();
 	public static final int NULLREGION = 0x1;
 	public static final int NULL_BRUSH = 0x5;
 	public static final int NULL_PEN = 0x8;
@@ -1611,9 +1586,7 @@ public class OS extends C {
 	public static final int TTM_ACTIVATE = 0x400 + 1;
 	public static final int TTM_ADDTOOL = 0x432;
 	public static final int TTM_ADJUSTRECT = 0x400 + 31;
-	public static final int TTM_GETCURRENTTOOLA = 0x400 + 15;
-	public static final int TTM_GETCURRENTTOOLW = 0x400 + 59;
-	public static final int TTM_GETCURRENTTOOL = 0x400 + (IsUnicode ? 59 : 15);
+	public static final int TTM_GETCURRENTTOOL = 0x400 + 59;
 	public static final int TTM_GETDELAYTIME = 0x400 + 21;
 	public static final int TTM_DELTOOL = 0x433;
 	public static final int TTM_GETTOOLINFO = 0x400 + 53;
@@ -1622,17 +1595,13 @@ public class OS extends C {
 	public static final int TTM_POP = 0x400 + 28;
 	public static final int TTM_SETDELAYTIME = 0x400 + 3;
 	public static final int TTM_SETMAXTIPWIDTH = 0x418;
-	public static final int TTM_SETTITLEA = 0x400 + 32;
-	public static final int TTM_SETTITLEW = 0x400 + 33;
-	public static final int TTM_SETTITLE = 0x400 + (IsUnicode ? 33 : 32);
+	public static final int TTM_SETTITLE = 0x400 + 33;
 	public static final int TTM_TRACKPOSITION = 1042;
 	public static final int TTM_TRACKACTIVATE = 1041;
 	public static final int TTM_UPDATE = 0x41D;
 	public static final int TTM_UPDATETIPTEXT = 0x400 + 57;
 	public static final int TTN_FIRST = 0xfffffdf8;
-	public static final int TTN_GETDISPINFO = IsUnicode ? 0xfffffdee : 0xfffffdf8;
-	public static final int TTN_GETDISPINFOW = 0xfffffdee;
-	public static final int TTN_GETDISPINFOA = 0xfffffdf8;
+	public static final int TTN_GETDISPINFO = 0xfffffdee;
 	public static final int TTN_POP = TTN_FIRST - 2;
 	public static final int TTN_SHOW = TTN_FIRST - 1;
 	public static final int TTS_ALWAYSTIP = 0x1;
@@ -1709,23 +1678,15 @@ public class OS extends C {
 	public static final int TVM_SETTEXTCOLOR = 0x111e;
 	public static final int TVM_SORTCHILDREN = TV_FIRST + 19;
 	public static final int TVM_SORTCHILDRENCB = TV_FIRST + 21;
-	public static final int TVN_BEGINDRAGW = 0xfffffe38;
-	public static final int TVN_BEGINDRAGA = 0xfffffe69;
-	public static final int TVN_BEGINRDRAGW = 0xfffffe37;
-	public static final int TVN_BEGINRDRAGA = 0xfffffe68;
+	public static final int TVN_BEGINDRAG = 0xfffffe38;
+	public static final int TVN_BEGINRDRAG = 0xfffffe37;
 	public static final int TVN_FIRST = 0xfffffe70;
-	public static final int TVN_GETDISPINFOA = TVN_FIRST - 3;
-	public static final int TVN_GETDISPINFOW = TVN_FIRST - 52;
-	public static final int TVN_ITEMCHANGINGW = TVN_FIRST - 17;
-	public static final int TVN_ITEMCHANGINGA = TVN_FIRST - 16;
-	public static final int TVN_ITEMEXPANDEDA = TVN_FIRST -6;
-	public static final int TVN_ITEMEXPANDEDW = TVN_FIRST - 55;
-	public static final int TVN_ITEMEXPANDINGW = 0xfffffe3a;
-	public static final int TVN_ITEMEXPANDINGA = 0xfffffe6b;
-	public static final int TVN_SELCHANGEDW = 0xfffffe3d;
-	public static final int TVN_SELCHANGEDA = 0xfffffe6e;
-	public static final int TVN_SELCHANGINGW = 0xfffffe3e;
-	public static final int TVN_SELCHANGINGA = 0xfffffe6f;
+	public static final int TVN_GETDISPINFO = TVN_FIRST - 52;
+	public static final int TVN_ITEMCHANGING = TVN_FIRST - 17;
+	public static final int TVN_ITEMEXPANDED = TVN_FIRST - 55;
+	public static final int TVN_ITEMEXPANDING = 0xfffffe3a;
+	public static final int TVN_SELCHANGED = 0xfffffe3d;
+	public static final int TVN_SELCHANGING = 0xfffffe3e;
 	public static final int TVP_GLYPH = 2;
 	public static final int TVP_TREEITEM = 1;
 	public static final int TVSIL_NORMAL = 0x0;
@@ -2045,8 +2006,7 @@ public static final native int CRYPT_ALGORITHM_IDENTIFIER_sizeof ();
 public static final native int CRYPT_BIT_BLOB_sizeof ();
 public static final native int CRYPT_INTEGER_BLOB_sizeof ();
 public static final native int CRYPT_OBJID_BLOB_sizeof ();
-public static final native int DEVMODEA_sizeof ();
-public static final native int DEVMODEW_sizeof ();
+public static final native int DEVMODE_sizeof ();
 public static final native int DIBSECTION_sizeof ();
 public static final native int DOCHOSTUIINFO_sizeof ();
 public static final native int DOCINFO_sizeof ();
@@ -2075,8 +2035,7 @@ 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 LOGFONT_sizeof ();
 public static final native int LOGPEN_sizeof ();
 public static final native int LVCOLUMN_sizeof ();
 public static final native int LVHITTESTINFO_sizeof ();
@@ -2106,24 +2065,19 @@ public static final native int NMREBARCHILDSIZE_sizeof ();
 public static final native int NMTBHOTITEM_sizeof ();
 public static final native int NMTREEVIEW_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 NMTTDISPINFO_sizeof ();
 public static final native int NMTTCUSTOMDRAW_sizeof ();
 public static final native int NMTBCUSTOMDRAW_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 NONCLIENTMETRICS_sizeof ();
 /** @method flags=const */
-public static final native int NOTIFYICONDATAA_V2_SIZE ();
-/** @method flags=const */
-public static final native int NOTIFYICONDATAW_V2_SIZE ();
+public static final native int NOTIFYICONDATA_V2_SIZE ();
 public static final native int OFNOTIFY_sizeof ();
 public static final native int OPENFILENAME_sizeof ();
-public static final native int OUTLINETEXTMETRICA_sizeof ();
-public static final native int OUTLINETEXTMETRICW_sizeof ();
+public static final native int OUTLINETEXTMETRIC_sizeof ();
 public static final native int PAINTSTRUCT_sizeof ();
 public static final native int PANOSE_sizeof ();
 public static final native int POINT_sizeof ();
@@ -2148,8 +2102,7 @@ public static final native int SCROLLBARINFO_sizeof ();
 public static final native int SCROLLINFO_sizeof ();
 public static final native int SHDRAGIMAGE_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 SHFILEINFO_sizeof ();
 public static final native int SIZE_sizeof ();
 public static final native int STARTUPINFO_sizeof ();
 public static final native int SYSTEMTIME_sizeof ();
@@ -2157,8 +2110,7 @@ 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 TCHITTESTINFO_sizeof ();
-public static final native int TEXTMETRICA_sizeof ();
-public static final native int TEXTMETRICW_sizeof ();
+public static final native int TEXTMETRIC_sizeof ();
 public static final native int TF_DA_COLOR_sizeof ();
 public static final native int TF_DISPLAYATTRIBUTE_sizeof ();
 public static final native int TOOLINFO_sizeof ();
@@ -2178,250 +2130,65 @@ public static final native int WNDCLASS_sizeof ();
 /** Ansi/Unicode wrappers */
 
 public static final long /*int*/ AddFontResourceEx (TCHAR lpszFilename, int fl, long /*int*/ pdv) {
-	if (IsUnicode) {
-		char [] lpszFilename1 = lpszFilename == null ? null : lpszFilename.chars;
-		return AddFontResourceExW (lpszFilename1, fl, pdv);
-	}
-	byte [] lpszFilename1 = lpszFilename == null ? null : lpszFilename.bytes;
-	return AddFontResourceExA (lpszFilename1, fl, pdv);
+	char [] lpszFilename1 = lpszFilename == null ? null : lpszFilename.chars;
+	return AddFontResourceEx (lpszFilename1, fl, pdv);
 }
 
 public static final int AssocQueryString(int flags, int str, TCHAR pszAssoc, TCHAR pszExtra, TCHAR pszOut, int[] pcchOut) {
-	if (IsUnicode) {
-		char [] pszAssoc1 = pszAssoc == null ? null : pszAssoc.chars;
-		char [] pszExtra1 = pszExtra == null ? null : pszExtra.chars;
-		char [] pszOut1 = pszOut == null ? null : pszOut.chars;
-		return AssocQueryStringW (flags, str, pszAssoc1, pszExtra1, pszOut1, pcchOut);
-	}
-	byte [] pszAssoc1 = pszAssoc == null ? null : pszAssoc.bytes;
-	byte [] pszExtra1 = pszExtra == null ? null : pszExtra.bytes;
-	byte [] pszOut1 = pszOut == null ? null : pszOut.bytes;
-	return AssocQueryStringA (flags, str, pszAssoc1, pszExtra1, pszOut1, pcchOut);
-}
-
-public static final long /*int*/ CallWindowProc (long /*int*/ lpPrevWndFunc, long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return CallWindowProcW (lpPrevWndFunc, hWnd, Msg, wParam, lParam);
-	return CallWindowProcA (lpPrevWndFunc, hWnd, Msg, wParam, lParam);
-}
-
-public static final int CertNameToStr (int dwCertEncodingType, CERT_NAME_BLOB pName, int dwStrType, TCHAR psz, int csz) {
-	if (IsUnicode) {
-		char [] psz1 = psz == null ? null : psz.chars;
-		return CertNameToStrW (dwCertEncodingType, pName, dwStrType, psz1, csz);
-	}
-	byte [] psz1 = psz == null ? null : psz.bytes;
-	return CertNameToStrA (dwCertEncodingType, pName, dwStrType, psz1, csz);
-}
-
-public static final long /*int*/ CharUpper (long /*int*/ ch) {
-	if (IsUnicode) return CharUpperW (ch);
-	return CharUpperA (ch);
-}
-
-public static final long /*int*/ CharLower (long /*int*/ ch) {
-	if (IsUnicode) return CharLowerW (ch);
-	return CharLowerA (ch);
-}
-
-public static final boolean ChooseColor (CHOOSECOLOR lpcc) {
-	if (IsUnicode) return ChooseColorW (lpcc);
-	return ChooseColorA (lpcc);
-}
-
-public static final boolean ChooseFont (CHOOSEFONT chooseFont) {
-	if (IsUnicode) return ChooseFontW (chooseFont);
-	return ChooseFontA (chooseFont);
-}
-
-public static final long /*int*/ CreateActCtx (ACTCTX pActCtx) {
-	if (IsUnicode) return CreateActCtxW (pActCtx);
-	return CreateActCtxA (pActCtx);
-}
-
-public static final long /*int*/ CreateAcceleratorTable (byte [] lpaccl, int cEntries) {
-	if (IsUnicode) return CreateAcceleratorTableW (lpaccl, cEntries);
-	return CreateAcceleratorTableA (lpaccl, cEntries);
+	char [] pszAssoc1 = pszAssoc == null ? null : pszAssoc.chars;
+	char [] pszExtra1 = pszExtra == null ? null : pszExtra.chars;
+	char [] pszOut1 = pszOut == null ? null : pszOut.chars;
+	return AssocQueryString (flags, str, pszAssoc1, pszExtra1, pszOut1, pcchOut);
 }
 
 public static final long /*int*/ CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData) {
-	if (IsUnicode) {
-		char [] lpszDriver1 = lpszDriver == null ? null : lpszDriver.chars;
-		char [] lpszDevice1 = lpszDevice == null ? null : lpszDevice.chars;
-		return CreateDCW (lpszDriver1, lpszDevice1, lpszOutput, lpInitData);
-	}
-	byte [] lpszDriver1 = lpszDriver == null ? null : lpszDriver.bytes;
-	byte [] lpszDevice1 = lpszDevice == null ? null : lpszDevice.bytes;
-	return CreateDCA (lpszDriver1, lpszDevice1, lpszOutput, lpInitData);
-}
-
-public static final long /*int*/ CreateEnhMetaFile (long /*int*/ hdcRef, TCHAR lpFilename, RECT lpRect, TCHAR lpDescription) {
-	if (IsUnicode) {
-		char [] lpFilename1 = lpFilename == null ? null : lpFilename.chars;
-		char [] lpDescription1 = lpDescription == null ? null : lpDescription.chars;
-		return CreateEnhMetaFileW (hdcRef, lpFilename1, lpRect, lpDescription1);
-	}
-	byte [] lpFilename1 = lpFilename == null ? null : lpFilename.bytes;
-	byte [] lpDescription1 = lpDescription == null ? null : lpDescription.bytes;
-	return CreateEnhMetaFileA (hdcRef, lpFilename1, lpRect, lpDescription1);
-}
-
-public static final long /*int*/ CreateFontIndirect (long /*int*/ lplf) {
-	if (IsUnicode) return CreateFontIndirectW (lplf);
-	return CreateFontIndirectA (lplf);
-}
-
-public static final long /*int*/ CreateFontIndirect (LOGFONT lplf) {
-	if (IsUnicode) return CreateFontIndirectW ((LOGFONTW)lplf);
-	return CreateFontIndirectA ((LOGFONTA)lplf);
-}
-
-public static final boolean CreateProcess (long /*int*/ lpApplicationName, long /*int*/ lpCommandLine, long /*int*/ lpProcessAttributes, long /*int*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long /*int*/ lpEnvironment, long /*int*/ 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);
+	char [] lpszDriver1 = lpszDriver == null ? null : lpszDriver.chars;
+	char [] lpszDevice1 = lpszDevice == null ? null : lpszDevice.chars;
+	return CreateDC (lpszDriver1, lpszDevice1, lpszOutput, lpInitData);
 }
 
 public static final long /*int*/ CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam) {
-	if (IsUnicode) {
-		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
-		char [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.chars;
-		return CreateWindowExW (dwExStyle, lpClassName1, lpWindowName1, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
-	}
-	byte [] lpClassName1 = lpClassName == null ? null : lpClassName.bytes;
-	byte [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.bytes;
-	return CreateWindowExA (dwExStyle, lpClassName1, lpWindowName1, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
-}
-
-public static final long /*int*/ DefMDIChildProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return DefMDIChildProcW (hWnd, Msg, wParam, lParam);
-	return DefMDIChildProcA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ DefFrameProc (long /*int*/ hWnd, long /*int*/ hWndMDIClient, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return DefFrameProcW (hWnd, hWndMDIClient, Msg, wParam, lParam);
-	return DefFrameProcA (hWnd, hWndMDIClient, Msg, wParam, lParam);
-}
-public static final long /*int*/ DefWindowProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return DefWindowProcW (hWnd, Msg, wParam, lParam);
-	return DefWindowProcA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ DispatchMessage (MSG lpmsg) {
-	if (IsUnicode) return DispatchMessageW (lpmsg);
-	return DispatchMessageA (lpmsg);
+	char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
+	char [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.chars;
+	return CreateWindowEx (dwExStyle, lpClassName1, lpWindowName1, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
 }
 
 public static final int DocumentProperties (long /*int*/ hWnd, long /*int*/ hPrinter, TCHAR pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode) {
-	if (IsUnicode) {
-		char [] pDeviceName1 = pDeviceName == null ? null : pDeviceName.chars;
-		return DocumentPropertiesW (hWnd, hPrinter, pDeviceName1, pDevModeOutput, pDevModeInput, fMode);
-	}
-	byte [] pDeviceName1 = pDeviceName == null ? null : pDeviceName.bytes;
-	return DocumentPropertiesA (hWnd, hPrinter, pDeviceName1, pDevModeOutput, pDevModeInput, fMode);
-}
-
-public static final int DragQueryFile (long /*int*/ hDrop, int iFile, TCHAR lpszFile, int cch) {
-	if (IsUnicode) {
-		char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;
-		return DragQueryFileW (hDrop, iFile, lpszFile1, cch);
-	}
-	byte [] lpszFile1 = lpszFile == null ? null : lpszFile.bytes;
-	return DragQueryFileA (hDrop, iFile, lpszFile1, cch);
+	char [] pDeviceName1 = pDeviceName == null ? null : pDeviceName.chars;
+	return DocumentProperties (hWnd, hPrinter, pDeviceName1, pDevModeOutput, pDevModeInput, fMode);
 }
 
 public static final int DrawText (long /*int*/ 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);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return DrawTextA (hDC, lpString1, nCount, lpRect, uFormat);
-}
-
-public static final int EnumFontFamilies (long /*int*/ hdc, TCHAR lpszFamily, long /*int*/ lpEnumFontFamProc, long /*int*/ lParam) {
-	if (IsUnicode) {
-		char [] lpszFamily1 = lpszFamily == null ? null : lpszFamily.chars;
-		return EnumFontFamiliesW (hdc, lpszFamily1, lpEnumFontFamProc, lParam);
-	}
-	byte [] lpszFamily1 = lpszFamily == null ? null : lpszFamily.bytes;
-	return EnumFontFamiliesA (hdc, lpszFamily1, lpEnumFontFamProc, lParam);
-}
-
-public static final boolean EnumSystemLocales (long /*int*/ lpLocaleEnumProc, int dwFlags) {
-	if (IsUnicode) return EnumSystemLocalesW (lpLocaleEnumProc, dwFlags);
-	return EnumSystemLocalesA (lpLocaleEnumProc, dwFlags);
-}
-
-public static final boolean EnumSystemLanguageGroups (long /*int*/ pLangGroupEnumProc, int dwFlags, long /*int*/ lParam) {
-	if (IsUnicode) return EnumSystemLanguageGroupsW (pLangGroupEnumProc, dwFlags, lParam);
-	return EnumSystemLanguageGroupsA (pLangGroupEnumProc, dwFlags, lParam);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return DrawText (hDC, lpString1, nCount, lpRect, uFormat);
 }
 
 public static final int ExpandEnvironmentStrings (TCHAR lpSrc, TCHAR lpDst, int nSize) {
-	if (IsUnicode) {
-		char [] lpSrc1 = lpSrc == null ? null : lpSrc.chars;
-		char [] lpDst1 = lpDst == null ? null : lpDst.chars;
-		return ExpandEnvironmentStringsW (lpSrc1, lpDst1, nSize);
-	}
-	byte [] lpSrc1 = lpSrc == null ? null : lpSrc.bytes;
-	byte [] lpDst1 = lpDst == null ? null : lpDst.bytes;
-	return ExpandEnvironmentStringsA (lpSrc1, lpDst1, nSize);
+	char [] lpSrc1 = lpSrc == null ? null : lpSrc.chars;
+	char [] lpDst1 = lpDst == null ? null : lpDst.chars;
+	return ExpandEnvironmentStrings (lpSrc1, lpDst1, nSize);
 }
 
 public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons) {
-	if (IsUnicode) {
-		char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;
-		return ExtractIconExW (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
-	}
-	byte [] lpszFile1 = lpszFile == null ? null : lpszFile.bytes;
-	return ExtractIconExA (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
+	char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;
+	return ExtractIconEx (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 
 public static final boolean ExtTextOut(long /*int*/ 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);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return ExtTextOutA (hdc, X, Y, fuOptions, lprc, lpString1, cbCount, lpDx);
-}
-
-public static final int FormatMessage (int dwFlags, long /*int*/ lpSource, int dwMessageId, int dwLanguageId, long /*int*/ [] lpBuffer, int nSize, long /*int*/ 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 (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc) {
-	if (IsUnicode) return GetCharABCWidthsW (hdc,iFirstChar, iLastChar, lpabc);
-	return GetCharABCWidthsA (hdc,iFirstChar, iLastChar, lpabc);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return ExtTextOut (hdc, X, Y, fuOptions, lprc, lpString1, cbCount, lpDx);
 }
 
 public static final int GetCharacterPlacement (long /*int*/ 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);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return GetCharacterPlacementA (hdc, lpString1, nCount, nMaxExtent, lpResults, dwFlags);
-}
-
-public static final boolean GetCharWidth (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc) {
-	if (IsUnicode) return GetCharWidthW (hdc,iFirstChar, iLastChar, lpabc);
-	return GetCharWidthA (hdc,iFirstChar, iLastChar, lpabc);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return GetCharacterPlacement (hdc, lpString1, nCount, nMaxExtent, lpResults, dwFlags);
 }
 
 public static final boolean GetClassInfo (long /*int*/ hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) {
 	boolean result;
 
-	if (IsUnicode) {
-		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
-		result = GetClassInfoW (hInstance, lpClassName1, lpWndClass);
-	}
-	else {
-		byte[] lpClassName1 = lpClassName == null ? null : lpClassName.bytes;
-		result = GetClassInfoA(hInstance, lpClassName1, lpWndClass);
-	}
+	char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
+	result = GetClassInfo (hInstance, lpClassName1, lpWndClass);
 
 	/*
 	* WINAPI GetClassInfo copies lpClassName1 pointer to WNDCLASS.lpszClassName.
@@ -2436,423 +2203,108 @@ public static final boolean GetClassInfo (long /*int*/ hInstance, TCHAR lpClassN
 }
 
 public static final int GetClassName (long /*int*/ hWnd, TCHAR lpClassName, int nMaxCount) {
-	if (IsUnicode) {
-		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
-		return GetClassNameW (hWnd, lpClassName1, nMaxCount);
-	}
-	byte [] lpClassName1 = lpClassName == null ? null : lpClassName.bytes;
-	return GetClassNameA (hWnd, lpClassName1, nMaxCount);
+	char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
+	return GetClassName (hWnd, lpClassName1, nMaxCount);
 }
 
 public static final int GetClipboardFormatName (int format, TCHAR lpszFormatName, int cchMaxCount) {
-	if (IsUnicode) {
-		char [] lpszFormatName1 = lpszFormatName == null ? null : lpszFormatName.chars;
-		return GetClipboardFormatNameW (format, lpszFormatName1, cchMaxCount);
-	}
-	byte [] lpszFormatName1 = lpszFormatName == null ? null : lpszFormatName.bytes;
-	return GetClipboardFormatNameA (format, lpszFormatName1, cchMaxCount);
+	char [] lpszFormatName1 = lpszFormatName == null ? null : lpszFormatName.chars;
+	return GetClipboardFormatName (format, lpszFormatName1, cchMaxCount);
 }
 
 public static final int GetLocaleInfo (int Locale, int LCType, TCHAR lpLCData, int cchData) {
-	if (IsUnicode) {
-		char [] lpLCData1 = lpLCData == null ? null : lpLCData.chars;
-		return GetLocaleInfoW (Locale, LCType, lpLCData1, cchData);
-	}
-	byte [] lpLCData1 = lpLCData == null ? null : lpLCData.bytes;
-	return GetLocaleInfoA (Locale, LCType, lpLCData1, cchData);
-}
-
-public static final boolean GetMenuItemInfo (long /*int*/ 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, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax) {
-	if (IsUnicode) return GetMessageW (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
-	return GetMessageA (lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
+	char [] lpLCData1 = lpLCData == null ? null : lpLCData.chars;
+	return GetLocaleInfo (Locale, LCType, lpLCData1, cchData);
 }
 
 public static final int GetModuleFileName (long /*int*/ hModule, TCHAR lpFilename, int inSize) {
-	if (IsUnicode) {
-		char [] lpFilename1 = lpFilename == null ? null : lpFilename.chars;
-		return GetModuleFileNameW (hModule, lpFilename1, inSize);
-	}
-	byte [] lpFilename1 = lpFilename == null ? null : lpFilename.bytes;
-	return GetModuleFileNameA (hModule, lpFilename1, inSize);
-}
-
-public static final long /*int*/ GetModuleHandle (TCHAR lpModuleName) {
-	if (IsUnicode) {
-		char [] lpModuleName1 = lpModuleName == null ? null : lpModuleName.chars;
-		return GetModuleHandleW (lpModuleName1);
-	}
-	byte [] lpModuleName1 = lpModuleName == null ? null : lpModuleName.bytes;
-	return GetModuleHandleA (lpModuleName1);
-}
-
-public static final boolean GetMonitorInfo (long /*int*/ hmonitor, MONITORINFO lpmi) {
-	if (IsUnicode) return GetMonitorInfoW (hmonitor, lpmi);
-	return GetMonitorInfoA (hmonitor, lpmi);
-}
-
-public static final int GetObject (long /*int*/ hgdiobj, int cbBuffer, BITMAP lpvObject) {
-	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
-	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
-}
-
-public static final int GetObject (long /*int*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject) {
-	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
-	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
-}
-
-public static final int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject) {
-	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
-	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
-}
-
-public static final int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGFONT lpvObject) {
-	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, (LOGFONTW)lpvObject);
-	return GetObjectA (hgdiobj, cbBuffer, (LOGFONTA)lpvObject);
-}
-
-public static final int GetObject (long /*int*/ hgdiobj, int cbBuffer, long /*int*/ lpvObject) {
-	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
-	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
-}
-
-public static final boolean GetOpenFileName (OPENFILENAME lpofn) {
-	if (IsUnicode) return GetOpenFileNameW (lpofn);
-	return GetOpenFileNameA (lpofn);
-}
-
-public static final int GetOutlineTextMetrics (long /*int*/ hdc, int cbData,  OUTLINETEXTMETRIC lpOTM) {
-	if (IsUnicode) return GetOutlineTextMetricsW (hdc, cbData, (OUTLINETEXTMETRICW)lpOTM);
-	return GetOutlineTextMetricsA (hdc, cbData, (OUTLINETEXTMETRICA)lpOTM);
+	char [] lpFilename1 = lpFilename == null ? null : lpFilename.chars;
+	return GetModuleFileName (hModule, lpFilename1, inSize);
 }
 
 public static final int GetProfileString (TCHAR lpAppName, TCHAR lpKeyName, TCHAR lpDefault, TCHAR lpReturnedString, int nSize) {
-	if (IsUnicode) {
-		char [] lpAppName1 = lpAppName == null ? null : lpAppName.chars;
-		char [] lpKeyName1 = lpKeyName == null ? null : lpKeyName.chars;
-		char [] lpDefault1 = lpDefault == null ? null : lpDefault.chars;
-		char [] lpReturnedString1 = lpReturnedString == null ? null : lpReturnedString.chars;
-		return GetProfileStringW (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize);
-	}
-	byte [] lpAppName1 = lpAppName == null ? null : lpAppName.bytes;
-	byte [] lpKeyName1 = lpKeyName == null ? null : lpKeyName.bytes;
-	byte [] lpDefault1 = lpDefault == null ? null : lpDefault.bytes;
-	byte [] lpReturnedString1 = lpReturnedString == null ? null : lpReturnedString.bytes;
-	return GetProfileStringA (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize);
-}
-
-public static long /*int*/ GetProp (long /*int*/ hWnd, long /*int*/ lpString) {
-	if (IsUnicode) return GetPropW (hWnd, lpString);
-	return GetPropA (hWnd, lpString);
-}
-
-public static final boolean GetSaveFileName (OPENFILENAME lpofn) {
-	if (IsUnicode) return GetSaveFileNameW (lpofn);
-	return GetSaveFileNameA (lpofn);
-}
-
-public static final void GetStartupInfo (STARTUPINFO lpStartupInfo) {
-	if (IsUnicode) {
-		GetStartupInfoW (lpStartupInfo);
-	} else {
-		GetStartupInfoA (lpStartupInfo);
-	}
+	char [] lpAppName1 = lpAppName == null ? null : lpAppName.chars;
+	char [] lpKeyName1 = lpKeyName == null ? null : lpKeyName.chars;
+	char [] lpDefault1 = lpDefault == null ? null : lpDefault.chars;
+	char [] lpReturnedString1 = lpReturnedString == null ? null : lpReturnedString.chars;
+	return GetProfileString (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize);
 }
 
 public static final boolean GetTextExtentPoint32 (long /*int*/ hdc, TCHAR lpString, int cbString, SIZE lpSize) {
-	if (IsUnicode) {
-		char [] lpString1 = lpString == null ? null : lpString.chars;
-		return GetTextExtentPoint32W (hdc, lpString1, cbString, lpSize);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return GetTextExtentPoint32A (hdc, lpString1, cbString, lpSize);
-}
-
-public static final boolean GetTextMetrics (long /*int*/ hdc, TEXTMETRIC lptm) {
-	if (IsUnicode) return GetTextMetricsW (hdc, (TEXTMETRICW)lptm);
-	return GetTextMetricsA (hdc, (TEXTMETRICA)lptm);
-}
-
-public static final int GetWindowLong (long /*int*/ hWnd, int nIndex) {
-	if (IsUnicode) return GetWindowLongW (hWnd, nIndex);
-	return GetWindowLongA (hWnd, nIndex);
-}
-
-public static final long /*int*/ GetWindowLongPtr (long /*int*/ hWnd, int nIndex) {
-	if (IsUnicode) return GetWindowLongPtrW (hWnd, nIndex);
-	return GetWindowLongPtrA (hWnd, nIndex);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return GetTextExtentPoint32 (hdc, lpString1, cbString, lpSize);
 }
 
 public static final int GetWindowText (long /*int*/ hWnd, TCHAR lpString, int nMaxCount) {
-	if (IsUnicode) {
-		char [] lpString1 = lpString == null ? null : lpString.chars;
-		return GetWindowTextW (hWnd, lpString1, nMaxCount);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return GetWindowTextA (hWnd, lpString1, nMaxCount);
-}
-
-public static final int GetWindowTextLength (long /*int*/ hWnd) {
-	if (IsUnicode) return GetWindowTextLengthW (hWnd);
-	return GetWindowTextLengthA (hWnd);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return GetWindowText (hWnd, lpString1, nMaxCount);
 }
 
 public static final int GlobalAddAtom (TCHAR lpString) {
-	if (IsUnicode) {
-		char [] lpString1 = lpString == null ? null : lpString.chars;
-		return GlobalAddAtomW (lpString1);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return GlobalAddAtomA (lpString1);
-}
-
-public static final boolean ImmGetCompositionFont (long /*int*/ hIMC, LOGFONT lplf) {
-	if (IsUnicode) return ImmGetCompositionFontW (hIMC, (LOGFONTW)lplf);
-	return ImmGetCompositionFontA (hIMC, (LOGFONTA)lplf);
-}
-
-public static final boolean ImmSetCompositionFont (long /*int*/ hIMC, LOGFONT lplf) {
-	if (IsUnicode) return ImmSetCompositionFontW (hIMC, (LOGFONTW)lplf);
-	return ImmSetCompositionFontA (hIMC, (LOGFONTA)lplf);
-}
-
-public static final int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen) {
-	if (IsUnicode) {
-		return ImmGetCompositionStringW (hIMC, dwIndex, lpBuf, dwBufLen);
-	}
-	return ImmGetCompositionStringA (hIMC, dwIndex, lpBuf, dwBufLen);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return GlobalAddAtom (lpString1);
 }
 
 public static final long /*int*/ ImmEscape (long /*int*/ hKL,long /*int*/ hIMC, int uEscape, TCHAR lpData) {
-	if (IsUnicode) {
-		char [] lpData1 = lpData == null ? null : lpData.chars;
-		return ImmEscapeW (hKL, hIMC, uEscape, lpData1);
-	}
-	byte [] lpData1 = lpData == null ? null : lpData.bytes;
-	return ImmEscapeA (hKL, hIMC, uEscape, lpData1);
-}
-
-public static final int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, int [] lpBuf, int dwBufLen) {
-	if (IsUnicode) {
-		return ImmGetCompositionStringW (hIMC, dwIndex, lpBuf, dwBufLen);
-	}
-	return ImmGetCompositionStringA (hIMC, dwIndex, lpBuf, dwBufLen);
+	char [] lpData1 = lpData == null ? null : lpData.chars;
+	return ImmEscape (hKL, hIMC, uEscape, lpData1);
 }
 
 public static final int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, TCHAR lpBuf, int dwBufLen) {
-	if (IsUnicode) {
-		char [] lpBuf1 = lpBuf == null ? null : lpBuf.chars;
-		return ImmGetCompositionStringW (hIMC, dwIndex, lpBuf1, dwBufLen);
-	}
-	byte [] lpBuf1 = lpBuf == null ? null : lpBuf.bytes;
-	return ImmGetCompositionStringA (hIMC, dwIndex, lpBuf1, dwBufLen);
+	char [] lpBuf1 = lpBuf == null ? null : lpBuf.chars;
+	return ImmGetCompositionString (hIMC, dwIndex, lpBuf1, dwBufLen);
 }
 
 public static final boolean InternetGetCookie (TCHAR lpszUrl, TCHAR lpszCookieName, TCHAR lpszCookieData, int[] lpdwSize) {
-	if (IsUnicode) {
-		char [] url = lpszUrl == null ? null : lpszUrl.chars;
-		char [] cookieName = lpszCookieName == null ? null : lpszCookieName.chars;
-		char [] cookieData = lpszCookieData == null ? null : lpszCookieData.chars;
-		return InternetGetCookieW (url, cookieName, cookieData, lpdwSize);
-	}
-	byte [] url = lpszUrl == null ? null : lpszUrl.bytes;
-	byte [] cookieName = lpszCookieName == null ? null : lpszCookieName.bytes;
-	byte [] cookieData = lpszCookieData == null ? null : lpszCookieData.bytes;
-	return InternetGetCookieA (url, cookieName, cookieData, lpdwSize);
+	char [] url = lpszUrl == null ? null : lpszUrl.chars;
+	char [] cookieName = lpszCookieName == null ? null : lpszCookieName.chars;
+	char [] cookieData = lpszCookieData == null ? null : lpszCookieData.chars;
+	return InternetGetCookie (url, cookieName, cookieData, lpdwSize);
 }
 
 public static final boolean InternetSetCookie (TCHAR lpszUrl, TCHAR lpszCookieName, TCHAR lpszCookieData) {
-	if (IsUnicode) {
-		char [] url = lpszUrl == null ? null : lpszUrl.chars;
-		char [] cookieName = lpszCookieName == null ? null : lpszCookieName.chars;
-		char [] cookieData = lpszCookieData == null ? null : lpszCookieData.chars;
-		return InternetSetCookieW (url, cookieName, cookieData);
-	}
-	byte [] url = lpszUrl == null ? null : lpszUrl.bytes;
-	byte [] cookieName = lpszCookieName == null ? null : lpszCookieName.bytes;
-	byte [] cookieData = lpszCookieData == null ? null : lpszCookieData.bytes;
-	return InternetSetCookieA (url, cookieName, cookieData);
-}
-
-public static final boolean InsertMenuItem (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
-	if (IsUnicode) return InsertMenuItemW (hMenu, uItem, fByPosition, lpmii);
-	return InsertMenuItemA (hMenu, uItem, fByPosition, lpmii);
-}
-
-public static final long /*int*/ LoadBitmap (long /*int*/ hInstance, long /*int*/ lpBitmapName) {
-	if (IsUnicode) return LoadBitmapW (hInstance, lpBitmapName);
-	return LoadBitmapA (hInstance, lpBitmapName);
-}
-
-public static final long /*int*/ LoadCursor (long /*int*/ hInstance, long /*int*/ lpCursorName) {
-	if (IsUnicode) return LoadCursorW (hInstance, lpCursorName);
-	return LoadCursorA (hInstance, lpCursorName);
-}
-
-public static final long /*int*/ LoadIcon (long /*int*/ hInstance, long /*int*/ lpIconName) {
-	if (IsUnicode) return LoadIconW (hInstance, lpIconName);
-	return LoadIconA (hInstance, lpIconName);
-}
-
-public static final long /*int*/ LoadImage (long /*int*/ hinst, long /*int*/ 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 MapVirtualKey (int uCode, int uMapType) {
-	if (IsUnicode) return MapVirtualKeyW (uCode, uMapType);
-	return MapVirtualKeyA (uCode, uMapType);
+	char [] url = lpszUrl == null ? null : lpszUrl.chars;
+	char [] cookieName = lpszCookieName == null ? null : lpszCookieName.chars;
+	char [] cookieData = lpszCookieData == null ? null : lpszCookieData.chars;
+	return InternetSetCookie (url, cookieName, cookieData);
 }
 
 public static final int MessageBox (long /*int*/ hWnd, TCHAR lpText, TCHAR lpCaption, int uType) {
-	if (IsUnicode) {
-		char [] lpText1 = lpText == null ? null : lpText.chars;
-		char [] lpCaption1 = lpCaption == null ? null : lpCaption.chars;
-		return MessageBoxW (hWnd, lpText1, lpCaption1, uType);
-	}
-	byte [] lpText1 = lpText == null ? null : lpText.bytes;
-	byte [] lpCaption1 = lpCaption == null ? null : lpCaption.bytes;
-	return MessageBoxA (hWnd, lpText1, lpCaption1, uType);
+	char [] lpText1 = lpText == null ? null : lpText.chars;
+	char [] lpCaption1 = lpCaption == null ? null : lpCaption.chars;
+	return MessageBox (hWnd, lpText1, lpCaption1, uType);
 }
 
 public static final void MoveMemory (long /*int*/ Destination, TCHAR Source, int Length) {
-	if (IsUnicode) {
-		char [] Source1 = Source == null ? null : Source.chars;
-		MoveMemory (Destination, Source1, Length);
-	} else {
-		byte [] Source1 = Source == null ? null : Source.bytes;
-		MoveMemory (Destination, Source1, Length);
-	}
+	char [] Source1 = Source == null ? null : Source.chars;
+	MoveMemory (Destination, Source1, Length);
 }
 
 public static final void MoveMemory (TCHAR Destination, long /*int*/ Source, int Length) {
-	if (IsUnicode) {
-		char [] Destination1 = Destination == null ? null : Destination.chars;
-		MoveMemory (Destination1, Source, Length);
-	} else {
-		byte [] Destination1 = Destination == null ? null : Destination.bytes;
-		MoveMemory (Destination1, Source, Length);
-	}
-}
-
-public static final void MoveMemory (long /*int*/ Destination, DEVMODE Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory (Destination, (DEVMODEW)Source, Length);
-	} else {
-		MoveMemory (Destination, (DEVMODEA)Source, Length);
-	}
-}
-
-public static final void MoveMemory (DEVMODE Destination, long /*int*/ Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory ((DEVMODEW)Destination, Source, Length);
-	} else {
-		MoveMemory ((DEVMODEA)Destination, Source, Length);
-	}
-}
-
-public static final void MoveMemory (long /*int*/ Destination, LOGFONT Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory (Destination, (LOGFONTW)Source, Length);
-	} else {
-		MoveMemory (Destination, (LOGFONTA)Source, Length);
-	}
-}
-
-public static final void MoveMemory (LOGFONT Destination, long /*int*/ Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory ((LOGFONTW)Destination, Source, Length);
-	} else {
-		MoveMemory ((LOGFONTA)Destination, Source, Length);
-	}
-}
-
-public static final void MoveMemory (long /*int*/ Destination, NMTTDISPINFO Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory (Destination, (NMTTDISPINFOW)Source, Length);
-	} else {
-		MoveMemory (Destination, (NMTTDISPINFOA)Source, Length);
-	}
-}
-
-public static final void MoveMemory (NMTTDISPINFO Destination, long /*int*/ Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory ((NMTTDISPINFOW)Destination, Source, Length);
-	} else {
-		MoveMemory ((NMTTDISPINFOA)Destination, Source, Length);
-	}
-}
-
-public static final void MoveMemory (TEXTMETRIC Destination, long /*int*/ Source, int Length) {
-	if (IsUnicode) {
-		MoveMemory ((TEXTMETRICW)Destination, Source, Length);
-	} else {
-		MoveMemory ((TEXTMETRICA)Destination, Source, Length);
-	}
+	char [] Destination1 = Destination == null ? null : Destination.chars;
+	MoveMemory (Destination1, Source, Length);
 }
 
 public static final boolean OpenPrinter (TCHAR pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault) {
-	if (IsUnicode) {
-		char [] pPrinterName1 = pPrinterName == null ? null : pPrinterName.chars;
-		return OpenPrinterW (pPrinterName1, phPrinter, pDefault);
-	}
-	byte [] pPrinterName1 = pPrinterName == null ? null : pPrinterName.bytes;
-	return OpenPrinterA (pPrinterName1, phPrinter, pDefault);
-}
-
-public static final boolean PeekMessage (MSG lpMsg, long /*int*/ 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 (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return PostMessageW (hWnd, Msg, wParam, lParam);
-	return PostMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final boolean PostThreadMessage (int idThread, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return PostThreadMessageW (idThread, Msg, wParam, lParam);
-	return PostThreadMessageA (idThread, Msg, wParam, lParam);
-}
-
-public static final boolean PrintDlg (PRINTDLG lppd) {
-	if (IsUnicode) return PrintDlgW (lppd);
-	return PrintDlgA (lppd);
+	char [] pPrinterName1 = pPrinterName == null ? null : pPrinterName.chars;
+	return OpenPrinter (pPrinterName1, phPrinter, pDefault);
 }
 
 public static final int RegCreateKeyEx (long /*int*/ hKey, TCHAR lpSubKey, int Reserved, TCHAR lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition) {
-	if (IsUnicode) {
-		char [] lpClass1 = lpClass == null ? null : lpClass.chars;
-		char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars;
-		return RegCreateKeyExW (hKey, lpSubKey1, Reserved, lpClass1, dwOptions, samDesired, lpSecurityAttributes, phkResult, lpdwDisposition);
-	}
-	byte [] lpClass1 = lpClass == null ? null : lpClass.bytes;
-	byte [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.bytes;
-	return RegCreateKeyExA (hKey, lpSubKey1, Reserved, lpClass1, dwOptions, samDesired, lpSecurityAttributes, phkResult, lpdwDisposition);
+	char [] lpClass1 = lpClass == null ? null : lpClass.chars;
+	char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars;
+	return RegCreateKeyEx (hKey, lpSubKey1, Reserved, lpClass1, dwOptions, samDesired, lpSecurityAttributes, phkResult, lpdwDisposition);
 }
 
 public static final int RegDeleteValue (long /*int*/ hKey, TCHAR lpValueName) {
-	if (IsUnicode) {
-		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
-		return RegDeleteValueW (hKey, lpValueName1);
-	}
-	byte [] lpValueName1 = lpValueName == null ? null : lpValueName.bytes;
-	return RegDeleteValueA (hKey, lpValueName1);
+	char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
+	return RegDeleteValue (hKey, lpValueName1);
 }
 
 public static final int RegEnumKeyEx (long /*int*/ 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;
-		return RegEnumKeyExW (hKey, dwIndex, lpName1, lpcName, lpReserved, lpClass1, lpcClass, lpftLastWriteTime);
-	}
-	byte [] lpName1 = lpName == null ? null : lpName.bytes;
-	byte [] lpClass1 = lpClass == null ? null : lpClass.bytes;
-	return RegEnumKeyExA (hKey, dwIndex, lpName1, lpcName, lpReserved, lpClass1, lpcClass, lpftLastWriteTime);
+	char [] lpName1 = lpName == null ? null : lpName.chars;
+	char [] lpClass1 = lpClass == null ? null : lpClass.chars;
+	return RegEnumKeyEx (hKey, dwIndex, lpName1, lpcName, lpReserved, lpClass1, lpcClass, lpftLastWriteTime);
 }
 
 public static final int RegisterClass (TCHAR lpszClassName, WNDCLASS lpWndClass) {
@@ -2862,13 +2314,7 @@ public static final int RegisterClass (TCHAR lpszClassName, WNDCLASS lpWndClass)
 	lpWndClass.lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
 	OS.MoveMemory (lpWndClass.lpszClassName, lpszClassName, byteCount);
 
-	int result;
-	if (IsUnicode) {
-		result = RegisterClassW (lpWndClass);
-	}
-	else {
-		result = RegisterClassA (lpWndClass);
-	}
+	int result = RegisterClass (lpWndClass);
 
 	/* Release and forget native string */
 	OS.HeapFree (hHeap, 0, lpWndClass.lpszClassName);
@@ -2878,369 +2324,65 @@ public static final int RegisterClass (TCHAR lpszClassName, WNDCLASS lpWndClass)
 }
 
 public static final int RegisterClipboardFormat (TCHAR lpszFormat) {
-	if (IsUnicode) {
-		char [] lpszFormat1 = lpszFormat == null ? null : lpszFormat.chars;
-		return RegisterClipboardFormatW (lpszFormat1);
-	}
-	byte [] lpszFormat1 = lpszFormat == null ? null : lpszFormat.bytes;
-	return RegisterClipboardFormatA (lpszFormat1);
+	char [] lpszFormat1 = lpszFormat == null ? null : lpszFormat.chars;
+	return RegisterClipboardFormat (lpszFormat1);
 }
 
 public static final int RegisterWindowMessage (TCHAR lpString) {
-	if (IsUnicode) {
-		char [] lpString1 = lpString == null ? null : lpString.chars;
-		return RegisterWindowMessageW (lpString1);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return RegisterWindowMessageA (lpString1);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return RegisterWindowMessage (lpString1);
 }
 
 public static final int RegOpenKeyEx (long /*int*/ hKey, TCHAR lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult) {
-	if (IsUnicode) {
-		char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars;
-		return RegOpenKeyExW (hKey, lpSubKey1, ulOptions, samDesired, phkResult);
-	}
-	byte [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.bytes;
-	return RegOpenKeyExA (hKey, lpSubKey1, ulOptions, samDesired, phkResult);
+	char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars;
+	return RegOpenKeyEx (hKey, lpSubKey1, ulOptions, samDesired, phkResult);
 }
 
 public static final int RegQueryValueEx (long /*int*/ hKey, TCHAR lpValueName, long /*int*/ lpReserved, int[] lpType, TCHAR lpData, int[] lpcbData) {
-	if (IsUnicode) {
-		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
-		char [] lpData1 = lpData == null ? null : lpData.chars;
-		return RegQueryValueExW (hKey, lpValueName1, lpReserved, lpType, lpData1, lpcbData);
-	}
-	byte [] lpValueName1 = lpValueName == null ? null : lpValueName.bytes;
-	byte [] lpData1 = lpData == null ? null : lpData.bytes;
-	return RegQueryValueExA (hKey, lpValueName1, lpReserved, lpType, lpData1, lpcbData);
+	char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
+	char [] lpData1 = lpData == null ? null : lpData.chars;
+	return RegQueryValueEx (hKey, lpValueName1, lpReserved, lpType, lpData1, lpcbData);
 }
 
 public static final int RegQueryValueEx (long /*int*/ hKey, TCHAR lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData) {
-	if (IsUnicode) {
-		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
-		return RegQueryValueExW (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData);
-	}
-	byte [] lpValueName1 = lpValueName == null ? null : lpValueName.bytes;
-	return RegQueryValueExA (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData);
+	char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
+	return RegQueryValueEx (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData);
 }
 
 public static final int RegSetValueEx (long /*int*/ hKey, TCHAR lpValueName, int Reserved, int dwType, int[] lpData, int cbData) {
-	if (IsUnicode) {
-		char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
-		return RegSetValueExW (hKey, lpValueName1, Reserved, dwType, lpData, cbData);
-	}
-	byte [] lpValueName1 = lpValueName == null ? null : lpValueName.bytes;
-	return RegSetValueExA (hKey, lpValueName1, Reserved, dwType, lpData, cbData);
-}
-
-public static final long /*int*/ RemoveProp  (long /*int*/ hWnd, long /*int*/ lpString){
-	if (IsUnicode) return RemovePropW (hWnd, lpString);
-	return RemovePropA (hWnd, lpString);
+	char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars;
+	return RegSetValueEx (hKey, lpValueName1, Reserved, dwType, lpData, cbData);
 }
 
 public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHAR lParam) {
-	if (IsUnicode) {
-		char [] lParam1 = lParam == null ? null : lParam.chars;
-		return SendMessageW (hWnd, Msg, wParam, lParam1);
-	}
-	byte [] lParam1 = lParam == null ? null : lParam.bytes;
-	return SendMessageA (hWnd, Msg, wParam, lParam1);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, int [] wParam, int [] lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SIZE lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ [] wParam, long /*int*/ lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, int [] lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, char [] lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, short [] lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LITEM lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVCOLUMN lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVHITTESTINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVITEM lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVINSERTMARK lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MARGINS lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, POINT lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MCHITTESTINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, REBARBANDINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, RECT lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SYSTEMTIME lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SHDRAGIMAGE lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTON lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTONINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCITEM lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHITTESTINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TOOLINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVHITTESTINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVINSERTSTRUCT lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVITEM lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVSORTCB lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, UDACCEL lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDHITTESTINFO lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDITEM lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDLAYOUT lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, BUTTON_IMAGELIST lParam) {
-	if (IsUnicode) return SendMessageW (hWnd, Msg, wParam, lParam);
-	return SendMessageA (hWnd, Msg, wParam, lParam);
-}
-
-public static final boolean SetMenuItemInfo (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii) {
-	if (IsUnicode) return SetMenuItemInfoW (hMenu, uItem, fByPosition, lpmii);
-	return SetMenuItemInfoA (hMenu, uItem, fByPosition, lpmii);
+	char [] lParam1 = lParam == null ? null : lParam.chars;
+	return SendMessage (hWnd, Msg, wParam, lParam1);
 }
 
 public static final boolean SetDllDirectory (TCHAR lpPathName) {
-	if (IsUnicode) {
-		char [] lpPathName1 = lpPathName == null ? null : lpPathName.chars;
-		return SetDllDirectoryW (lpPathName1);
-	}
-	byte [] lpPathName1 = lpPathName == null ? null : lpPathName.bytes;
-	return SetDllDirectoryA (lpPathName1);
-}
-
-public static boolean SetProp (long /*int*/ hWnd, long /*int*/ lpString, long /*int*/ hData) {
-	if (IsUnicode) return SetPropW (hWnd, lpString, hData);
-	return SetPropA (hWnd, lpString, hData);
-}
-
-public static final int SetWindowLong (long /*int*/ hWnd, int nIndex, int dwNewLong) {
-	if (IsUnicode) return SetWindowLongW (hWnd, nIndex, dwNewLong);
-	return SetWindowLongA (hWnd, nIndex, dwNewLong);
-}
-
-public static final long /*int*/ SetWindowLongPtr (long /*int*/ hWnd, int nIndex, long /*int*/ dwNewLong) {
-	if (IsUnicode) return SetWindowLongPtrW (hWnd, nIndex, dwNewLong);
-	return SetWindowLongPtrA (hWnd, nIndex, dwNewLong);
-}
-
-public static final long /*int*/ SetWindowsHookEx (int idHook, long /*int*/ lpfn, long /*int*/ hMod, int dwThreadId) {
-	if (IsUnicode) return SetWindowsHookExW (idHook, lpfn, hMod, dwThreadId);
-	return SetWindowsHookExA (idHook, lpfn, hMod, dwThreadId);
+	char [] lpPathName1 = lpPathName == null ? null : lpPathName.chars;
+	return SetDllDirectory (lpPathName1);
 }
 
 public static final boolean SetWindowText (long /*int*/ hWnd, TCHAR lpString) {
-	if (IsUnicode) {
-		char [] lpString1 = lpString == null ? null : lpString.chars;
-		return SetWindowTextW (hWnd, lpString1);
-	}
-	byte [] lpString1 = lpString == null ? null : lpString.bytes;
-	return SetWindowTextA (hWnd, lpString1);
-}
-
-public static final long /*int*/ SHBrowseForFolder (BROWSEINFO lpbi) {
-	if (IsUnicode) return SHBrowseForFolderW (lpbi);
-	return SHBrowseForFolderA (lpbi);
-}
-
-public static final boolean ShellExecuteEx (SHELLEXECUTEINFO lpExecInfo) {
-	if (IsUnicode) return ShellExecuteExW (lpExecInfo);
-	return ShellExecuteExA (lpExecInfo);
-}
-
-public static long /*int*/ 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);
-	}
-	byte [] pszPath1 = pszPath == null ? null : pszPath.bytes;
-	return SHGetFileInfoA (pszPath1, dwFileAttributes, (SHFILEINFOA) psfi, cbFileInfo, uFlags);
-}
-
-public static final boolean Shell_NotifyIcon (int dwMessage, NOTIFYICONDATA lpData) {
-	if (IsUnicode) return Shell_NotifyIconW (dwMessage, (NOTIFYICONDATAW)lpData);
-	return Shell_NotifyIconA (dwMessage, (NOTIFYICONDATAA)lpData);
+	char [] lpString1 = lpString == null ? null : lpString.chars;
+	return SetWindowText (hWnd, lpString1);
 }
 
 public static final boolean SHGetPathFromIDList (long /*int*/ pidl, TCHAR pszPath) {
-	if (IsUnicode) {
-		char [] pszPath1 = pszPath == null ? null : pszPath.chars;
-		return SHGetPathFromIDListW (pidl, pszPath1);
-	}
-	byte [] pszPath1 = pszPath == null ? null : pszPath.bytes;
-	return SHGetPathFromIDListA (pidl, pszPath1);
-}
-
-public static final int StartDoc (long /*int*/ hdc, DOCINFO lpdi) {
-	if (IsUnicode) return StartDocW (hdc, lpdi);
-	return StartDocA (hdc, lpdi);
-}
-
-public static final boolean SystemParametersInfo (int uiAction, int uiParam, RECT pvParam, int fWinIni) {
-	if (IsUnicode) return SystemParametersInfoW (uiAction, uiParam, pvParam, fWinIni);
-	return SystemParametersInfoA (uiAction, uiParam, pvParam, fWinIni);
-}
-
-public static final boolean SystemParametersInfo (int uiAction, int uiParam, HIGHCONTRAST pvParam, int fWinIni) {
-	if (IsUnicode) return SystemParametersInfoW (uiAction, uiParam, pvParam, fWinIni);
-	return SystemParametersInfoA (uiAction, uiParam, pvParam, fWinIni);
-}
-
-public static final boolean SystemParametersInfo (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni) {
-	if (IsUnicode) return SystemParametersInfoW (uiAction, uiParam, (NONCLIENTMETRICSW)pvParam, fWinIni);
-	return SystemParametersInfoA (uiAction, uiParam, (NONCLIENTMETRICSA)pvParam, 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 (long /*int*/ hWnd, long /*int*/ hAccTable, MSG lpMsg) {
-	if (IsUnicode) return TranslateAcceleratorW (hWnd, hAccTable, lpMsg);
-	return TranslateAcceleratorA (hWnd, hAccTable, lpMsg);
+	char [] pszPath1 = pszPath == null ? null : pszPath.chars;
+	return SHGetPathFromIDList (pidl, pszPath1);
 }
 
 public static final boolean UnregisterClass (TCHAR lpClassName, long /*int*/ hInstance) {
-	if (IsUnicode) {
-		char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
-		return UnregisterClassW (lpClassName1, hInstance);
-	}
-	byte [] lpClassName1 = lpClassName == null ? null : lpClassName.bytes;
-	return UnregisterClassA (lpClassName1, hInstance);
+	char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
+	return UnregisterClass (lpClassName1, hInstance);
 }
 
 public static final int UrlCreateFromPath (TCHAR pszPath, TCHAR pszURL, int[] pcchUrl, int flags) {
-	if (IsUnicode) {
-		char [] path = pszPath == null ? null : pszPath.chars;
-		char [] url = pszURL == null ? null : pszURL.chars;
-		return UrlCreateFromPathW (path, url, pcchUrl, flags);
-	}
-	byte [] path = pszPath == null ? null : pszPath.bytes;
-	byte [] url = pszURL == null ? null : pszURL.bytes;
-	return UrlCreateFromPathA (path, url, pcchUrl, flags);
-}
-
-public static final short VkKeyScan (short ch) {
-	if (IsUnicode) return VkKeyScanW (ch);
-	return VkKeyScanA (ch);
+	char [] path = pszPath == null ? null : pszPath.chars;
+	char [] url = pszURL == null ? null : pszURL.chars;
+	return UrlCreateFromPath (path, url, pcchUrl, flags);
 }
 
 /** Natives */
@@ -3248,32 +2390,26 @@ public static final short VkKeyScan (short ch) {
 /** @param hdc cast=(HDC) */
 public static final native int AbortDoc (long /*int*/ hdc);
 /**
- * @method flags=dynamic
+ * @param hActCtx cast=(HANDLE)
  * @param lpCookie cast=(ULONG_PTR*)
  */
 public static final native boolean ActivateActCtx (long /*int*/ hActCtx, long /*int*/ [] lpCookie);
 /** @param hkl cast=(HKL) */
 public static final native long /*int*/ ActivateKeyboardLayout(long /*int*/ hkl, int Flags);
-/** @method flags=dynamic */
-public static final native int AddFontResourceExW(char[] lpszFilename, int fl, long /*int*/ pdv);
-/** @method flags=dynamic */
-public static final native int AddFontResourceExA(byte[] lpszFilename, int fl, long /*int*/ pdv);
+/** @param pdv cast=(PVOID) */
+public static final native int AddFontResourceEx(char[] lpszFilename, int fl, long /*int*/ pdv);
 public static final native boolean AdjustWindowRectEx (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle);
-/** @method flags=dynamic */
 public static final native boolean AllowSetForegroundWindow (int dwProcessId);
 /**
- * @method flags=dynamic
+ * @param hdcDest cast=(HDC)
+ * @param hdcSrc cast=(HDC)
  * @param blendFunction flags=struct
  */
 public static final native boolean AlphaBlend(long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
 /** @param hdc cast=(HDC) */
 public static final native boolean Arc (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
-/** @method flags=dynamic */
-public static final native int AssocQueryStringA(int flags, int str, byte[] pszAssoc, byte[] pszExtra, byte[] pszOut, int[] pcchOut);
-/** @method flags=dynamic */
-public static final native int AssocQueryStringW(int flags, int str, char[] pszAssoc, char[] pszExtra, char[] pszOut, int[] pcchOut);
+public static final native int AssocQueryString (int flags, int str, char[] pszAssoc, char[] pszExtra, char[] pszOut, int[] pcchOut);
 /**
- * @method flags=dynamic
  * @param hdcTarget cast=(HDC)
  * @param phdc cast=(HDC*)
  */
@@ -3290,9 +2426,7 @@ public static final native boolean BeginPath(long /*int*/ hdc);
 public static final native boolean BitBlt (long /*int*/ hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, long /*int*/ hdcSrc, int nXSrc, int nYSrc, int dwRop);
 /** @param hWnd cast=(HWND) */
 public static final native boolean BringWindowToTop (long /*int*/ hWnd);
-/** @method flags=dynamic */
 public static final native int BufferedPaintInit ();
-/** @method flags=dynamic */
 public static final native int BufferedPaintUnInit ();
 /**
  * @param hhk cast=(HHOOK)
@@ -3304,36 +2438,20 @@ public static final native long /*int*/ CallNextHookEx(long /*int*/ hhk, int nCo
  * @param lpPrevWndFunc cast=(WNDPROC)
  * @param hWnd cast=(HWND)
  */
-public static final native long /*int*/ CallWindowProcW (long /*int*/ lpPrevWndFunc, long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param lpPrevWndFunc cast=(WNDPROC)
- * @param hWnd cast=(HWND)
- */
-public static final native long /*int*/ CallWindowProcA (long /*int*/ lpPrevWndFunc, long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native long /*int*/ CallWindowProc (long /*int*/ lpPrevWndFunc, long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /**
  * @param pName cast=(PCERT_NAME_BLOB)
  * @param psz cast=(LPWSTR)
  */
-public static final native int CertNameToStrW(int dwCertEncodingType, CERT_NAME_BLOB pName, int dwStrType, char[] psz, int csz);
-/**
- * @param pName cast=(PCERT_NAME_BLOB)
- * @param psz cast=(LPSTR)
- */
-public static final native int CertNameToStrA(int dwCertEncodingType, CERT_NAME_BLOB pName, int dwStrType, byte[] psz, int csz);
+public static final native int CertNameToStr (int dwCertEncodingType, CERT_NAME_BLOB pName, int dwStrType, char[] psz, int csz);
 /** @param ch cast=(LPWSTR) */
-public static final native long /*int*/ CharLowerW (long /*int*/ ch);
-/** @param ch cast=(LPSTR) */
-public static final native long /*int*/ CharLowerA (long /*int*/ ch);
+public static final native long /*int*/ CharLower (long /*int*/ ch);
 /** @param ch cast=(LPWSTR) */
-public static final native long /*int*/ CharUpperW (long /*int*/ ch);
-/** @param ch cast=(LPSTR) */
-public static final native long /*int*/ CharUpperA (long /*int*/ ch);
+public static final native long /*int*/ CharUpper (long /*int*/ ch);
 /** @param lpcc cast=(LPCHOOSECOLORW) */
-public static final native boolean ChooseColorW (CHOOSECOLOR lpcc);
-public static final native boolean ChooseColorA (CHOOSECOLOR lpcc);
+public static final native boolean ChooseColor (CHOOSECOLOR lpcc);
 /** @param chooseFont cast=(LPCHOOSEFONTW) */
-public static final native boolean ChooseFontW (CHOOSEFONT chooseFont);
-public static final native boolean ChooseFontA (CHOOSEFONT chooseFont);
+public static final native boolean ChooseFont (CHOOSEFONT chooseFont);
 /** @param hWnd cast=(HWND) */
 public static final native boolean ClientToScreen (long /*int*/ hWnd, POINT lpPoint);
 public static final native boolean CloseClipboard ();
@@ -3348,10 +2466,7 @@ public static final native long /*int*/ CloseGestureInfoHandle (long /*int*/ hGe
 public static final native boolean CloseHandle (long /*int*/ hObject);
 /** @param hPrinter cast=(HANDLE) */
 public static final native boolean ClosePrinter (long /*int*/ hPrinter);
-/**
- * @method flags=dynamic
- * @param hTheme cast=(HTHEME)
- */
+/** @param hTheme cast=(HTHEME) */
 public static final native int CloseThemeData (long /*int*/ hTheme);
 /**
  * @method flags=dynamic
@@ -3365,12 +2480,8 @@ public static final native boolean CloseTouchInputHandle(long /*int*/ hTouchInpu
  * @param ppv cast=(LPVOID *)
  */
 public static final native int CoCreateInstance (byte[] rclsid, long /*int*/ pUnkOuter, int dwClsContext, byte[] riid, long /*int*/[] ppv);
-/** @method flags=dynamic */
 public static final native int CoInternetIsFeatureEnabled (int FeatureEntry, int dwFlags);
-/**
- * @method flags=dynamic
- * @param fEnable cast=(BOOL)
- */
+/** @param fEnable cast=(BOOL) */
 public static final native int CoInternetSetFeatureEnabled (int FeatureEntry, int dwFlags, boolean fEnable);
 /**
  * @param hrgnDest cast=(HRGN)
@@ -3386,19 +2497,9 @@ public static final native long /*int*/ CoTaskMemAlloc(int cb);
 /** @param pv cast=(LPVOID) */
 public static final native void CoTaskMemFree(long /*int*/ pv);
 /** @param lpaccl cast=(LPACCEL) */
-public static final native long /*int*/ CreateAcceleratorTableW (byte [] lpaccl, int cEntries);
-/** @param lpaccl cast=(LPACCEL) */
-public static final native long /*int*/ CreateAcceleratorTableA (byte [] lpaccl, int cEntries);
-/**
- * @method flags=dynamic
- * @param pActCtx flags=no_out
- */
-public static final native long /*int*/ CreateActCtxW (ACTCTX pActCtx);
-/**
- * @method flags=dynamic
- * @param pActCtx flags=no_out
- */
-public static final native long /*int*/ CreateActCtxA (ACTCTX pActCtx);
+public static final native long /*int*/ CreateAcceleratorTable (byte [] lpaccl, int cEntries);
+/** @param pActCtx flags=no_out */
+public static final native long /*int*/ CreateActCtx (ACTCTX pActCtx);
 /** @param lpvBits cast=(CONST VOID *),flags=no_out critical */
 public static final native long /*int*/ CreateBitmap (int nWidth, int nHeight, int cPlanes, int cBitsPerPel, byte [] lpvBits);
 /**
@@ -3422,14 +2523,7 @@ public static final native long /*int*/ CreateCursor (long /*int*/ hInst, int xH
  * @param lpszOutput cast=(LPWSTR)
  * @param lpInitData cast=(CONST DEVMODEW *)
  */
-public static final native long /*int*/ CreateDCW (char [] lpszDriver, char [] lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData);
-/**
- * @param lpszDriver cast=(LPSTR)
- * @param lpszDevice cast=(LPSTR)
- * @param lpszOutput cast=(LPSTR)
- * @param lpInitData cast=(CONST DEVMODE *)
- */
-public static final native long /*int*/ CreateDCA (byte [] lpszDriver, byte [] lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData);
+public static final native long /*int*/ CreateDC (char [] lpszDriver, char [] lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData);
 /**
  * @param hdc cast=(HDC)
  * @param pbmi cast=(BITMAPINFO *),flags=no_out critical
@@ -3449,21 +2543,11 @@ public static final native long /*int*/ CreateDIBSection(long /*int*/ hdc, long
  * @param lpFilename cast=(LPCWSTR)
  * @param lpDescription cast=(LPCWSTR)
  */
-public static final native long /*int*/ CreateEnhMetaFileW(long /*int*/ hdcRef, char[] lpFilename, RECT lpRect, char[] lpDescription);
-/**
- * @param hdcRef cast=(HDC)
- * @param lpFilename cast=(LPCSTR)
- * @param lpDescription cast=(LPCSTR)
- */
-public static final native long /*int*/ CreateEnhMetaFileA(long /*int*/ hdcRef, byte[] lpFilename, RECT lpRect, byte[] lpDescription);
+public static final native long /*int*/ CreateEnhMetaFile (long /*int*/ hdcRef, char[] lpFilename, RECT lpRect, char[] lpDescription);
 /** @param lplf cast=(LPLOGFONTW) */
-public static final native long /*int*/ CreateFontIndirectW (long /*int*/ lplf);
-/** @param lplf cast=(LPLOGFONTA) */
-public static final native long /*int*/ CreateFontIndirectA (long /*int*/ lplf);
-/** @param lplf flags=no_out */
-public static final native long /*int*/ CreateFontIndirectW (LOGFONTW lplf);
+public static final native long /*int*/ CreateFontIndirect (long /*int*/ lplf);
 /** @param lplf flags=no_out */
-public static final native long /*int*/ CreateFontIndirectA (LOGFONTA lplf);
+public static final native long /*int*/ CreateFontIndirect (LOGFONT lplf);
 /** @param lplf flags=no_out */
 public static final native long /*int*/ CreateIconIndirect (ICONINFO lplf);
 public static final native long /*int*/ CreateMenu ();
@@ -3486,18 +2570,7 @@ public static final native long /*int*/ CreatePopupMenu ();
  * @param lpStartupInfo cast=(LPSTARTUPINFOW)
  * @param lpProcessInformation cast=(LPPROCESS_INFORMATION)
  */
-public static final native boolean CreateProcessW (long /*int*/ lpApplicationName, long /*int*/ lpCommandLine, long /*int*/ lpProcessAttributes, long /*int*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long /*int*/ lpEnvironment, long /*int*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
-/**
- * @param lpApplicationName cast=(LPCSTR)
- * @param lpCommandLine cast=(LPSTR)
- * @param lpProcessAttributes cast=(LPSECURITY_ATTRIBUTES)
- * @param lpThreadAttributes cast=(LPSECURITY_ATTRIBUTES)
- * @param lpEnvironment cast=(LPVOID)
- * @param lpCurrentDirectory cast=(LPSTR)
- * @param lpStartupInfo cast=(LPSTARTUPINFOA)
- * @param lpProcessInformation cast=(LPPROCESS_INFORMATION)
- */
-public static final native boolean CreateProcessA (long /*int*/ lpApplicationName, long /*int*/ lpCommandLine, long /*int*/ lpProcessAttributes, long /*int*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long /*int*/ lpEnvironment, long /*int*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
+public static final native boolean CreateProcess (long /*int*/ lpApplicationName, long /*int*/ lpCommandLine, long /*int*/ lpProcessAttributes, long /*int*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long /*int*/ lpEnvironment, long /*int*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation);
 public static final native long /*int*/ CreateRectRgn (int left, int top, int right, int bottom);
 /** @param colorRef cast=(COLORREF) */
 public static final native long /*int*/ CreateSolidBrush (int colorRef);
@@ -3514,14 +2587,7 @@ public static final native int CreateStreamOnHGlobal(long /*int*/ hGlobal, boole
  * @param hMenu cast=(HMENU)
  * @param hInstance cast=(HINSTANCE)
  */
-public static final native long /*int*/ CreateWindowExW (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam);
-/**
- * @param lpClassName cast=(LPSTR)
- * @param hWndParent cast=(HWND)
- * @param hMenu cast=(HMENU)
- * @param hInstance cast=(HINSTANCE)
- */
-public static final native long /*int*/ CreateWindowExA (int dwExStyle, byte [] lpClassName, byte [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam);
+public static final native long /*int*/ CreateWindowEx (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam);
 /**
  * @param hWinPosInfo cast=(HDWP)
  * @param hWnd cast=(HWND)
@@ -3533,39 +2599,20 @@ public static final native long /*int*/ DeferWindowPos (long /*int*/ hWinPosInfo
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ DefMDIChildProcW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ DefMDIChildProcA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param hWndMDIClient cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ DefFrameProcW (long /*int*/ hWnd, long /*int*/ hWndMDIClient, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native long /*int*/ DefMDIChildProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param hWndMDIClient cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ DefFrameProcA (long /*int*/ hWnd, long /*int*/ hWndMDIClient, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native long /*int*/ DefFrameProc (long /*int*/ hWnd, long /*int*/ hWndMDIClient, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ DefWindowProcW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ DefWindowProcA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native long /*int*/ DefWindowProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /** @param hdc cast=(HDC) */
 public static final native boolean DeleteDC (long /*int*/ hdc);
 /** @param hemf cast=(HENHMETAFILE) */
@@ -3585,8 +2632,7 @@ public static final native boolean DestroyIcon (long /*int*/ hIcon);
 public static final native boolean DestroyMenu (long /*int*/ hMenu);
 /** @param hWnd cast=(HWND) */
 public static final native boolean DestroyWindow (long /*int*/ hWnd);
-public static final native long /*int*/ DispatchMessageW (MSG lpmsg);
-public static final native long /*int*/ DispatchMessageA (MSG lpmsg);
+public static final native long /*int*/ DispatchMessage (MSG lpmsg);
 /**
  * @param hWnd cast=(HWND)
  * @param hPrinter cast=(HANDLE)
@@ -3594,15 +2640,7 @@ public static final native long /*int*/ DispatchMessageA (MSG lpmsg);
  * @param pDevModeOutput cast=(PDEVMODEW)
  * @param pDevModeInput cast=(PDEVMODEW)
  */
-public static final native int DocumentPropertiesW (long /*int*/ hWnd, long /*int*/ hPrinter, char[] pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode);
-/**
- * @param hWnd cast=(HWND)
- * @param hPrinter cast=(HANDLE)
- * @param pDeviceName cast=(LPTSTR)
- * @param pDevModeOutput cast=(PDEVMODE)
- * @param pDevModeInput cast=(PDEVMODE)
- */
-public static final native int DocumentPropertiesA (long /*int*/ hWnd, long /*int*/ hPrinter, byte[] pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode);
+public static final native int DocumentProperties (long /*int*/ hWnd, long /*int*/ hPrinter, char[] pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode);
 /**
  * @param hwnd cast=(HWND)
  * @param pt flags=struct
@@ -3612,14 +2650,9 @@ public static final native boolean DragDetect (long /*int*/ hwnd, POINT pt);
 public static final native void DragFinish (long /*int*/ hDrop);
 /**
  * @param hDrop cast=(HDROP)
- * @param lpszFile cast=(LPTSTR)
- */
-public static final native int DragQueryFileA (long /*int*/ hDrop, int iFile, byte[] lpszFile, int cch);
-/**
- * @param hDrop cast=(HDROP)
  * @param lpszFile cast=(LPWSTR)
  */
-public static final native int DragQueryFileW (long /*int*/ hDrop, int iFile, char[] lpszFile, int cch);
+public static final native int DragQueryFile (long /*int*/ hDrop, int iFile, char[] lpszFile, int cch);
 /** @param hdc cast=(HDC) */
 public static final native boolean DrawEdge (long /*int*/ hdc, RECT qrc, int edge, int grfFlags);
 /** @param hDC cast=(HDC) */
@@ -3638,21 +2671,18 @@ public static final native boolean DrawMenuBar (long /*int*/ hWnd);
  * @param hDC cast=(HDC)
  * @param lpString cast=(LPWSTR),flags=no_out critical
  */
-public static final native int DrawTextW (long /*int*/ hDC, char [] lpString, int nCount, RECT lpRect, int uFormat);
-/**
- * @param hDC cast=(HDC)
- * @param lpString cast=(LPSTR),flags=no_out critical
- */
-public static final native int DrawTextA (long /*int*/ hDC, byte [] lpString, int nCount, RECT lpRect, int uFormat);
+public static final native int DrawText (long /*int*/ hDC, char [] lpString, int nCount, RECT lpRect, int uFormat);
 /**
- * @method flags=dynamic
  * @param hTheme cast=(HTHEME)
  * @param hdc cast=(HDC)
  * @param pRect cast=(const RECT *)
  * @param pClipRect cast=(const RECT *)
  */
 public static final native int DrawThemeBackground (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect);
-/** @method flags=dynamic */
+/**
+ * @param hTheme cast=(HTHEME)
+ * @param hdc cast=(HDC)
+ */
 public static final native int DrawThemeText (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect);
 /** @param hdc cast=(HDC) */
 public static final native boolean Ellipse (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
@@ -3663,27 +2693,15 @@ public static final native boolean EnableScrollBar (long /*int*/ hWnd, int wSBfl
 /** @param hWnd cast=(HWND) */
 public static final native boolean EnableWindow (long /*int*/ hWnd, boolean bEnable);
 /**
- * @method flags=dynamic
  * @param pLangGroupEnumProc cast=(LANGUAGEGROUP_ENUMPROCW)
  * @param lParam cast=(LONG_PTR)
  */
-public static final native boolean EnumSystemLanguageGroupsW(long /*int*/ pLangGroupEnumProc, int dwFlags, long /*int*/ lParam);
-/**
- * @method flags=dynamic
- * @param pLangGroupEnumProc cast=(LANGUAGEGROUP_ENUMPROCA)
- * @param lParam cast=(LONG_PTR)
- */
-public static final native boolean EnumSystemLanguageGroupsA(long /*int*/ pLangGroupEnumProc, int dwFlags, long /*int*/ lParam);
+public static final native boolean EnumSystemLanguageGroups (long /*int*/ pLangGroupEnumProc, int dwFlags, long /*int*/ lParam);
 /** @param lpLocaleEnumProc cast=(LOCALE_ENUMPROCW) */
-public static final native boolean EnumSystemLocalesW (long /*int*/ lpLocaleEnumProc, int dwFlags);
-/** @param lpLocaleEnumProc cast=(LOCALE_ENUMPROCA) */
-public static final native boolean EnumSystemLocalesA (long /*int*/ lpLocaleEnumProc, int dwFlags);
+public static final native boolean EnumSystemLocales (long /*int*/ lpLocaleEnumProc, int dwFlags);
 /** @param hWinPosInfo cast=(HDWP) */
 public static final native boolean EndDeferWindowPos (long /*int*/ hWinPosInfo);
-/**
- * @method flags=dynamic
- * @param hBufferedPaint cast=(HPAINTBUFFER)
- */
+/** @param hBufferedPaint cast=(HPAINTBUFFER) */
 public static final native int EndBufferedPaint (long /*int*/ hBufferedPaint, boolean fUpdateTarget);
 /** @param hdc cast=(HDC) */
 public static final native int EndDoc (long /*int*/ hdc);
@@ -3692,7 +2710,6 @@ public static final native int EndPage (long /*int*/ hdc);
 /** @param hWnd cast=(HWND) */
 public static final native int EndPaint (long /*int*/ hWnd, PAINTSTRUCT lpPaint);
 /**
- * @method flags=dynamic
  * @param hdc cast=(HDC)
  * @param lprcClip cast=(LPCRECT)
  * @param lpfnEnum cast=(MONITORENUMPROC)
@@ -3712,14 +2729,7 @@ public static final native boolean EnumEnhMetaFile(long /*int*/ hdc, long /*int*
  * @param lpEnumFontFamProc cast=(FONTENUMPROCW)
  * @param lParam cast=(LPARAM)
  */
-public static final native int EnumFontFamiliesW (long /*int*/ hdc, char [] lpszFamily, long /*int*/ lpEnumFontFamProc, long /*int*/ lParam);
-/**
- * @param hdc cast=(HDC)
- * @param lpszFamily cast=(LPSTR)
- * @param lpEnumFontFamProc cast=(FONTENUMPROC)
- * @param lParam cast=(LPARAM)
- */
-public static final native int EnumFontFamiliesA (long /*int*/ hdc, byte [] lpszFamily, long /*int*/ lpEnumFontFamProc, long /*int*/ lParam);
+public static final native int EnumFontFamilies (long /*int*/ hdc, char [] lpszFamily, long /*int*/ lpEnumFontFamProc, long /*int*/ lParam);
 /**
  * @param lprc1 cast=(CONST RECT *),flags=no_out
  * @param lprc2 cast=(CONST RECT *),flags=no_out
@@ -3727,8 +2737,7 @@ public static final native int EnumFontFamiliesA (long /*int*/ hdc, byte [] lpsz
 public static final native boolean EqualRect (RECT lprc1, RECT lprc2);
 /** @param hdc cast=(HDC) */
 public static final native int ExcludeClipRect (long /*int*/ 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 ExpandEnvironmentStrings (char [] lpSrc, char [] lsDst, int nSize);
 /**
  * @param lplb cast=(CONST LOGBRUSH *)
  * @param lpStyle cast=(CONST DWORD *)
@@ -3745,26 +2754,13 @@ public static final native long /*int*/ ExtCreateRegion (float[] lpXform, int nC
  * @param lpString cast=(LPWSTR),flags=no_out critical
  * @param lpDx cast=(CONST INT *),flags=no_out critical
  */
-public static final native boolean ExtTextOutW (long /*int*/ hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx);
-/**
- * @param hdc cast=(HDC)
- * @param lprc flags=no_out
- * @param lpString cast=(LPSTR),flags=no_out critical
- * @param lpDx cast=(CONST INT *),flags=no_out critical
- */
-public static final native boolean ExtTextOutA (long /*int*/ hdc, int X, int Y, int fuOptions, RECT lprc, byte[] lpString, int cbCount, int[] lpDx);
+public static final native boolean ExtTextOut (long /*int*/ hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx);
 /**
  * @param lpszFile cast=(LPWSTR)
  * @param phiconLarge cast=(HICON FAR *)
  * @param phiconSmall cast=(HICON FAR *)
  */
-public static final native int ExtractIconExW (char [] lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons);
-/**
- * @param lpszFile cast=(LPSTR)
- * @param phiconLarge cast=(HICON FAR *)
- * @param phiconSmall cast=(HICON FAR *)
- */
-public static final native int ExtractIconExA (byte [] lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons);
+public static final native int ExtractIconEx (char [] lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons);
 public static final native boolean FileTimeToSystemTime (FILETIME lpFileTime, SYSTEMTIME lpSystemTime);
 /**
  * @param hDC cast=(HDC)
@@ -3774,16 +2770,10 @@ public static final native boolean FileTimeToSystemTime (FILETIME lpFileTime, SY
 public static final native int FillRect (long /*int*/ hDC, RECT lprc, long /*int*/ hbr);
 /**
  * @param lpSource cast=(LPCVOID)
- * @param lpBuffer cast=(LPSTR)
- * @param Arguments cast=(va_list*)
- */
-public static final native int FormatMessageA (int dwFlags, long /*int*/ lpSource, int dwMessageId, int dwLanguageId, long /*int*/ [] lpBuffer, int nSize, long /*int*/ Arguments);
-/**
- * @param lpSource cast=(LPCVOID)
  * @param lpBuffer cast=(LPWSTR)
  * @param Arguments cast=(va_list*)
  */
-public static final native int FormatMessageW (int dwFlags, long /*int*/ lpSource, int dwMessageId, int dwLanguageId, long /*int*/ [] lpBuffer, int nSize, long /*int*/ Arguments);
+public static final native int FormatMessage (int dwFlags, long /*int*/ lpSource, int dwMessageId, int dwLanguageId, long /*int*/ [] lpBuffer, int nSize, long /*int*/ Arguments);
 /** @param dwLimit cast=(DWORD) */
 public static final native int GdiSetBatchLimit (int dwLimit);
 public static final native int GET_WHEEL_DELTA_WPARAM(long /*int*/ wParam);
@@ -3799,54 +2789,31 @@ public static final native boolean GetCaretPos (POINT lpPoint);
  * @param hdc cast=(HDC)
  * @param lpabc cast=(LPABC),flags=no_in critical
  */
-public static final native boolean GetCharABCWidthsA (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc);
-/**
- * @param hdc cast=(HDC)
- * @param lpabc cast=(LPABC),flags=no_in critical
- */
-public static final native boolean GetCharABCWidthsW (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc);
+public static final native boolean GetCharABCWidths (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc);
 /**
  * @param hdc cast=(HDC)
  * @param lpString cast=(LPWSTR),flags=no_out critical
  * @param lpResults cast=(LPGCP_RESULTSW)
  */
-public static final native int GetCharacterPlacementW (long /*int*/ hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
-/**
- * @param hdc cast=(HDC)
- * @param lpString cast=(LPSTR),flags=no_out critical
- */
-public static final native int GetCharacterPlacementA (long /*int*/ hdc, byte[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
+public static final native int GetCharacterPlacement (long /*int*/ hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags);
 /**
  * @param hdc cast=(HDC)
  * @param lpBuffer cast=(LPINT),flags=no_in critical
  */
-public static final native boolean GetCharWidthA (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
-/**
- * @param hdc cast=(HDC)
- * @param lpBuffer cast=(LPINT),flags=no_in critical
- */
-public static final native boolean GetCharWidthW (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
+public static final native boolean GetCharWidth (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer);
 /**
  * @param hInstance cast=(HINSTANCE)
  * @param lpClassName cast=(LPWSTR)
  * @param lpWndClass cast=(LPWNDCLASSW)
  */
-public static final native boolean GetClassInfoW (long /*int*/ hInstance, char [] lpClassName, WNDCLASS lpWndClass);
-/**
- * @param hInstance cast=(HINSTANCE)
- * @param lpClassName cast=(LPSTR)
- */
-public static final native boolean GetClassInfoA (long /*int*/ hInstance, byte [] lpClassName, WNDCLASS lpWndClass);
-/** @param hWnd cast=(HWND) */
-public static final native int GetClassNameW (long /*int*/ hWnd, char [] lpClassName, int nMaxCount);
+public static final native boolean GetClassInfo (long /*int*/ hInstance, char [] lpClassName, WNDCLASS lpWndClass);
 /** @param hWnd cast=(HWND) */
-public static final native int GetClassNameA (long /*int*/ hWnd, byte [] lpClassName, int nMaxCount);
+public static final native int GetClassName (long /*int*/ hWnd, char [] lpClassName, int nMaxCount);
 /** @param hWnd cast=(HWND) */
 public static final native boolean GetClientRect (long /*int*/ hWnd, RECT lpRect);
 public static final native long /*int*/ GetClipboardData (int uFormat);
-public static final native int GetClipboardFormatNameA (int format, byte[] lpszFormatName, int cchMaxCount);
 /** @param lpszFormatName cast=(LPWSTR) */
-public static final native int GetClipboardFormatNameW (int format, char[] lpszFormatName, int cchMaxCount);
+public static final native int GetClipboardFormatName (int format, char[] lpszFormatName, int cchMaxCount);
 /** @param hdc cast=(HDC) */
 public static final native int GetClipBox (long /*int*/ hdc, RECT lprc);
 /**
@@ -3854,10 +2821,7 @@ public static final native int GetClipBox (long /*int*/ hdc, RECT lprc);
  * @param hrgn cast=(HRGN)
  */
 public static final native int GetClipRgn (long /*int*/ hdc, long /*int*/ hrgn);
-/**
- * @method flags=dynamic
- * @param hwndCombo cast=(HWND)
- */
+/** @param hwndCombo cast=(HWND) */
 public static final native boolean GetComboBoxInfo (long /*int*/ hwndCombo, COMBOBOXINFO pcbi);
 /** @param hdc cast=(HDC) */
 public static final native long /*int*/ GetCurrentObject (long /*int*/ hdc, int uObjectType);
@@ -3911,7 +2875,7 @@ public static final native int GetGraphicsMode (long /*int*/ hdc);
  * @param hdc cast=(HDC)
  * @param pgi cast=(LPWORD)
  */
-public static final native int GetGlyphIndicesW(long /*int*/ hdc, char[] lpstr, int c, short[] pgi, int fl);
+public static final native int GetGlyphIndices (long /*int*/ hdc, char[] lpstr, int c, short[] pgi, int fl);
 /**
  * @param idThread cast=(DWORD)
  * @param lpgui cast=(LPGUITHREADINFO)
@@ -3931,33 +2895,22 @@ public static final native boolean GetKeyboardState (byte [] lpKeyState);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ GetLastActivePopup (long /*int*/ hWnd);
 public static final native int GetLastError ();
-/**
- * @method flags=dynamic
- * @param hwnd cast=(HWND)
- */
+/** @param hwnd cast=(HWND) */
 public static final native boolean GetLayeredWindowAttributes (long /*int*/ hwnd, int [] pcrKey, byte [] pbAlpha, int [] pdwFlags);
-/**
- * @method flags=dynamic
- * @param hdc cast=(HDC)
- */
+/** @param hdc cast=(HDC) */
 public static final native int GetLayout (long /*int*/ hdc);
 /* returns the instance handle to the swt library */
 /** @method flags=no_gen */
 public static final native long /*int*/ GetLibraryHandle ();
 /** @param lpLCData cast=(LPWSTR) */
-public static final native int GetLocaleInfoW (int Locale, int LCType, char [] lpLCData, int cchData);
-/** @param lpLCData cast=(LPSTR) */
-public static final native int GetLocaleInfoA (int Locale, int LCType, byte [] lpLCData, int cchData);
+public static final native int GetLocaleInfo (int Locale, int LCType, char [] lpLCData, int cchData);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ GetMenu (long /*int*/ hWnd);
-/** @method flags=dynamic */
+/** @param hWnd cast=(HWND) */
 public static final native boolean GetMenuBarInfo (long /*int*/ hWnd, int idObject, int idItem, MENUBARINFO pmbi);
 /** @param hMenu cast=(HMENU) */
 public static final native int GetMenuDefaultItem (long /*int*/ hMenu, int fByPos, int gmdiFlags);
-/**
- * @method flags=dynamic
- * @param hmenu cast=(HMENU)
- */
+/** @param hmenu cast=(HMENU) */
 public static final native boolean GetMenuInfo (long /*int*/ hmenu, MENUINFO lpcmi);
 /** @param hMenu cast=(HMENU) */
 public static final native int GetMenuItemCount (long /*int*/ hMenu);
@@ -3965,18 +2918,14 @@ public static final native int GetMenuItemCount (long /*int*/ hMenu);
  * @param hMenu cast=(HMENU)
  * @param lpmii cast=(LPMENUITEMINFOW)
  */
-public static final native boolean GetMenuItemInfoW (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-/** @param hMenu cast=(HMENU) */
-public static final native boolean GetMenuItemInfoA (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean GetMenuItemInfo (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
 /**
  * @param hWnd cast=(HWND)
  * @param hMenu cast=(HMENU)
  */
 public static final native boolean GetMenuItemRect (long /*int*/ hWnd, long /*int*/ hMenu, int uItem, RECT lprcItem);
 /** @param hWnd cast=(HWND) */
-public static final native boolean GetMessageW (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax);
-/** @param hWnd cast=(HWND) */
-public static final native boolean GetMessageA (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax);
+public static final native boolean GetMessage (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax);
 public static final native int GetMessagePos ();
 public static final native int GetMessageTime ();
 /**
@@ -3985,39 +2934,29 @@ public static final native int GetMessageTime ();
  */
 public static final native int GetMetaRgn (long /*int*/ hdc, long /*int*/ hrgn);
 /**
- * @method flags=dynamic
+ * @param hTheme cast=(HTHEME)
+ * @param hdc cast=(HDC)
  * @param prc flags=no_out
  * @param psz flags=no_in
  */
 public static final native int GetThemePartSize(long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, RECT prc, int eSize, SIZE psz);
-/** @method flags=dynamic */
-public static final native int GetThemeTextExtent (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect);
 /**
- * @param hModule cast=(HMODULE)
- * @param lpFilename cast=(LPWSTR)
+ * @param hTheme cast=(HTHEME)
+ * @param hdc cast=(HDC)
  */
-public static final native int GetModuleFileNameW (long /*int*/ hModule, char [] lpFilename, int inSize);
+public static final native int GetThemeTextExtent (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect);
 /**
  * @param hModule cast=(HMODULE)
- * @param lpFilename cast=(LPSTR)
+ * @param lpFilename cast=(LPWSTR)
  */
-public static final native int GetModuleFileNameA (long /*int*/ hModule, byte [] lpFilename, int inSize);
+public static final native int GetModuleFileName (long /*int*/ hModule, char [] lpFilename, int inSize);
 /** @param lpModuleName cast=(LPWSTR) */
-public static final native long /*int*/ GetModuleHandleW (char [] lpModuleName);
-/** @param lpModuleName cast=(LPSTR) */
-public static final native long /*int*/ GetModuleHandleA (byte [] lpModuleName);
-/**
- * @method flags=dynamic
- * @param hmonitor cast=(HMONITOR)
- * @param lpmi cast=(LPMONITORINFO)
- */
-public static final native boolean GetMonitorInfoW (long /*int*/ hmonitor, MONITORINFO lpmi);
+public static final native long /*int*/ GetModuleHandle (char [] lpModuleName);
 /**
- * @method flags=dynamic
  * @param hmonitor cast=(HMONITOR)
  * @param lpmi cast=(LPMONITORINFO)
  */
-public static final native boolean GetMonitorInfoA (long /*int*/ hmonitor, MONITORINFO lpmi);
+public static final native boolean GetMonitorInfo (long /*int*/ hmonitor, MONITORINFO lpmi);
 /**
  * @param hPal cast=(HPALETTE)
  * @param crColor cast=(COLORREF)
@@ -4027,59 +2966,31 @@ public static final native int GetNearestPaletteIndex (long /*int*/ hPal, int cr
  * @param hgdiobj cast=(HGDIOBJ)
  * @param lpvObject flags=no_in
  */
-public static final native int GetObjectA (long /*int*/ hgdiobj, int cbBuffer, BITMAP lpvObject);
-/**
- * @param hgdiobj cast=(HGDIOBJ)
- * @param lpvObject flags=no_in
- */
-public static final native int GetObjectW (long /*int*/ hgdiobj, int cbBuffer, BITMAP lpvObject);
-/**
- * @param hgdiobj cast=(HGDIOBJ)
- * @param lpvObject flags=no_in
- */
-public static final native int GetObjectA (long /*int*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject);
-/**
- * @param hgdiobj cast=(HGDIOBJ)
- * @param lpvObject flags=no_in
- */
-public static final native int GetObjectW (long /*int*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject);
-/**
- * @param hgdiobj cast=(HGDIOBJ)
- * @param lpvObject flags=no_in
- */
-public static final native int GetObjectA (long /*int*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
+public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, BITMAP lpvObject);
 /**
  * @param hgdiobj cast=(HGDIOBJ)
  * @param lpvObject flags=no_in
  */
-public static final native int GetObjectW (long /*int*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
+public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject);
 /**
  * @param hgdiobj cast=(HGDIOBJ)
  * @param lpvObject flags=no_in
  */
-public static final native int GetObjectA (long /*int*/ hgdiobj, int cbBuffer, LOGFONTA lpvObject);
+public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject);
 /**
  * @param hgdiobj cast=(HGDIOBJ)
  * @param lpvObject flags=no_in
  */
-public static final native int GetObjectW (long /*int*/ hgdiobj, int cbBuffer, LOGFONTW lpvObject);
+public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGFONT lpvObject);
 /**
  * @param hgdiobj cast=(HGDIOBJ)
  * @param lpvObject cast=(LPVOID),flags=no_in
  */
-public static final native int GetObjectA (long /*int*/ hgdiobj, int cbBuffer, long /*int*/ lpvObject);
-/**
- * @param hgdiobj cast=(HGDIOBJ)
- * @param lpvObject cast=(LPVOID),flags=no_in
- */
-public static final native int GetObjectW (long /*int*/ hgdiobj, int cbBuffer, long /*int*/ lpvObject);
+public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, long /*int*/ lpvObject);
 /** @param lpofn cast=(LPOPENFILENAMEW) */
-public static final native boolean GetOpenFileNameW (OPENFILENAME lpofn);
-public static final native boolean GetOpenFileNameA (OPENFILENAME lpofn);
+public static final native boolean GetOpenFileName (OPENFILENAME lpofn);
 /** @param hdc cast=(HDC) */
-public static final native int GetOutlineTextMetricsW (long /*int*/ hdc, int cbData, OUTLINETEXTMETRICW lpOTM);
-/** @param hdc cast=(HDC) */
-public static final native int GetOutlineTextMetricsA (long /*int*/ hdc, int cbData, OUTLINETEXTMETRICA lpOTM);
+public static final native int GetOutlineTextMetrics (long /*int*/ hdc, int cbData, OUTLINETEXTMETRIC lpOTM);
 /**
  * @param hPalette cast=(HPALETTE)
  * @param logPalette cast=(LPPALETTEENTRY),flags=no_in critical
@@ -4096,13 +3007,7 @@ public static final native int GetPolyFillMode (long /*int*/ hdc);
  * @param phPrinter cast=(LPHANDLE)
  * @param pDefault cast=(LPPRINTER_DEFAULTSW)
  */
-public static final native boolean OpenPrinterW (char[] pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault);
-/**
- * @param pPrinterName cast=(LPTSTR)
- * @param phPrinter cast=(LPHANDLE)
- * @param pDefault cast=(LPPRINTER_DEFAULTS)
- */
-public static final native boolean OpenPrinterA (byte[] pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault);
+public static final native boolean OpenPrinter (char[] pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault);
 public static final native long /*int*/ GetProcessHeap ();
 /**
  * @param lpAppName cast=(LPWSTR)
@@ -4110,24 +3015,12 @@ public static final native long /*int*/ GetProcessHeap ();
  * @param lpDefault cast=(LPWSTR)
  * @param lpReturnedString cast=(LPWSTR)
  */
-public static final native int GetProfileStringW (char [] lpAppName, char [] lpKeyName, char [] lpDefault, char [] lpReturnedString, int nSize);
-/**
- * @param lpAppName cast=(LPSTR)
- * @param lpKeyName cast=(LPSTR)
- * @param lpDefault cast=(LPSTR)
- * @param lpReturnedString cast=(LPSTR)
- */
-public static final native int GetProfileStringA (byte [] lpAppName, byte [] lpKeyName, byte [] lpDefault, byte [] lpReturnedString, int nSize);
+public static final native int GetProfileString (char [] lpAppName, char [] lpKeyName, char [] lpDefault, char [] lpReturnedString, int nSize);
 /**
  * @param hWnd cast=(HWND)
  * @param lpString cast=(LPCWSTR)
  */
-public static final native long /*int*/ GetPropW (long /*int*/ hWnd, long /*int*/ lpString);
-/**
- * @param hWnd cast=(HWND)
- * @param lpString cast=(LPCTSTR)
- */
-public static final native long /*int*/ GetPropA (long /*int*/ hWnd, long /*int*/ lpString);
+public static final native long /*int*/ GetProp (long /*int*/ hWnd, long /*int*/ lpString);
 /**
  * @param hdc cast=(HDC)
  * @param hrgn cast=(HRGN)
@@ -4146,20 +3039,16 @@ public static final native int GetRgnBox (long /*int*/ hrgn, RECT lprc);
 /** @param hdc cast=(HDC) */
 public static final native int GetROP2 (long /*int*/ hdc);
 /** @param lpofn cast=(LPOPENFILENAMEW) */
-public static final native boolean GetSaveFileNameW (OPENFILENAME lpofn);
-public static final native boolean GetSaveFileNameA (OPENFILENAME lpofn);
+public static final native boolean GetSaveFileName (OPENFILENAME lpofn);
 /** @param hwnd cast=(HWND) */
 public static final native boolean GetScrollBarInfo (long /*int*/ hwnd, int idObject, SCROLLBARINFO psbi);
 /** @param hwnd cast=(HWND) */
 public static final native boolean GetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info);
 /** @param lpStartupInfo cast=(LPSTARTUPINFOW) */
-public static final native void GetStartupInfoW (STARTUPINFO lpStartupInfo);
-/** @param lpStartupInfo cast=(LPSTARTUPINFOA) */
-public static final native void GetStartupInfoA (STARTUPINFO lpStartupInfo);
+public static final native void GetStartupInfo (STARTUPINFO lpStartupInfo);
 public static final native long /*int*/ GetStockObject (int fnObject);
 public static final native int GetSysColor (int nIndex);
 public static final native long /*int*/ GetSysColorBrush (int nIndex);
-/** @method flags=dynamic */
 public static final native short GetSystemDefaultUILanguage ();
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ GetSystemMenu (long /*int*/ hWnd, boolean bRevert);
@@ -4178,23 +3067,12 @@ public static final native int GetTextColor (long /*int*/ hDC);
  * @param lpString cast=(LPWSTR),flags=no_out critical
  * @param lpSize flags=no_in
  */
-public static final native boolean GetTextExtentPoint32W (long /*int*/ hdc, char [] lpString, int cbString, SIZE lpSize);
-/**
- * @param hdc cast=(HDC)
- * @param lpString cast=(LPSTR),flags=no_out critical
- * @param lpSize flags=no_in
- */
-public static final native boolean GetTextExtentPoint32A (long /*int*/ hdc, byte [] lpString, int cbString, SIZE lpSize);
+public static final native boolean GetTextExtentPoint32 (long /*int*/ hdc, char [] lpString, int cbString, SIZE lpSize);
 /**
  * @param hdc cast=(HDC)
  * @param lptm flags=no_in
  */
-public static final native boolean GetTextMetricsW (long /*int*/ hdc, TEXTMETRICW lptm);
-/**
- * @param hdc cast=(HDC)
- * @param lptm flags=no_in
- */
-public static final native boolean GetTextMetricsA (long /*int*/ hdc, TEXTMETRICA lptm);
+public static final native boolean GetTextMetrics (long /*int*/ hdc, TEXTMETRIC lptm);
 /**
  * @method flags=dynamic
  * @param hTouchInput cast=(HTOUCHINPUT)
@@ -4217,13 +3095,9 @@ public static final native int GetVersion ();
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ GetWindow (long /*int*/ hWnd, int uCmd);
 /** @param hWnd cast=(HWND) */
-public static final native int GetWindowLongW (long /*int*/ hWnd, int nIndex);
-/** @param hWnd cast=(HWND) */
-public static final native int GetWindowLongA (long /*int*/ hWnd, int nIndex);
-/** @param hWnd cast=(HWND) */
-public static final native long /*int*/ GetWindowLongPtrW (long /*int*/ hWnd, int nIndex);
+public static final native int GetWindowLong (long /*int*/ hWnd, int nIndex);
 /** @param hWnd cast=(HWND) */
-public static final native long /*int*/ GetWindowLongPtrA (long /*int*/ hWnd, int nIndex);
+public static final native long /*int*/ GetWindowLongPtr (long /*int*/ hWnd, int nIndex);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ GetWindowDC (long /*int*/ hWnd);
 /** @param hdc cast=(HDC) */
@@ -4241,16 +3115,9 @@ public static final native int GetWindowRgn (long /*int*/ hWnd, long /*int*/ hRg
  * @param hWnd cast=(HWND)
  * @param lpString cast=(LPWSTR)
  */
-public static final native int GetWindowTextW (long /*int*/ hWnd, char [] lpString, int nMaxCount);
-/**
- * @param hWnd cast=(HWND)
- * @param lpString cast=(LPSTR)
- */
-public static final native int GetWindowTextA (long /*int*/ hWnd, byte [] lpString, int nMaxCount);
+public static final native int GetWindowText (long /*int*/ hWnd, char [] lpString, int nMaxCount);
 /** @param hWnd cast=(HWND) */
-public static final native int GetWindowTextLengthW (long /*int*/ hWnd);
-/** @param hWnd cast=(HWND) */
-public static final native int GetWindowTextLengthA (long /*int*/ hWnd);
+public static final native int GetWindowTextLength (long /*int*/ hWnd);
 /**
  * @param hWnd cast=(HWND)
  * @param lpdwProcessId cast=(LPDWORD)
@@ -4258,9 +3125,7 @@ public static final native int GetWindowTextLengthA (long /*int*/ hWnd);
 public static final native int GetWindowThreadProcessId (long /*int*/ hWnd, int [] lpdwProcessId);
 public static final native double GID_ROTATE_ANGLE_FROM_ARGUMENT(long dwArgument);
 /** @param lpString cast=(LPCWSTR) */
-public static final native int GlobalAddAtomW (char [] lpString);
-/** @param lpString cast=(LPCTSTR) */
-public static final native int GlobalAddAtomA (byte [] lpString);
+public static final native int GlobalAddAtom (char [] lpString);
 public static final native long /*int*/ GlobalAlloc (int uFlags, int dwBytes);
 /** @param hMem cast=(HANDLE) */
 public static final native long /*int*/ GlobalFree (long /*int*/ hMem);
@@ -4271,7 +3136,6 @@ public static final native int GlobalSize (long /*int*/ hMem);
 /** @param hMem cast=(HANDLE) */
 public static final native boolean GlobalUnlock (long /*int*/ hMem);
 /**
- * @method flags=dynamic
  * @param hdc cast=(HDC)
  * @param pVertex cast=(PTRIVERTEX)
  * @param dwNumVertex cast=(ULONG)
@@ -4356,42 +3220,24 @@ public static final native boolean ImmDestroyContext (long /*int*/ hIMC);
  * @param hIMC cast=(HIMC)
  * @param lpData cast=(LPVOID)
  */
-public static final native long /*int*/ ImmEscapeW(long /*int*/ hKL, long /*int*/ hIMC, int uEscape, char[] lpData);
-/**
- * @param hKL cast=(HKL)
- * @param hIMC cast=(HIMC)
- * @param lpData cast=(LPVOID)
- */
-public static final native long /*int*/ ImmEscapeA(long /*int*/ hKL, long /*int*/ hIMC, int uEscape, byte[] lpData);
+public static final native long /*int*/ ImmEscape (long /*int*/ hKL, long /*int*/ hIMC, int uEscape, char[] lpData);
 /** @param hIMC cast=(HIMC) */
-public static final native boolean ImmGetCompositionFontW (long /*int*/ hIMC, LOGFONTW lplf);
-/** @param hIMC cast=(HIMC) */
-public static final native boolean ImmGetCompositionFontA (long /*int*/ hIMC, LOGFONTA lplf);
+public static final native boolean ImmGetCompositionFont (long /*int*/ hIMC, LOGFONT lplf);
 /**
  * @param hIMC cast=(HIMC)
  * @param lpBuf cast=(LPWSTR)
  */
-public static final native int ImmGetCompositionStringW (long /*int*/ hIMC, int dwIndex, char [] lpBuf, int dwBufLen);
-/**
- * @param hIMC cast=(HIMC)
- * @param lpBuf cast=(LPSTR)
- */
-public static final native int ImmGetCompositionStringA (long /*int*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen);
+public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, char [] lpBuf, int dwBufLen);
 /**
  * @param hIMC cast=(HIMC)
  * @param lpBuf cast=(LPWSTR)
  */
-public static final native int ImmGetCompositionStringW (long /*int*/ hIMC, int dwIndex, int [] lpBuf, int dwBufLen);
+public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, int [] lpBuf, int dwBufLen);
 /**
  * @param hIMC cast=(HIMC)
  * @param lpBuf cast=(LPWSTR)
  */
-public static final native int ImmGetCompositionStringA (long /*int*/ hIMC, int dwIndex, int [] lpBuf, int dwBufLen);
-/**
- * @param hIMC cast=(HIMC)
- * @param lpBuf cast=(LPWSTR)
- */
-public static final native int ImmGetCompositionStringW (long /*int*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen);
+public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ ImmGetContext (long /*int*/ hWnd);
 /**
@@ -4412,9 +3258,7 @@ public static final native boolean ImmNotifyIME (long /*int*/ hIMC, int dwAction
  */
 public static final native boolean ImmReleaseContext (long /*int*/ hWnd, long /*int*/ hIMC);
 /** @param hIMC cast=(HIMC) */
-public static final native boolean ImmSetCompositionFontW (long /*int*/ hIMC, LOGFONTW lplf);
-/** @param hIMC cast=(HIMC) */
-public static final native boolean ImmSetCompositionFontA (long /*int*/ hIMC, LOGFONTA lplf);
+public static final native boolean ImmSetCompositionFont (long /*int*/ hIMC, LOGFONT lplf);
 /** @param hIMC cast=(HIMC) */
 public static final native boolean ImmSetCompositionWindow (long /*int*/ hIMC, COMPOSITIONFORM lpCompForm);
 /** @param hIMC cast=(HIMC) */
@@ -4429,35 +3273,20 @@ public static final native boolean InitCommonControlsEx (INITCOMMONCONTROLSEX lp
  * @param hMenu cast=(HMENU)
  * @param lpmii cast=(LPMENUITEMINFOW)
  */
-public static final native boolean InsertMenuItemW (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-/** @param hMenu cast=(HMENU) */
-public static final native boolean InsertMenuItemA (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-/**
- * @param lpszUrl cast=(LPCTSTR)
- * @param lpszCookieName cast=(LPCTSTR)
- * @param lpszCookieData cast=(LPSTR)
- * @param lpdwSize cast=(LPDWORD)
- */
-public static final native boolean InternetGetCookieA (byte[] lpszUrl, byte[] lpszCookieName, byte[] lpszCookieData, int[] lpdwSize);
+public static final native boolean InsertMenuItem (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
 /**
  * @param lpszUrl cast=(LPCWSTR)
  * @param lpszCookieName cast=(LPCWSTR)
  * @param lpszCookieData cast=(LPWSTR)
  * @param lpdwSize cast=(LPDWORD)
  */
-public static final native boolean InternetGetCookieW (char[] lpszUrl, char[] lpszCookieName, char[] lpszCookieData, int[] lpdwSize);
-/**
- * @param lpszUrl cast=(LPCTSTR)
- * @param lpszCookieName cast=(LPCTSTR)
- * @param lpszCookieData cast=(LPCTSTR)
- */
-public static final native boolean InternetSetCookieA (byte[] lpszUrl, byte[] lpszCookieName, byte[] lpszCookieData);
+public static final native boolean InternetGetCookie (char[] lpszUrl, char[] lpszCookieName, char[] lpszCookieData, int[] lpdwSize);
 /**
  * @param lpszUrl cast=(LPCWSTR)
  * @param lpszCookieName cast=(LPCWSTR)
  * @param lpszCookieData cast=(LPCWSTR)
  */
-public static final native boolean InternetSetCookieW (char[] lpszUrl, char[] lpszCookieName, char[] lpszCookieData);
+public static final native boolean InternetSetCookie (char[] lpszUrl, char[] lpszCookieName, char[] lpszCookieData);
 /**
  * @param hInternet cast=(HINTERNET)
  * @param lpBuffer cast=(LPVOID)
@@ -4478,12 +3307,8 @@ public static final native boolean InvalidateRect (long /*int*/ hWnd, RECT lpRec
  * @param hRgn cast=(HRGN)
  */
 public static final native boolean InvalidateRgn (long /*int*/ hWnd, long /*int*/ hRgn, boolean bErase);
-/** @method flags=dynamic */
 public static final native boolean IsAppThemed ();
-/**
- * @method flags=dynamic
- * @param hWnd cast=(HWND)
- */
+/** @param hWnd cast=(HWND) */
 public static final native boolean IsHungAppWindow (long /*int*/ hWnd);
 /** @param hWnd cast=(HWND) */
 public static final native boolean IsIconic (long /*int*/ hWnd);
@@ -4507,42 +3332,22 @@ public static final native boolean LineTo (long /*int*/ hdc, int x1, int x2);
  * @param hInstance cast=(HINSTANCE)
  * @param lpBitmapName cast=(LPWSTR)
  */
-public static final native long /*int*/ LoadBitmapW (long /*int*/ hInstance, long /*int*/ lpBitmapName);
-/**
- * @param hInstance cast=(HINSTANCE)
- * @param lpBitmapName cast=(LPSTR)
- */
-public static final native long /*int*/ LoadBitmapA (long /*int*/ hInstance, long /*int*/ lpBitmapName);
+public static final native long /*int*/ LoadBitmap (long /*int*/ hInstance, long /*int*/ lpBitmapName);
 /**
  * @param hInstance cast=(HINSTANCE)
  * @param lpCursorName cast=(LPWSTR)
  */
-public static final native long /*int*/ LoadCursorW (long /*int*/ hInstance, long /*int*/ lpCursorName);
-/**
- * @param hInstance cast=(HINSTANCE)
- * @param lpCursorName cast=(LPSTR)
- */
-public static final native long /*int*/ LoadCursorA (long /*int*/ hInstance, long /*int*/ lpCursorName);
+public static final native long /*int*/ LoadCursor (long /*int*/ hInstance, long /*int*/ lpCursorName);
 /**
  * @param hInstance cast=(HINSTANCE)
  * @param lpIconName cast=(LPWSTR)
  */
-public static final native long /*int*/ LoadIconW (long /*int*/ hInstance, long /*int*/ lpIconName);
-/**
- * @param hInstance cast=(HINSTANCE)
- * @param lpIconName cast=(LPSTR)
- */
-public static final native long /*int*/ LoadIconA (long /*int*/ hInstance, long /*int*/ lpIconName);
+public static final native long /*int*/ LoadIcon (long /*int*/ hInstance, long /*int*/ lpIconName);
 /**
  * @param hinst cast=(HINSTANCE)
  * @param lpszName cast=(LPWSTR)
  */
-public static final native long /*int*/ LoadImageW (long /*int*/ hinst, long /*int*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
-/**
- * @param hinst cast=(HINSTANCE)
- * @param lpszName cast=(LPSTR)
- */
-public static final native long /*int*/ LoadImageA (long /*int*/ hinst, long /*int*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
+public static final native long /*int*/ LoadImage (long /*int*/ hinst, long /*int*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad);
 /** @param hMem cast=(HLOCAL) */
 public static final native long /*int*/ LocalFree (long /*int*/ hMem);
 public static final native int LODWORD (long l);
@@ -4553,8 +3358,7 @@ public static final native int MAKEWORD(int l, int h);
 public static final native long /*int*/ MAKEWPARAM(int l, int h);
 public static final native long /*int*/ MAKELPARAM(int l, int h);
 public static final native long /*int*/ MAKELRESULT(int l, int h);
-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 MapVirtualKey (int uCode, int uMapType);
 /**
  * @param hWndFrom cast=(HWND)
  * @param hWndTo cast=(HWND)
@@ -4573,19 +3377,13 @@ public static final native boolean MessageBeep (int uType);
  * @param lpText cast=(LPWSTR)
  * @param lpCaption cast=(LPWSTR)
  */
-public static final native int MessageBoxW (long /*int*/ hWnd, char [] lpText, char [] lpCaption, int uType);
-/**
- * @param hWnd cast=(HWND)
- * @param lpText cast=(LPSTR)
- * @param lpCaption cast=(LPSTR)
- */
-public static final native int MessageBoxA (long /*int*/ hWnd, byte [] lpText, byte [] lpCaption, int uType);
+public static final native int MessageBox (long /*int*/ hWnd, char [] lpText, char [] lpCaption, int uType);
 /**
  * @param hdc cast=(HDC)
  * @param lpXform cast=(XFORM *)
  */
 public static final native boolean ModifyWorldTransform(long /*int*/ hdc, float [] lpXform, int iMode);
-/** @method flags=dynamic */
+/** @param hwnd cast=(HWND) */
 public static final native long /*int*/ MonitorFromWindow (long /*int*/ hwnd, int dwFlags);
 /**
  * @param Destination cast=(PVOID),flags=no_in critical
@@ -4656,12 +3454,7 @@ public static final native void MoveMemory (long /*int*/ Destination, long /*int
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
  */
-public static final native void MoveMemory (long /*int*/ Destination, DEVMODEW Source, int Length);
-/**
- * @param Destination cast=(PVOID)
- * @param Source cast=(CONST VOID *),flags=no_out
- */
-public static final native void MoveMemory (long /*int*/ Destination, DEVMODEA Source, int Length);
+public static final native void MoveMemory (long /*int*/ Destination, DEVMODE Source, int Length);
 /**
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
@@ -4676,12 +3469,7 @@ public static final native void MoveMemory (long /*int*/ Destination, GRADIENT_R
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
  */
-public static final native void MoveMemory (long /*int*/ Destination, LOGFONTW Source, int Length);
-/**
- * @param Destination cast=(PVOID)
- * @param Source cast=(CONST VOID *),flags=no_out
- */
-public static final native void MoveMemory (long /*int*/ Destination, LOGFONTA Source, int Length);
+public static final native void MoveMemory (long /*int*/ Destination, LOGFONT Source, int Length);
 /**
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
@@ -4706,12 +3494,7 @@ public static final native void MoveMemory (long /*int*/ Destination, UDACCEL So
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
  */
-public static final native void MoveMemory (long /*int*/ Destination, NMTTDISPINFOW Source, int Length);
-/**
- * @param Destination cast=(PVOID)
- * @param Source cast=(CONST VOID *),flags=no_out
- */
-public static final native void MoveMemory (long /*int*/ Destination, NMTTDISPINFOA Source, int Length);
+public static final native void MoveMemory (long /*int*/ Destination, NMTTDISPINFO Source, int Length);
 /**
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *)
@@ -4766,12 +3549,7 @@ public static final native void MoveMemory (CERT_INFO Destination, long /*int*/
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
-public static final native void MoveMemory (DEVMODEW Destination, long /*int*/ Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
-public static final native void MoveMemory (DEVMODEA Destination, long /*int*/ Source, int Length);
+public static final native void MoveMemory (DEVMODE Destination, long /*int*/ Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
@@ -4806,12 +3584,7 @@ public static final native void MoveMemory (HELPINFO Destination, long /*int*/ S
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
-public static final native void MoveMemory (LOGFONTW Destination, long /*int*/ Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
-public static final native void MoveMemory (LOGFONTA Destination, long /*int*/ Source, int Length);
+public static final native void MoveMemory (LOGFONT Destination, long /*int*/ Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
@@ -4966,12 +3739,7 @@ public static final native void MoveMemory (NMTTCUSTOMDRAW Destination, long /*i
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
-public static final native void MoveMemory (NMTTDISPINFOW Destination, long /*int*/ Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
-public static final native void MoveMemory (NMTTDISPINFOA Destination, long /*int*/ Source, int Length);
+public static final native void MoveMemory (NMTTDISPINFO Destination, long /*int*/ Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
@@ -4991,12 +3759,7 @@ public static final native void MoveMemory (long /*int*/ Destination, SHDRAGIMAG
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
-public static final native void MoveMemory (TEXTMETRICW Destination, long /*int*/ Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
-public static final native void MoveMemory (TEXTMETRICA Destination, long /*int*/ Source, int Length);
+public static final native void MoveMemory (TEXTMETRIC Destination, long /*int*/ Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
@@ -5088,7 +3851,6 @@ public static final native int MultiByteToWideChar (int CodePage, int dwFlags, b
  */
 public static final native int MultiByteToWideChar (int CodePage, int dwFlags, long /*int*/ lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar);
 /**
- * @method flags=dynamic
  * @param event cast=(DWORD)
  * @param hwnd cast=(HWND)
  * @param idObject cast=(LONG)
@@ -5104,7 +3866,6 @@ public static final native void OleUninitialize ();
 /** @param hWndNewOwner cast=(HWND) */
 public static final native boolean OpenClipboard (long /*int*/ hWndNewOwner);
 /**
- * @method flags=dynamic
  * @param hwnd cast=(HWND)
  * @param pszClassList cast=(LPCWSTR)
  */
@@ -5114,9 +3875,7 @@ public static final native boolean PatBlt (long /*int*/ hdc, int x1, int x2, int
 /** @param szfile cast=(LPCWSTR) */
 public static final native boolean PathIsExe (long /*int*/ szfile);
 /** @param hWnd cast=(HWND) */
-public static final native boolean PeekMessageW (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
-/** @param hWnd cast=(HWND) */
-public static final native boolean PeekMessageA (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
+public static final native boolean PeekMessage (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg);
 /** @param hdc cast=(HDC) */
 public static final native boolean Pie (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc);
 /** @param pt flags=struct */
@@ -5136,34 +3895,20 @@ public static final native boolean Polyline (long /*int*/ hdc, int[] points, int
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native boolean PostMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native boolean PostMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /**
- * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native boolean PostMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native boolean PostThreadMessageW (int idThread, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native boolean PostThreadMessageA (int idThread, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native boolean PostThreadMessage (int idThread, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 public static final native short PRIMARYLANGID (int lgid);
 /** @param lppd cast=(LPPRINTDLGW) */
-public static final native boolean PrintDlgW (PRINTDLG lppd);
-public static final native boolean PrintDlgA (PRINTDLG lppd);
+public static final native boolean PrintDlg (PRINTDLG lppd);
 /**
- * @method flags=dynamic
  * @param hwnd cast=(HWND)
  * @param hdcBlt cast=(HDC)
  */
 public static final native boolean PrintWindow (long /*int*/ hwnd, long /*int*/ hdcBlt, int nFlags);
-/** @method flags=dynamic */
 public static final native int PSPropertyKeyFromString (char[] pszString, PROPERTYKEY pkey);
 /**
  * @param rect flags=no_out
@@ -5196,26 +3941,12 @@ public static final native int RegCloseKey (long /*int*/ hKey);
  * @param phkResult cast=(PHKEY)
  * @param lpdwDisposition cast=(LPDWORD)
  */
-public static final native int RegCreateKeyExW (long /*int*/ hKey, char[] lpSubKey, int Reserved, char[] lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition);
-/**
- * @param hKey cast=(HKEY)
- * @param lpSubKey cast=(LPSTR)
- * @param lpClass cast=(LPTSTR)
- * @param lpSecurityAttributes cast=(LPSECURITY_ATTRIBUTES)
- * @param phkResult cast=(PHKEY)
- * @param lpdwDisposition cast=(LPDWORD)
- */
-public static final native int RegCreateKeyExA (long /*int*/ hKey, byte[] lpSubKey, int Reserved, byte[] lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition);
+public static final native int RegCreateKeyEx (long /*int*/ hKey, char[] lpSubKey, int Reserved, char[] lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition);
 /**
  * @param hKey cast=(HKEY)
  * @param lpValueName cast=(LPWSTR)
  */
-public static final native int RegDeleteValueW (long /*int*/ hKey, char[] lpValueName);
-/**
- * @param hKey cast=(HKEY)
- * @param lpValueName cast=(LPSTR)
- */
-public static final native int RegDeleteValueA (long /*int*/ hKey, byte[] lpValueName);
+public static final native int RegDeleteValue (long /*int*/ hKey, char[] lpValueName);
 /**
  * @param hKey cast=(HKEY)
  * @param lpName cast=(LPWSTR)
@@ -5224,19 +3955,9 @@ public static final native int RegDeleteValueA (long /*int*/ hKey, byte[] lpValu
  * @param lpClass cast=(LPWSTR)
  * @param lpcClass cast=(LPDWORD)
  */
-public static final native int RegEnumKeyExW (long /*int*/ hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
-/**
- * @param hKey cast=(HKEY)
- * @param lpName cast=(LPSTR)
- * @param lpcName cast=(LPDWORD)
- * @param lpReserved cast=(LPDWORD)
- * @param lpClass cast=(LPSTR)
- * @param lpcClass cast=(LPDWORD)
- */
-public static final native int RegEnumKeyExA (long /*int*/ hKey, int dwIndex, byte [] lpName, int [] lpcName, int [] lpReserved, byte [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
+public static final native int RegEnumKeyEx (long /*int*/ hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
 /** @param lpWndClass cast=(LPWNDCLASSW) */
-public static final native int RegisterClassW (WNDCLASS lpWndClass);
-public static final native int RegisterClassA (WNDCLASS lpWndClass);
+public static final native int RegisterClass (WNDCLASS lpWndClass);
 /**
  * @method flags=dynamic
  * @param hWnd cast=(HWND)
@@ -5244,25 +3965,15 @@ public static final native int RegisterClassA (WNDCLASS lpWndClass);
  */
 public static final native boolean RegisterTouchWindow(long /*int*/ hWnd, int ulFlags);
 /** @param lpString cast=(LPWSTR) */
-public static final native int RegisterWindowMessageW (char [] lpString);
-/** @param lpString cast=(LPTSTR) */
-public static final native int RegisterWindowMessageA (byte [] lpString);
-/** @param lpszFormat cast=(LPTSTR) */
-public static final native int RegisterClipboardFormatA (byte[] lpszFormat);
+public static final native int RegisterWindowMessage (char [] lpString);
 /** @param lpszFormat cast=(LPWSTR) */
-public static final native int RegisterClipboardFormatW (char[] lpszFormat);
+public static final native int RegisterClipboardFormat (char[] lpszFormat);
 /**
  * @param hKey cast=(HKEY)
  * @param lpSubKey cast=(LPWSTR)
  * @param phkResult cast=(PHKEY)
  */
-public static final native int RegOpenKeyExW (long /*int*/ hKey, char[] lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult);
-/**
- * @param hKey cast=(HKEY)
- * @param lpSubKey cast=(LPSTR)
- * @param phkResult cast=(PHKEY)
- */
-public static final native int RegOpenKeyExA (long /*int*/ hKey, byte[] lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult);
+public static final native int RegOpenKeyEx (long /*int*/ hKey, char[] lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult);
 /**
  * @param hKey cast=(HKEY)
  * @param lpValueName cast=(LPWSTR)
@@ -5271,7 +3982,7 @@ public static final native int RegOpenKeyExA (long /*int*/ hKey, byte[] lpSubKey
  * @param lpData cast=(LPBYTE)
  * @param lpcbData cast=(LPDWORD)
  */
-public static final native int RegQueryValueExW (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, char [] lpData, int[] lpcbData);
+public static final native int RegQueryValueEx (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, char [] lpData, int[] lpcbData);
 /**
  * @param hKey cast=(HKEY)
  * @param lpValueName cast=(LPWSTR)
@@ -5280,37 +3991,13 @@ public static final native int RegQueryValueExW (long /*int*/ hKey, char[] lpVal
  * @param lpData cast=(LPBYTE)
  * @param lpcbData cast=(LPDWORD)
  */
-public static final native int RegQueryValueExW (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
-/**
- * @param hKey cast=(HKEY)
- * @param lpValueName cast=(LPSTR)
- * @param lpReserved cast=(LPDWORD)
- * @param lpType cast=(LPDWORD)
- * @param lpData cast=(LPBYTE)
- * @param lpcbData cast=(LPDWORD)
- */
-public static final native int RegQueryValueExA (long /*int*/ hKey, byte[] lpValueName, long /*int*/ lpReserved, int[] lpType, byte [] lpData, int[] lpcbData);
+public static final native int RegQueryValueEx (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
 /**
  * @param hKey cast=(HKEY)
  * @param lpValueName cast=(LPWSTR)
  * @param lpData cast=(const BYTE*)
  */
-public static final native int RegSetValueExW (long /*int*/ hKey, char[] lpValueName, int Reserved, int dwType, int[] lpData, int cbData);
-/**
- * @param hKey cast=(HKEY)
- * @param lpValueName cast=(LPSTR)
- * @param lpData cast=(const BYTE*)
- */
-public static final native int RegSetValueExA (long /*int*/ hKey, byte[] lpValueName, int Reserved, int dwType, int[] lpData, int cbData);
-/**
- * @param hKey cast=(HKEY)
- * @param lpValueName cast=(LPSTR)
- * @param lpReserved cast=(LPDWORD)
- * @param lpType cast=(LPDWORD)
- * @param lpData cast=(LPBYTE)
- * @param lpcbData cast=(LPDWORD)
- */
-public static final native int RegQueryValueExA (long /*int*/ hKey, byte[] lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData);
+public static final native int RegSetValueEx (long /*int*/ hKey, char[] lpValueName, int Reserved, int dwType, int[] lpData, int cbData);
 public static final native boolean ReleaseCapture ();
 /**
  * @param hWnd cast=(HWND)
@@ -5321,14 +4008,9 @@ public static final native int ReleaseDC (long /*int*/ hWnd, long /*int*/ hDC);
 public static final native boolean RemoveMenu (long /*int*/ hMenu, int uPosition, int uFlags);
 /**
  * @param hWnd cast=(HWND)
- * @param lpString cast=(LPCTSTR)
- */
-public static final native long /*int*/ RemovePropA (long /*int*/ hWnd, long /*int*/ lpString);
-/**
- * @param hWnd cast=(HWND)
  * @param lpString cast=(LPCWSTR)
  */
-public static final native long /*int*/ RemovePropW (long /*int*/ hWnd, long /*int*/ lpString);
+public static final native long /*int*/ RemoveProp (long /*int*/ hWnd, long /*int*/ lpString);
 public static final native boolean ReplyMessage (long /*int*/ lResult);
 /**
  * @param hdc cast=(HDC)
@@ -5503,403 +4185,181 @@ public static final native int SendInput (int nInputs, long /*int*/ pInputs, int
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, int [] wParam, int [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ [] wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, char [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, int [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, short [] lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, int [] wParam, int [] lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, char [] lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVCOLUMN lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, int [] lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVHITTESTINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LITEM lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVCOLUMN lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVITEM lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVHITTESTINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVINSERTMARK lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LITEM lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MARGINS lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVITEM lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MCHITTESTINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVINSERTMARK lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, POINT lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MARGINS lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, REBARBANDINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MCHITTESTINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, RECT lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, REBARBANDINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SYSTEMTIME lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, RECT lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SHDRAGIMAGE lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SYSTEMTIME lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTON lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SHDRAGIMAGE lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTONINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTON lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCITEM lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTONINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHITTESTINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCITEM lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TOOLINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHITTESTINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVHITTESTINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TOOLINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVINSERTSTRUCT lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVHITTESTINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVITEM lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVINSERTSTRUCT lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVSORTCB lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVITEM lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, UDACCEL lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVSORTCB lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDHITTESTINFO lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, UDACCEL lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDITEM lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDHITTESTINFO lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDLAYOUT lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDITEM lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, BUTTON_IMAGELIST lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDLAYOUT lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageW (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SIZE lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, BUTTON_IMAGELIST lParam);
 /**
  * @param hWnd cast=(HWND)
  * @param wParam cast=(WPARAM)
  * @param lParam cast=(LPARAM)
  */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, int [] wParam, int [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ [] wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, byte [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, int [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, short [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, char [] lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVCOLUMN lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVHITTESTINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LITEM lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVINSERTMARK lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVITEM lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MARGINS lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MCHITTESTINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, POINT lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, REBARBANDINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, RECT lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SYSTEMTIME lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SHDRAGIMAGE lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTON lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTONINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCITEM lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHITTESTINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TOOLINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVHITTESTINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVINSERTSTRUCT lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVITEM lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVSORTCB lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, UDACCEL lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDHITTESTINFO lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDITEM lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDLAYOUT lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, BUTTON_IMAGELIST lParam);
-/**
- * @param hWnd cast=(HWND)
- * @param wParam cast=(WPARAM)
- * @param lParam cast=(LPARAM)
- */
-public static final native long /*int*/ SendMessageA (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SIZE lParam);
+public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SIZE lParam);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ SetActiveWindow (long /*int*/ hWnd);
 /**
@@ -5927,16 +4387,7 @@ public static final native boolean SetCursorPos (int X, int Y);
  * @param pColors cast=(RGBQUAD *),flags=no_out critical
  */
 public static final native int SetDIBColorTable (long /*int*/ hdc, int uStartIndex, int cEntries, byte[] pColors);
-/**
- * @method flags=dynamic
- * @param lpString cast=(LPSTR)
- */
-public static final native boolean SetDllDirectoryA (byte [] lpString);
-/**
- * @method flags=dynamic
- * @param lpString cast=(LPWSTR)
- */
-public static final native boolean SetDllDirectoryW (char [] lpString);
+public static final native boolean SetDllDirectory (char [] lpString);
 public static final native int SetErrorMode (int uMode);
 /** @param hWnd cast=(HWND) */
 public static final native long /*int*/ SetFocus (long /*int*/ hWnd);
@@ -5950,13 +4401,9 @@ public static final native boolean SetForegroundWindow (long /*int*/ hWnd);
 public static final native boolean SetGestureConfig(long /*int*/ hwnd, int dwReserved, int cIDs, long /*int*/ pGestureConfig, int cbSize);
 /** @param hdc cast=(HDC) */
 public static final native int SetGraphicsMode (long /*int*/ hdc, int iMode);
-/**
- * @method flags=dynamic
- * @param hwnd cast=(HWND)
- */
+/** @param hwnd cast=(HWND) */
 public static final native boolean SetLayeredWindowAttributes(long /*int*/ hwnd, int crKey, byte bAlpha, int dwFlags);
 /**
- * @method flags=dynamic
  * @param hdc cast=(HDC)
  * @param dwLayout cast=(DWORD)
  */
@@ -5968,18 +4415,13 @@ public static final native int SetLayout (long /*int*/ hdc, int dwLayout);
 public static final native boolean SetMenu (long /*int*/ hWnd, long /*int*/ hMenu);
 /** @param hMenu cast=(HMENU) */
 public static final native boolean SetMenuDefaultItem (long /*int*/ hMenu, int uItem, int fByPos);
-/**
- * @method flags=dynamic
- * @param hmenu cast=(HMENU)
- */
+/** @param hmenu cast=(HMENU) */
 public static final native boolean SetMenuInfo (long /*int*/ hmenu, MENUINFO lpcmi);
 /**
  * @param hMenu cast=(HMENU)
  * @param lpmii cast=(LPMENUITEMINFOW)
  */
-public static final native boolean SetMenuItemInfoW (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
-/** @param hMenu cast=(HMENU) */
-public static final native boolean SetMenuItemInfoA (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
+public static final native boolean SetMenuItemInfo (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii);
 /** @param hdc cast=(HDC) */
 public static final native int SetMetaRgn (long /*int*/ hdc);
 /**
@@ -5996,7 +4438,6 @@ public static final native long /*int*/ SetParent (long /*int*/ hWndChild, long
 public static final native int SetPixel (long /*int*/ hdc, int X, int Y, int crColor);
 /** @param hdc cast=(HDC) */
 public static final native int SetPolyFillMode (long /*int*/ hdc, int iPolyFillMode);
-/** @method flags=dynamic */
 public static final native boolean SetProcessDPIAware ();
 /** @param lprc flags=no_in */
 public static final native boolean SetRect (RECT lprc, int xLeft, int yTop, int xRight, int yBottom);
@@ -6013,13 +4454,7 @@ public static final native int SetStretchBltMode (long /*int*/ hdc, int iStretch
  * @param lpString cast=(LPCWSTR)
  * @param hData cast=(HANDLE)
  */
-public static final native boolean SetPropW (long /*int*/ hWnd, long /*int*/ lpString, long /*int*/ hData);
-/**
- * @param hWnd cast=(HWND)
- * @param lpString cast=(LPCTSTR)
- * @param hData cast=(HANDLE)
- */
-public static final native boolean SetPropA (long /*int*/ hWnd, long /*int*/ lpString, long /*int*/ hData);
+public static final native boolean SetProp (long /*int*/ hWnd, long /*int*/ lpString, long /*int*/ hData);
 /**
  * @param hdc cast=(HDC)
  * @param colorRef cast=(COLORREF)
@@ -6031,19 +4466,12 @@ public static final native int SetTextColor (long /*int*/ hdc, int colorRef);
  */
 public static final native long /*int*/ SetTimer (long /*int*/ hWnd, long /*int*/ nIDEvent, int Elapse, long /*int*/ lpTimerFunc);
 /** @param hWnd cast=(HWND) */
-public static final native int SetWindowLongW (long /*int*/ hWnd, int nIndex, int dwNewLong);
-/** @param hWnd cast=(HWND) */
-public static final native int SetWindowLongA (long /*int*/ hWnd, int nIndex, int dwNewLong);
+public static final native int SetWindowLong (long /*int*/ hWnd, int nIndex, int dwNewLong);
 /**
  * @param hWnd cast=(HWND)
  * @param dwNewLong cast=(LONG_PTR)
  */
-public static final native long /*int*/ SetWindowLongPtrW (long /*int*/ hWnd, int nIndex, long /*int*/ dwNewLong);
-/**
- * @param hWnd cast=(HWND)
- * @param dwNewLong cast=(LONG_PTR)
- */
-public static final native long /*int*/ SetWindowLongPtrA (long /*int*/ hWnd, int nIndex, long /*int*/ dwNewLong);
+public static final native long /*int*/ SetWindowLongPtr (long /*int*/ hWnd, int nIndex, long /*int*/ dwNewLong);
 /** @param hdc cast=(HDC) */
 public static final native boolean SetWindowOrgEx (long /*int*/ hdc, int X, int Y, POINT lpPoint);
 /** @param hWnd cast=(HWND) */
@@ -6062,14 +4490,8 @@ public static final native int SetWindowRgn (long /*int*/ hWnd, long /*int*/ hRg
  * @param hWnd cast=(HWND)
  * @param lpString cast=(LPWSTR)
  */
-public static final native boolean SetWindowTextW (long /*int*/ hWnd, char [] lpString);
+public static final native boolean SetWindowText (long /*int*/ hWnd, char [] lpString);
 /**
- * @param hWnd cast=(HWND)
- * @param lpString cast=(LPSTR)
- */
-public static final native boolean SetWindowTextA (long /*int*/ hWnd, byte [] lpString);
-/**
- * @method flags=dynamic
  * @param hwnd cast=(HWND)
  * @param pszSubAppName cast=(LPCWSTR)
  * @param pszSubIdList cast=(LPCWSTR)
@@ -6079,52 +4501,47 @@ public static final native int SetWindowTheme (long /*int*/ hwnd, char [] pszSub
  * @param lpfn cast=(HOOKPROC)
  * @param hMod cast=(HINSTANCE)
  */
-public static final native long /*int*/ SetWindowsHookExW (int idHook, long /*int*/ lpfn,  long /*int*/ hMod,  int dwThreadId);
-/**
- * @param lpfn cast=(HOOKPROC)
- * @param hMod cast=(HINSTANCE)
- */
-public static final native long /*int*/ SetWindowsHookExA (int idHook, long /*int*/ lpfn,  long /*int*/ hMod,  int dwThreadId);
+public static final native long /*int*/ SetWindowsHookEx (int idHook, long /*int*/ lpfn,  long /*int*/ hMod,  int dwThreadId);
 /**
  * @param hdc cast=(HDC)
  * @param lpXform cast=(XFORM *)
  */
 public static final native boolean SetWorldTransform(long /*int*/ hdc, float[] lpXform);
 /** @param lpbi cast=(LPBROWSEINFOW) */
-public static final native long /*int*/ SHBrowseForFolderW (BROWSEINFO lpbi);
-public static final native long /*int*/ SHBrowseForFolderA (BROWSEINFO lpbi);
+public static final native long /*int*/ SHBrowseForFolder (BROWSEINFO lpbi);
 /**
  * @param pszPath cast=(LPCWSTR)
  * @param psfi cast=(SHFILEINFOW *)
  */
-public static final native long /*int*/ SHGetFileInfoW (char [] pszPath, int dwFileAttributes, SHFILEINFOW psfi, int cbFileInfo, int uFlags);
-/**
- * @param pszPath cast=(LPCSTR)
- * @param psfi cast=(SHFILEINFOA *)
- */
-public static final native long /*int*/ SHGetFileInfoA (byte [] pszPath, int dwFileAttributes, SHFILEINFOA psfi, int cbFileInfo, int uFlags);
+public static final native long /*int*/ SHGetFileInfo (char [] pszPath, int dwFileAttributes, SHFILEINFO psfi, int cbFileInfo, int uFlags);
 /** @param lpExecInfo cast=(LPSHELLEXECUTEINFOW) */
-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 boolean ShellExecuteEx (SHELLEXECUTEINFO lpExecInfo);
+public static final native boolean Shell_NotifyIcon (int dwMessage, NOTIFYICONDATA lpData);
 /** @param ppMalloc cast=(LPMALLOC *) */
 public static final native int SHGetMalloc (long /*int*/ [] ppMalloc);
 /**
  * @param pidl cast=(LPCITEMIDLIST)
  * @param pszPath cast=(LPWSTR)
  */
-public static final native boolean SHGetPathFromIDListW (long /*int*/ pidl, char [] pszPath);
+public static final native boolean SHGetPathFromIDList (long /*int*/ pidl, char [] pszPath);
 /**
- * @param pidl cast=(LPCITEMIDLIST)
- * @param pszPath cast=(LPSTR)
+ * @param kfid cast=(REFKNOWNFOLDERID)
+ * @param riid cast=(REFIID)
+ * @param ppv cast=(void **)
  */
-public static final native boolean SHGetPathFromIDListA (long /*int*/ pidl, byte [] pszPath);
-/** @method flags=dynamic */
 public static final native int SHCreateItemInKnownFolder (byte [] kfid, int dwKFFlags, char [] pszItem, byte [] riid, long /*int*/ [] ppv);
-/** @method flags=dynamic */
+/**
+ * @param psiParent cast=(IShellItem *)
+ * @param pbc cast=(IBindCtx *)
+ * @param riid cast=(REFIID)
+ * @param ppv cast=(void **)
+ */
 public static final native int SHCreateItemFromRelativeName (long /*int*/ psiParent, char [] pszName, long /*int*/ pbc, byte [] riid, long /*int*/ [] ppv);
-/** @method flags=dynamic */
+/**
+ * @param pbc cast=(IBindCtx *)
+ * @param riid cast=(REFIID)
+ * @param ppv cast=(void **)
+ */
 public static final native int SHCreateItemFromParsingName (char [] pszName, long /*int*/ pbc, byte [] riid, long /*int*/ [] ppv);
 /** @param hWnd cast=(HWND) */
 public static final native boolean ShowCaret (long /*int*/ hWnd);
@@ -6138,9 +4555,7 @@ public static final native boolean ShowWindow (long /*int*/ hWnd, int nCmdShow);
  * @param hdc cast=(HDC)
  * @param lpdi cast=(LPDOCINFOW)
  */
-public static final native int StartDocW (long /*int*/ hdc, DOCINFO lpdi);
-/** @param hdc cast=(HDC) */
-public static final native int StartDocA (long /*int*/ hdc, DOCINFO lpdi);
+public static final native int StartDoc (long /*int*/ hdc, DOCINFO lpdi);
 /** @param hdc cast=(HDC) */
 public static final native int StartPage (long /*int*/ hdc);
 /**
@@ -6148,21 +4563,10 @@ public static final native int StartPage (long /*int*/ hdc);
  * @param hdcSrc cast=(HDC)
  */
 public static final native boolean StretchBlt (long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int dwRop);
-/** @param hdc cast=(HDC) */
-public static final native boolean StrokePath (long /*int*/ 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);
-/**
- * @param lpKeyState cast=(PBYTE)
- * @param lpChar cast=(LPWORD)
- */
-public static final native int ToAscii (int uVirtKey, int uScanCode, byte [] lpKeyState, short [] lpChar, int uFlags);
+public static final native boolean SystemParametersInfo (int uiAction, int uiParam, HIGHCONTRAST pvParam, int fWinIni);
+public static final native boolean SystemParametersInfo (int uiAction, int uiParam, RECT pvParam, int fWinIni);
+public static final native boolean SystemParametersInfo (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni);
+public static final native boolean SystemParametersInfo (int uiAction, int uiParam, int [] pvParam, int fWinIni);
 /**
  * @param lpKeyState cast=(PBYTE)
  * @param pwszBuff cast=(LPWSTR)
@@ -6184,12 +4588,7 @@ public static final native boolean TrackPopupMenu (long /*int*/ hMenu, int uFlag
  * @param hWnd cast=(HWND)
  * @param hAccTable cast=(HACCEL)
  */
-public static final native int TranslateAcceleratorW (long /*int*/ hWnd, long /*int*/ hAccTable, MSG lpMsg);
-/**
- * @param hWnd cast=(HWND)
- * @param hAccTable cast=(HACCEL)
- */
-public static final native int TranslateAcceleratorA (long /*int*/ hWnd, long /*int*/ hAccTable, MSG lpMsg);
+public static final native int TranslateAccelerator (long /*int*/ hWnd, long /*int*/ hAccTable, MSG lpMsg);
 /**
  * @param lpSrc cast=(DWORD *)
  * @param lpCs cast=(LPCHARSETINFO)
@@ -6201,7 +4600,10 @@ public static final native boolean TranslateCharsetInfo (long /*int*/ lpSrc, int
  */
 public static final native boolean TranslateMDISysAccel (long /*int*/ hWndClient, MSG lpMsg);
 public static final native boolean TranslateMessage (MSG lpmsg);
-/** @method flags=dynamic */
+/**
+ * @param hdcDest cast=(HDC)
+ * @param hdcSrc cast=(HDC)
+ */
 public static final native boolean TransparentBlt (long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int hHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int crTransparent);
 /** @param hhk cast=(HHOOK) */
 public static final native boolean UnhookWindowsHookEx (long /*int*/ hhk);
@@ -6209,12 +4611,7 @@ public static final native boolean UnhookWindowsHookEx (long /*int*/ hhk);
  * @param lpClassName cast=(LPWSTR)
  * @param hInstance cast=(HINSTANCE)
  */
-public static final native boolean UnregisterClassW (char [] lpClassName, long /*int*/ hInstance);
-/**
- * @param lpClassName cast=(LPSTR)
- * @param hInstance cast=(HINSTANCE)
- */
-public static final native boolean UnregisterClassA (byte [] lpClassName, long /*int*/ hInstance);
+public static final native boolean UnregisterClass (char [] lpClassName, long /*int*/ hInstance);
 /**
  * @method flags=dynamic
  * @param hwnd cast=(HWND)
@@ -6223,21 +4620,15 @@ public static final native boolean UnregisterTouchWindow (long /*int*/ hwnd);
 /** @param hWnd cast=(HWND) */
 public static final native boolean UpdateWindow (long /*int*/ hWnd);
 /**
- * @param pszPath cast=(LPCSTR)
- * @param pszURL cast=(LPSTR)
- */
-public static final native int UrlCreateFromPathA (byte[] pszPath, byte[] pszURL, int[] pcchUrl, int flags);
-/**
  * @param pszPath cast=(LPCWSTR)
  * @param pszURL cast=(LPWSTR)
  */
-public static final native int UrlCreateFromPathW (char[] pszPath, char[] pszURL, int[] pcchUrl, int flags);
+public static final native int UrlCreateFromPath (char[] pszPath, char[] pszURL, int[] pcchUrl, int flags);
 /** @param hWnd cast=(HWND) */
 public static final native boolean ValidateRect (long /*int*/ hWnd, RECT lpRect);
 /** @param ch cast=(WCHAR) */
-public static final native short VkKeyScanW (short ch);
-/** @param ch cast=(TCHAR) */
-public static final native short VkKeyScanA (short ch);
+public static final native short VkKeyScan (short ch);
+
 /** @method flags=trycatch */
 public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl);
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java
index 70be31cf78..0b80d30201 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java
@@ -15,6 +15,7 @@ package org.eclipse.swt.internal.win32;
 
 public class OUTLINETEXTMETRIC {
 	public int otmSize;
+	public TEXTMETRIC otmTextMetrics = new TEXTMETRIC ();
     public byte otmFiller;
     /** @field accessor=otmPanoseNumber.bFamilyType */
 	public byte otmPanoseNumber_bFamilyType;
@@ -68,5 +69,5 @@ public class OUTLINETEXTMETRIC {
 	public long /*int*/ otmpStyleName;
     /** @field cast=(PSTR) */
 	public long /*int*/ otmpFullName;
-    public static final int sizeof = OS.IsUnicode ? OS.OUTLINETEXTMETRICW_sizeof ():  OS.OUTLINETEXTMETRICA_sizeof ();
+	public static final int sizeof = OS.OUTLINETEXTMETRIC_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICA.java
deleted file mode 100644
index 18a62fa4fb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICA.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class OUTLINETEXTMETRICA extends OUTLINETEXTMETRIC {
-	public TEXTMETRICA otmTextMetrics = new TEXTMETRICA ();
-	public static final int sizeof = OS.OUTLINETEXTMETRICA_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICW.java
deleted file mode 100644
index c8a6200900..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRICW.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class OUTLINETEXTMETRICW extends OUTLINETEXTMETRIC {
-	public TEXTMETRICW otmTextMetrics = new TEXTMETRICW ();
-	public static final int sizeof = OS.OUTLINETEXTMETRICW_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 1c956dc89c..bb97cfc16d 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
@@ -18,5 +18,7 @@ public class SHFILEINFO {
 	public long /*int*/ hIcon;
 	public int iIcon;
 	public int dwAttributes;
-	public static int sizeof = OS.IsUnicode ? OS.SHFILEINFOW_sizeof ():  OS.SHFILEINFOA_sizeof ();
+	public char [] szDisplayName = new char [OS.MAX_PATH];
+	public char [] szTypeName = new char [80];
+	public static int sizeof = OS.SHFILEINFO_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
deleted file mode 100644
index e634c1434a..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOA.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-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 = 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
deleted file mode 100644
index 48385a2721..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFOW.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-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 = OS.SHFILEINFOW_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
index c2ab70226f..4713177d63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
@@ -27,7 +27,6 @@ import java.util.Arrays;
  */
 public class TCHAR {
 	public char [] chars;
-	public byte [] bytes;
 
 public final static int sizeof = 2;
 
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 b3850dd2f7..e190d23140 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
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.win32;
 
-public abstract class TEXTMETRIC {
+public class TEXTMETRIC {
 	public int tmHeight;
 	public int tmAscent;
 	public int tmDescent;
@@ -25,10 +25,14 @@ public abstract class TEXTMETRIC {
 	public int tmOverhang;
 	public int tmDigitizedAspectX;
 	public int tmDigitizedAspectY;
+	public char tmFirstChar;
+	public char tmLastChar;
+	public char tmDefaultChar;
+	public char tmBreakChar;
 	public byte tmItalic;
 	public byte tmUnderlined;
 	public byte tmStruckOut;
 	public byte tmPitchAndFamily;
 	public byte tmCharSet;
-	public static final int sizeof = OS.IsUnicode ? OS.TEXTMETRICW_sizeof():  OS.TEXTMETRICA_sizeof ();
+	public static final int sizeof = OS.TEXTMETRIC_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
deleted file mode 100644
index 70c0b0db86..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICA.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class TEXTMETRICA extends TEXTMETRIC {
-	public byte tmFirstChar;
-	public byte tmLastChar;
-	public byte tmDefaultChar;
-	public byte tmBreakChar;
-	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
deleted file mode 100644
index 78d98cb12d..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRICW.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.win32;
-
-public class TEXTMETRICW extends TEXTMETRIC {
-	public char tmFirstChar;
-	public char tmLastChar;
-	public char tmDefaultChar;
-	public char tmBreakChar;
-	public static final int sizeof = OS.TEXTMETRICW_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
index 739b3f43f2..e84429dfd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
@@ -388,20 +388,13 @@ public PrinterData open() {
 			pd.hDevMode = hMem;
 		}
 		long /*int*/ ptr = OS.GlobalLock(hMem);
-		DEVMODE devmode = OS.IsUnicode ? (DEVMODE)new DEVMODEW () : new DEVMODEA ();
-		OS.MoveMemory(devmode, ptr, OS.IsUnicode ? OS.DEVMODEW_sizeof() : OS.DEVMODEA_sizeof());
+		DEVMODE devmode = new DEVMODE ();
+		OS.MoveMemory(devmode, ptr, DEVMODE.sizeof);
 		if (printerData.name != null) {
 			/* Copy PRINTDLG DEVNAMES into DEVMODE dmDeviceName (truncate if necessary). */
 			int max = Math.min(printerData.name.length(), OS.CCHDEVICENAME - 1);
-			if (OS.IsUnicode) {
-				for (int i = 0; i < max; i++) {
-					((DEVMODEW) devmode).dmDeviceName[i] = printerData.name.charAt(i);
-				}
-			} else {
-				byte[] bytes = printerData.name.getBytes();
-				for (int i = 0; i < max; i++) {
-					((DEVMODEA) devmode).dmDeviceName[i] = bytes[i];
-				}
+			for (int i = 0; i < max; i++) {
+				devmode.dmDeviceName[i] = printerData.name.charAt(i);
 			}
 		}
 		devmode.dmFields |= OS.DM_ORIENTATION;
@@ -422,7 +415,7 @@ public PrinterData open() {
 				default: devmode.dmDuplex = OS.DMDUP_SIMPLEX;
 			}
 		}
-		OS.MoveMemory(ptr, devmode, OS.IsUnicode ? OS.DEVMODEW_sizeof() : OS.DEVMODEA_sizeof());
+		OS.MoveMemory(ptr, devmode, DEVMODE.sizeof);
 		OS.GlobalUnlock(hMem);
 
 		pd.Flags = OS.PD_USEDEVMODECOPIESANDCOLLATE;
@@ -512,8 +505,8 @@ public PrinterData open() {
 			OS.MoveMemory(data.otherData, ptr, size);
 
 			/* Set PrinterData fields from DEVMODE */
-			devmode = OS.IsUnicode ? (DEVMODE)new DEVMODEW () : new DEVMODEA ();
-			OS.MoveMemory(devmode, ptr, OS.IsUnicode ? OS.DEVMODEW_sizeof() : OS.DEVMODEA_sizeof());
+			devmode = new DEVMODE ();
+			OS.MoveMemory(devmode, ptr, DEVMODE.sizeof);
 			if ((devmode.dmFields & OS.DM_ORIENTATION) != 0) {
 				int dmOrientation = devmode.dmOrientation;
 				data.orientation = dmOrientation == OS.DMORIENT_LANDSCAPE ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
index 90b94611c8..3f4d68bd73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
@@ -244,7 +244,7 @@ protected void create(DeviceData deviceData) {
 
 	/* Initialize DEVMODE struct fields from the printerData. */
 	if (lpInitData != 0) {
-		DEVMODE devmode = OS.IsUnicode ? (DEVMODE)new DEVMODEW () : new DEVMODEA ();
+		DEVMODE devmode = new DEVMODE ();
 		OS.MoveMemory(devmode, lpInitData, DEVMODE.sizeof);
 		devmode.dmFields |= OS.DM_ORIENTATION;
 		devmode.dmOrientation = data.orientation == PrinterData.LANDSCAPE ? OS.DMORIENT_LANDSCAPE : OS.DMORIENT_PORTRAIT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
index 5115dbb9da..82541648ee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
@@ -362,10 +362,10 @@ public boolean execute (String fileName) {
  */
 public ImageData getImageData () {
 	if (extension != null) {
-		SHFILEINFO shfi = OS.IsUnicode ? (SHFILEINFO) new SHFILEINFOW () : new SHFILEINFOA ();
+		SHFILEINFO shfi = new SHFILEINFO ();
 		int flags = OS.SHGFI_ICON | OS.SHGFI_SMALLICON | OS.SHGFI_USEFILEATTRIBUTES;
 		TCHAR pszPath = new TCHAR (0, extension, true);
-		OS.SHGetFileInfo (pszPath, OS.FILE_ATTRIBUTE_NORMAL, shfi, SHFILEINFO.sizeof, flags);
+		OS.SHGetFileInfo (pszPath.chars, OS.FILE_ATTRIBUTE_NORMAL, shfi, SHFILEINFO.sizeof, flags);
 		if (shfi.hIcon != 0) {
 			Image image = Image.win32_new (null, SWT.ICON, shfi.hIcon);
 			/* Fetch the ImageData at 100% zoom and return */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
index 267ee553c3..830fefe60a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
@@ -637,12 +637,12 @@ void showCertificate (Shell parent, long /*int*/ certificate) {
 
 	int length = OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Issuer, OS.CERT_SIMPLE_NAME_STR, null, 0);
 	TCHAR tchar = new TCHAR (0, length);
-	OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Issuer, OS.CERT_SIMPLE_NAME_STR, tchar, length);
+	OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Issuer, OS.CERT_SIMPLE_NAME_STR, tchar.chars, length);
 	String issuer = tchar.toString (0, tchar.strlen ());
 
 	length = OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Subject, OS.CERT_SIMPLE_NAME_STR, null, 0);
 	tchar = new TCHAR (0, length);
-	OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Subject, OS.CERT_SIMPLE_NAME_STR, tchar, length);
+	OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Subject, OS.CERT_SIMPLE_NAME_STR, tchar.chars, length);
 	String subject = tchar.toString (0, tchar.strlen ());
 
 	final String SEPARATOR_DATE = "/"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
index b5a4031a66..ff490b6586 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
@@ -129,7 +129,7 @@ extern int IS_JNI_1_2;
 		static int initialized = 0; \
 		static FARPROC var = NULL; \
 		if (!initialized) { \
-			HMODULE hm = LoadLibrary(name##_LIB); \
+			HMODULE hm = LoadLibraryA(name##_LIB); \
 			if (hm) var = GetProcAddress(hm, #name); \
 			initialized = 1; \
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
index d93d5b40ce..108d86b828 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
@@ -255,7 +255,7 @@ float computePoints(LOGFONT logFont, long /*int*/ hFont) {
 		 * we must subtract the internal leading, which requires a TEXTMETRIC.
 		 */
 		long /*int*/ oldFont = OS.SelectObject(hDC, hFont);
-		TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+		TEXTMETRIC lptm = new TEXTMETRIC ();
 		OS.GetTextMetrics(hDC, lptm);
 		OS.SelectObject(hDC, oldFont);
 		pixels = logFont.lfHeight - lptm.tmInternalLeading;
@@ -337,7 +337,7 @@ long /*int*/ EnumFontFamProc (long /*int*/ lpelfe, long /*int*/ lpntme, long /*i
 			pixels = newPixels;
 		}
 		LOGFONT logFont = logFonts [nFonts];
-		if (logFont == null) logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW () : new LOGFONTA ();
+		if (logFont == null) logFont = new LOGFONT ();
 		OS.MoveMemory (logFont, lpelfe, LOGFONT.sizeof);
 		logFonts [nFonts] = logFont;
 		if (logFont.lfHeight > 0) {
@@ -514,11 +514,11 @@ public FontData [] getFontList (String faceName, boolean scalable) {
 	if (lpEnumFontFamProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
 	/* Initialize the instance variables */
-	metrics = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	metrics = new TEXTMETRIC ();
 	pixels = new int[nFonts];
 	logFonts = new LOGFONT [nFonts];
 	for (int i=0; i<logFonts.length; i++) {
-		logFonts [i] = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
+		logFonts [i] = new LOGFONT ();
 	}
 	nFonts = 0;
 
@@ -537,16 +537,12 @@ public FontData [] getFontList (String faceName, boolean scalable) {
 		offset = nFonts;
 		for (int i=0; i<offset; i++) {
 			LOGFONT lf = logFonts [i];
-			if (OS.IsUnicode) {
-				OS.EnumFontFamiliesW (hDC, ((LOGFONTW)lf).lfFaceName, lpEnumFontFamProc, scalable ? 1 : 0);
-			} else {
-				OS.EnumFontFamiliesA (hDC, ((LOGFONTA)lf).lfFaceName, lpEnumFontFamProc, scalable ? 1 : 0);
-			}
+			OS.EnumFontFamilies (hDC, lf.lfFaceName, lpEnumFontFamProc, scalable ? 1 : 0);
 		}
 	} else {
 		/* Use the character encoding for the default locale */
 		TCHAR lpFaceName = new TCHAR (0, faceName, true);
-		OS.EnumFontFamilies (hDC, lpFaceName, lpEnumFontFamProc, scalable ? 1 : 0);
+		OS.EnumFontFamilies (hDC, lpFaceName.chars, lpEnumFontFamProc, scalable ? 1 : 0);
 	}
 	int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY);
 	internal_dispose_GC (hDC, null);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
index 1897698841..dce8d59ac7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
@@ -193,7 +193,7 @@ public boolean equals(Object object) {
  */
 public FontData[] getFontData() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+	LOGFONT logFont = new LOGFONT ();
 	OS.GetObject(handle, LOGFONT.sizeof, logFont);
 	return new FontData[] {FontData.win32_new(logFont, device.computePoints(logFont, handle))};
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
index 931d74f0ec..06840aad1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
@@ -82,7 +82,7 @@ public final class FontData {
  * Constructs a new uninitialized font data.
  */
 public FontData() {
-	data = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+	data = new LOGFONT ();
 	// We set the charset field so that
 	// wildcard searching will work properly
 	// out of the box
@@ -159,7 +159,7 @@ public FontData(String string) {
 
 	start = end + 1;
 	end = string.indexOf('|', start);
-	data = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+	data = new LOGFONT ();
 	data.lfCharSet = (byte)OS.DEFAULT_CHARSET;
 	setName(name);
 	setHeight(height);
@@ -173,7 +173,7 @@ public FontData(String string) {
 	String version2 = string.substring(start, end);
 
 	if (platform.equals("WINDOWS") && version2.equals("1")) {  //$NON-NLS-1$//$NON-NLS-2$
-		LOGFONT newData = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+		LOGFONT newData = new LOGFONT ();
 		try {
 			start = end + 1;
 			end = string.indexOf('|', start);
@@ -234,15 +234,8 @@ public FontData(String string) {
 			setStyle(style);
 			return;
 		}
-		TCHAR buffer = new TCHAR(0, string.substring(start), false);
-		int length = Math.min(OS.LF_FACESIZE - 1, buffer.length());
-		if (OS.IsUnicode) {
-			char[] lfFaceName = ((LOGFONTW)newData).lfFaceName;
-			System.arraycopy(buffer.chars, 0, lfFaceName, 0, length);
-		} else {
-			byte[] lfFaceName = ((LOGFONTA)newData).lfFaceName;
-			System.arraycopy(buffer.bytes, 0, lfFaceName, 0, length);
-		}
+		int length = Math.min(newData.lfFaceName.length - 1, string.length() - start);
+		string.getChars(start, start + length, newData.lfFaceName, 0);
 		data = newData;
 	}
 }
@@ -263,7 +256,7 @@ public FontData(String string) {
  */
 public FontData(String name, int height, int style) {
 	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	data = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+	data = new LOGFONT ();
 	setName(name);
 	setHeight(height);
 	setStyle(style);
@@ -275,7 +268,7 @@ public FontData(String name, int height, int style) {
 
 /*public*/ FontData(String name, float height, int style) {
 	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-	data = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+	data = new LOGFONT ();
 	setName(name);
 	setHeight(height);
 	setStyle(style);
@@ -421,14 +414,7 @@ public String getLocale () {
  * @see #setName
  */
 public String getName() {
-	char[] chars;
-	if (OS.IsUnicode) {
-		chars = ((LOGFONTW)data).lfFaceName;
-	} else {
-		chars = new char[OS.LF_FACESIZE];
-		byte[] bytes = ((LOGFONTA)data).lfFaceName;
-		OS.MultiByteToWideChar (OS.CP_ACP, OS.MB_PRECOMPOSED, bytes, bytes.length, chars, chars.length);
-	}
+	char[] chars = data.lfFaceName;
 	int index = 0;
 	while (index < chars.length) {
 		if (chars [index] == 0) break;
@@ -571,17 +557,10 @@ public void setName(String name) {
 	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 
 	/* The field lfFaceName must be NULL terminated */
-	TCHAR buffer = new TCHAR(0, name, true);
-	int length = Math.min(OS.LF_FACESIZE - 1, buffer.length());
-	if (OS.IsUnicode) {
-		char[] lfFaceName = ((LOGFONTW)data).lfFaceName;
-		for (int i = 0; i < lfFaceName.length; i++) lfFaceName[i] = 0;
-		System.arraycopy(buffer.chars, 0, lfFaceName, 0, length);
-	} else {
-		byte[] lfFaceName = ((LOGFONTA)data).lfFaceName;
-		for (int i = 0; i < lfFaceName.length; i++) lfFaceName[i] = 0;
-		System.arraycopy(buffer.bytes, 0, lfFaceName, 0, length);
-	}
+	char[] lfFaceName = data.lfFaceName;
+	int length = Math.min(lfFaceName.length - 1, name.length());
+	name.getChars (0, length, lfFaceName, 0);
+	for (int i = length; i < lfFaceName.length; i++) lfFaceName[i] = 0;
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index 2842ef5971..089f7b36de 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -539,20 +539,13 @@ static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /*
 	long /*int*/ family = 0;
 	if (!Gdip.Font_IsAvailable(font)) {
 		Gdip.Font_delete(font);
-		LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+		LOGFONT logFont = new LOGFONT ();
 		OS.GetObject(hFont, LOGFONT.sizeof, logFont);
 		int size = Math.abs(logFont.lfHeight);
 		int style = Gdip.FontStyleRegular;
 		if (logFont.lfWeight == 700) style |= Gdip.FontStyleBold;
 		if (logFont.lfItalic != 0) style |= Gdip.FontStyleItalic;
-		char[] chars;
-		if (OS.IsUnicode) {
-			chars = ((LOGFONTW)logFont).lfFaceName;
-		} else {
-			chars = new char[OS.LF_FACESIZE];
-			byte[] bytes = ((LOGFONTA)logFont).lfFaceName;
-			OS.MultiByteToWideChar (OS.CP_ACP, OS.MB_PRECOMPOSED, bytes, bytes.length, chars, chars.length);
-		}
+		char[] chars = logFont.lfFaceName;
 		int index = 0;
 		while (index < chars.length) {
 			if (chars [index] == 0) break;
@@ -582,9 +575,9 @@ static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /*
 		}
 		if (outFont != null && font != 0) {
 			long /*int*/ hHeap = OS.GetProcessHeap();
-			long /*int*/ pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONTW.sizeof);
+			long /*int*/ pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof);
 			Gdip.Font_GetLogFontW(font, graphics, pLogFont);
-			outFont[0] = OS.CreateFontIndirectW(pLogFont);
+			outFont[0] = OS.CreateFontIndirect(pLogFont);
 			OS.HeapFree(hHeap, 0, pLogFont);
 		}
 	}
@@ -2122,7 +2115,7 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) {
 	if ((data.style & SWT.MIRRORED) != 0) {
 		if (!isTransparent) {
 			size = new SIZE();
-			OS.GetTextExtentPoint32W(handle, buffer, length, size);
+			OS.GetTextExtentPoint32(handle, buffer, length, size);
 			rect = new RECT ();
 			rect.left = x;
 			rect.right = x + size.cx;
@@ -2133,13 +2126,13 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) {
 		x--;
 	}
 	if (OS.GetROP2(handle) != OS.R2_XORPEN) {
-		OS.ExtTextOutW(handle, x, y, flags, rect, buffer, length, null);
+		OS.ExtTextOut(handle, x, y, flags, rect, buffer, length, null);
 	} else {
 		int foreground = OS.GetTextColor(handle);
 		if (isTransparent) {
 			if (size == null) {
 				size = new SIZE();
-				OS.GetTextExtentPoint32W(handle, buffer, length, size);
+				OS.GetTextExtentPoint32(handle, buffer, length, size);
 			}
 			int width = size.cx, height = size.cy;
 			long /*int*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height);
@@ -2150,7 +2143,7 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) {
 			OS.SetBkMode(memDC, OS.TRANSPARENT);
 			OS.SetTextColor(memDC, foreground);
 			OS.SelectObject(memDC, OS.GetCurrentObject(handle, OS.OBJ_FONT));
-			OS.ExtTextOutW(memDC, 0, 0, 0, null, buffer, length, null);
+			OS.ExtTextOut(memDC, 0, 0, 0, null, buffer, length, null);
 			OS.BitBlt(handle, x, y, width, height, memDC, 0, 0, OS.SRCINVERT);
 			OS.SelectObject(memDC, hOldBitmap);
 			OS.DeleteDC(memDC);
@@ -2158,7 +2151,7 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) {
 		} else {
 			int background = OS.GetBkColor(handle);
 			OS.SetTextColor(handle, foreground ^ background);
-			OS.ExtTextOutW(handle, x, y, flags, rect, buffer, length, null);
+			OS.ExtTextOut(handle, x, y, flags, rect, buffer, length, null);
 			OS.SetTextColor(handle, foreground);
 		}
 	}
@@ -2323,7 +2316,7 @@ void drawTextInPixels (String string, int x, int y, int flags) {
 
 boolean useGDIP (long /*int*/ hdc, char[] buffer) {
 	short[] glyphs = new short[buffer.length];
-	OS.GetGlyphIndicesW(hdc, buffer, buffer.length, glyphs, OS.GGI_MARK_NONEXISTING_GLYPHS);
+	OS.GetGlyphIndices(hdc, buffer, buffer.length, glyphs, OS.GGI_MARK_NONEXISTING_GLYPHS);
 	for (int i = 0; i < glyphs.length; i++) {
 		if (glyphs [i] == -1) {
 			switch (buffer[i]) {
@@ -2348,7 +2341,7 @@ void drawText(long /*int*/ gdipGraphics, String string, int x, int y, int flags,
 	if (hFont == 0 && data.font != null) hFont = data.font.handle;
 	long /*int*/ oldFont = 0;
 	if (hFont != 0) oldFont = OS.SelectObject(hdc, hFont);
-	TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	TEXTMETRIC lptm = new TEXTMETRIC();
 	OS.GetTextMetrics(hdc, lptm);
 	boolean gdip = useGDIP(hdc, chars);
 	if (hFont != 0) OS.SelectObject(hdc, oldFont);
@@ -2444,7 +2437,7 @@ RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length,
 		buffer = temp;
 	}
 	if ((data.style & SWT.MIRRORED) != 0) OS.SetLayout(hdc, OS.GetLayout(hdc) | OS.LAYOUT_RTL);
-	OS.GetCharacterPlacementW(hdc, buffer, length, 0, result, dwFlags);
+	OS.GetCharacterPlacement(hdc, buffer, length, 0, result, dwFlags);
 	if ((data.style & SWT.MIRRORED) != 0) OS.SetLayout(hdc, OS.GetLayout(hdc) & ~OS.LAYOUT_RTL);
 	if (hFont != 0) OS.SelectObject(hdc, oldFont);
 	Gdip.Graphics_ReleaseHDC(gdipGraphics, hdc);
@@ -3267,10 +3260,10 @@ public int getCharWidth(char ch) {
 	}
 
 	/* It wasn't a truetype font */
-	TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	TEXTMETRIC lptm = new TEXTMETRIC();
 	OS.GetTextMetrics(handle, lptm);
 	SIZE size = new SIZE();
-	OS.GetTextExtentPoint32W(handle, new char[]{ch}, 1, size);
+	OS.GetTextExtentPoint32(handle, new char[]{ch}, 1, size);
 	return size.cx - lptm.tmOverhang;
 }
 
@@ -3441,7 +3434,7 @@ public Font getFont () {
 public FontMetrics getFontMetrics() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	checkGC(FONT);
-	TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	TEXTMETRIC lptm = new TEXTMETRIC();
 	OS.GetTextMetrics(handle, lptm);
 	return FontMetrics.win32_new(lptm);
 }
@@ -4902,13 +4895,13 @@ Point stringExtentInPixels (String string) {
 	SIZE size = new SIZE();
 	if (length == 0) {
 //		OS.GetTextExtentPoint32(handle, SPACE, SPACE.length(), size);
-		OS.GetTextExtentPoint32W(handle, new char[]{' '}, 1, size);
+		OS.GetTextExtentPoint32(handle, new char[]{' '}, 1, size);
 		return new Point(0, size.cy);
 	} else {
 //		TCHAR buffer = new TCHAR (getCodePage(), string, false);
 		char[] buffer = new char [length];
 		string.getChars(0, length, buffer, 0);
-		OS.GetTextExtentPoint32W(handle, buffer, length, size);
+		OS.GetTextExtentPoint32(handle, buffer, length, size);
 		return new Point(size.cx, size.cy);
 	}
 }
@@ -4983,8 +4976,7 @@ Point textExtentInPixels(String string, int flags) {
 	}
 	if (string.length () == 0) {
 		SIZE size = new SIZE();
-//		OS.GetTextExtentPoint32(handle, SPACE, SPACE.length(), size);
-		OS.GetTextExtentPoint32W(handle, new char [] {' '}, 1, size);
+		OS.GetTextExtentPoint32(handle, new char [] {' '}, 1, size);
 		return new Point(0, size.cy);
 	}
 	RECT rect = new RECT();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
index 4f5cb30248..e3c730ca8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -409,7 +409,7 @@ void computeRuns (GC gc) {
 		if (run.lineBreak || i == allRuns.length - 1) {
 			/* Update the run metrics if the last run is a hard break. */
 			if (lineRunCount == 1 && (i == allRuns.length - 1 || !run.softBreak)) {
-				TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+				TEXTMETRIC lptm = new TEXTMETRIC();
 				OS.SelectObject(srcHdc, getItemFont(run));
 				OS.GetTextMetrics(srcHdc, lptm);
 				run.ascentInPoints = DPIUtil.autoScaleDown(getDevice(), lptm.tmAscent);
@@ -1977,7 +1977,7 @@ public FontMetrics getLineMetrics (int lineIndex) {
 	if (!(0 <= lineIndex && lineIndex < runs.length)) SWT.error(SWT.ERROR_INVALID_RANGE);
 	long /*int*/ hDC = device.internal_new_GC(null);
 	long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC);
-	TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	TEXTMETRIC lptm = new TEXTMETRIC();
 	OS.SelectObject(srcHdc, font != null ? font.handle : device.systemFont.handle);
 	OS.GetTextMetrics(srcHdc, lptm);
 	OS.DeleteDC(srcHdc);
@@ -3510,7 +3510,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 			OS.EnumEnhMetaFile(0, metaFile, address, 0, null);
 			OS.DeleteEnhMetaFile(metaFile);
 			callback.dispose();
-			newFont = OS.CreateFontIndirectW(emr.elfw.elfLogFont);
+			newFont = OS.CreateFontIndirect(emr.elfw.elfLogFont);
 		} else {
 			/*
 			* The run is composed only by white spaces, this happens when a run is split
@@ -3525,7 +3525,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 						StyleItem pRun = allRuns[index - 1];
 						if (pRun.analysis.eScript == run.analysis.eScript) {
 							long /*int*/ pFont = getItemFont(pRun);
-							LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+							LOGFONT logFont = new LOGFONT ();
 							OS.GetObject(pFont, LOGFONT.sizeof, logFont);
 							newFont = OS.CreateFontIndirect(logFont);
 						}
@@ -3537,7 +3537,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 								OS.SelectObject(hdc, getItemFont(nRun));
 								shape(hdc, nRun);
 								long /*int*/ nFont = getItemFont(nRun);
-								LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
+								LOGFONT logFont = new LOGFONT ();
 								OS.GetObject(nFont, LOGFONT.sizeof, logFont);
 								newFont = OS.CreateFontIndirect(logFont);
 							}
@@ -3572,7 +3572,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 				OS.VtblCall(4, mLangFontLink2, chars, chars.length, 0, dwCodePages, cchCodePages);
 				/* MapFont() */
 				if (OS.VtblCall(10, mLangFontLink2, hdc, dwCodePages[0], chars[0], hNewFont) == OS.S_OK) {
-					LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW () : new LOGFONTA ();
+					LOGFONT logFont = new LOGFONT ();
 					OS.GetObject(hNewFont[0], LOGFONT.sizeof, logFont);
 					/* ReleaseFont() */
 					OS.VtblCall(8, mLangFontLink2, hNewFont[0]);
@@ -3611,7 +3611,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 	if (style != null) {
 		OUTLINETEXTMETRIC lotm = null;
 		if (style.underline || style.strikeout) {
-			lotm = OS.IsUnicode ? (OUTLINETEXTMETRIC)new OUTLINETEXTMETRICW() : new OUTLINETEXTMETRICA();
+			lotm = new OUTLINETEXTMETRIC();
 			if (OS.GetOutlineTextMetrics(hdc, OUTLINETEXTMETRIC.sizeof, lotm) == 0) {
 				lotm = null;
 			}
@@ -3630,9 +3630,9 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 		} else {
 			TEXTMETRIC lptm = null;
 			if (lotm != null) {
-				lptm = OS.IsUnicode ? (TEXTMETRIC)((OUTLINETEXTMETRICW)lotm).otmTextMetrics : ((OUTLINETEXTMETRICA)lotm).otmTextMetrics;
+				lptm = lotm.otmTextMetrics;
 			} else {
-				lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+				lptm = new TEXTMETRIC();
 				OS.GetTextMetrics(hdc, lptm);
 			}
 			run.ascentInPoints = DPIUtil.autoScaleDown(getDevice(), lptm.tmAscent);
@@ -3653,7 +3653,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) {
 		run.ascentInPoints += style.rise;
 		run.descentInPoints -= style.rise;
 	} else {
-		TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+		TEXTMETRIC lptm = new TEXTMETRIC();
 		OS.GetTextMetrics(hdc, lptm);
 		run.ascentInPoints = DPIUtil.autoScaleDown(getDevice(), lptm.tmAscent);
 		run.descentInPoints = DPIUtil.autoScaleDown(getDevice(), lptm.tmDescent);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
index a14fe35802..9c9c31e6b2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
@@ -151,7 +151,7 @@ public static void drawGlyphs(GC gc, char[] renderBuffer, int[] renderDx, int x,
 	}
 	// render transparently to avoid overlapping segments. fixes bug 40006
 	int oldBkMode = OS.SetBkMode(gc.handle, OS.TRANSPARENT);
-	OS.ExtTextOutW(gc.handle, x, y, ETO_GLYPH_INDEX , null, renderBuffer, renderBuffer.length, renderDx);
+	OS.ExtTextOut(gc.handle, x, y, ETO_GLYPH_INDEX , null, renderBuffer, renderBuffer.length, renderDx);
 	OS.SetBkMode(gc.handle, oldBkMode);
 }
 /**
@@ -527,18 +527,18 @@ public static int resolveTextDirection (String text) {
 	for (int i = 0; i < length; i++) {
 		char ch = text.charAt(i);
 		rtlProbe[0] = ch;
-		OS.GetCharacterPlacementW(hdc, rtlProbe, rtlProbe.length, 0, result, OS.GCP_REORDER);
+		OS.GetCharacterPlacement(hdc, rtlProbe, rtlProbe.length, 0, result, OS.GCP_REORDER);
 		OS.MoveMemory(order, result.lpOrder, 4);
 		if (order[0] == 2) {
 			textDirection = SWT.RIGHT_TO_LEFT;
 			break;
 		}
 		ltrProbe[2] = ch;
-		OS.GetCharacterPlacementW(hdc, ltrProbe, ltrProbe.length, 0, result, OS.GCP_REORDER);
+		OS.GetCharacterPlacement(hdc, ltrProbe, ltrProbe.length, 0, result, OS.GCP_REORDER);
 		OS.MoveMemory(order, result.lpOrder + 4, 4);
 		if (order[0] == 1) {
 			numberProbe[2] = ch;
-			OS.GetCharacterPlacementW(hdc, numberProbe, numberProbe.length, 0, result, OS.GCP_REORDER);
+			OS.GetCharacterPlacement(hdc, numberProbe, numberProbe.length, 0, result, OS.GCP_REORDER);
 			OS.MoveMemory(order, result.lpOrder, 4);
 			if (order[0] == 0) {
 				textDirection = SWT.LEFT_TO_RIGHT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
index 683124f205..166c532d33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
@@ -355,7 +355,7 @@ int computeLeftMargin () {
 				long /*int*/ hDC = OS.GetDC (handle);
 				long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 				if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-				TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+				TEXTMETRIC lptm = new TEXTMETRIC ();
 				OS.GetTextMetrics (hDC, lptm);
 				int length = text.length ();
 				if (length == 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
index e54b15371f..2e2be436dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
@@ -497,11 +497,11 @@ void setIMEFont () {
 	long /*int*/ hIMC = OS.ImmGetContext (hwnd);
 	/* Save the current IME font */
 	if (oldFont == null) {
-		oldFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
+		oldFont = new LOGFONT ();
 		if (!OS.ImmGetCompositionFont (hIMC, oldFont)) oldFont = null;
 	}
 	/* Set new IME font */
-	LOGFONT logFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
+	LOGFONT logFont = new LOGFONT ();
 	if (OS.GetObject (hFont, LOGFONT.sizeof, logFont) != 0) {
 		OS.ImmSetCompositionFont (hIMC, logFont);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
index 1f6d201cfd..489f706544 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -1935,16 +1935,9 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			display.lockActiveWindow = false;
 			break;
 		}
-		case OS.TTN_GETDISPINFOA:
-		case OS.TTN_GETDISPINFOW: {
-			NMTTDISPINFO lpnmtdi;
-			if (hdr.code == OS.TTN_GETDISPINFOA) {
-				lpnmtdi = new NMTTDISPINFOA ();
-				OS.MoveMemory ((NMTTDISPINFOA)lpnmtdi, lParam, NMTTDISPINFOA.sizeof);
-			} else {
-				lpnmtdi = new NMTTDISPINFOW ();
-				OS.MoveMemory ((NMTTDISPINFOW)lpnmtdi, lParam, NMTTDISPINFOW.sizeof);
-			}
+		case OS.TTN_GETDISPINFO: {
+			NMTTDISPINFO lpnmtdi = new NMTTDISPINFO ();
+			OS.MoveMemory (lpnmtdi, lParam, NMTTDISPINFO.sizeof);
 			String string = toolTipText (lpnmtdi);
 			if (string != null) {
 				Shell shell = getShell ();
@@ -1986,16 +1979,8 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 						lpnmtdi.uFlags &= ~OS.TTF_RTLREADING;
 					}
 				}
-
-				if (hdr.code == OS.TTN_GETDISPINFOA) {
-					byte [] bytes = new byte [chars.length * 2];
-					OS.WideCharToMultiByte (getCodePage (), 0, chars, chars.length, bytes, bytes.length, null, null);
-					shell.setToolTipText (lpnmtdi, bytes);
-					OS.MoveMemory (lParam, (NMTTDISPINFOA)lpnmtdi, NMTTDISPINFOA.sizeof);
-				} else {
-					shell.setToolTipText (lpnmtdi, chars);
-					OS.MoveMemory (lParam, (NMTTDISPINFOW)lpnmtdi, NMTTDISPINFOW.sizeof);
-				}
+				shell.setToolTipText (lpnmtdi, chars);
+				OS.MoveMemory (lParam, lpnmtdi, NMTTDISPINFO.sizeof);
 				return LRESULT.ZERO;
 			}
 			break;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java
index 8913fbad64..4cf84ac2cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -111,8 +111,7 @@ long /*int*/ BrowseCallbackProc (long /*int*/ hwnd, long /*int*/ uMsg, long /*in
 				OS.SetWindowText (hwnd, buffer);
 			}
 			break;
-		case OS.BFFM_VALIDATEFAILEDA:
-		case OS.BFFM_VALIDATEFAILEDW:
+		case OS.BFFM_VALIDATEFAILED:
 			/* Use the character encoding for the default locale */
 			int length = OS.wcslen (lParam);
 			TCHAR buffer = new TCHAR (0, length);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 2d2e705ec3..9ae48a25ef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -1789,14 +1789,7 @@ public Control getFocusControl () {
 }
 
 String getFontName (LOGFONT logFont) {
-	char[] chars;
-	if (OS.IsUnicode) {
-		chars = ((LOGFONTW)logFont).lfFaceName;
-	} else {
-		chars = new char[OS.LF_FACESIZE];
-		byte[] bytes = ((LOGFONTA)logFont).lfFaceName;
-		OS.MultiByteToWideChar (OS.CP_ACP, OS.MB_PRECOMPOSED, bytes, bytes.length, chars, chars.length);
-	}
+	char[] chars = logFont.lfFaceName;
 	int index = 0;
 	while (index < chars.length) {
 		if (chars [index] == 0) break;
@@ -2366,10 +2359,10 @@ public Font getSystemFont () {
 	checkDevice ();
 	if (systemFont != null) return systemFont;
 	long /*int*/ hFont = 0;
-	NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
+	NONCLIENTMETRICS info = new NONCLIENTMETRICS ();
 	info.cbSize = NONCLIENTMETRICS.sizeof;
 	if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
-		LOGFONT logFont = OS.IsUnicode ? (LOGFONT) ((NONCLIENTMETRICSW)info).lfMessageFont : ((NONCLIENTMETRICSA)info).lfMessageFont;
+		LOGFONT logFont = info.lfMessageFont;
 		hFont = OS.CreateFontIndirect (logFont);
 		lfSystemFont = hFont != 0 ? logFont : null;
 	}
@@ -4070,10 +4063,10 @@ void saveResources () {
 		resources = newResources;
 	}
 	if (systemFont != null) {
-		NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
+		NONCLIENTMETRICS info = new NONCLIENTMETRICS ();
 		info.cbSize = NONCLIENTMETRICS.sizeof;
 		if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
-			LOGFONT logFont = OS.IsUnicode ? (LOGFONT) ((NONCLIENTMETRICSW)info).lfMessageFont : ((NONCLIENTMETRICSA)info).lfMessageFont;
+			LOGFONT logFont = info.lfMessageFont;
 			if (lfSystemFont == null ||
 				logFont.lfCharSet != lfSystemFont.lfCharSet ||
 				logFont.lfHeight != lfSystemFont.lfHeight ||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
index 5031230dc7..90f8ee42d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
@@ -145,10 +145,10 @@ static int checkStyle (int style) {
 				if (hFont != 0) {
 					hCurrentFont = hFont;
 				} else {
-					NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
+					NONCLIENTMETRICS info = new NONCLIENTMETRICS ();
 					info.cbSize = NONCLIENTMETRICS.sizeof;
 					if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
-						LOGFONT logFont = OS.IsUnicode ? (LOGFONT) ((NONCLIENTMETRICSW)info).lfCaptionFont : ((NONCLIENTMETRICSA)info).lfCaptionFont;
+						LOGFONT logFont = info.lfCaptionFont;
 						hCurrentFont = OS.CreateFontIndirect (logFont);
 					}
 				}
@@ -273,10 +273,10 @@ void drawWidget (GC gc, RECT clipRect) {
 		if (hFont != 0) {
 			hCurrentFont = hFont;
 		} else {
-			NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
+			NONCLIENTMETRICS info = new NONCLIENTMETRICS ();
 			info.cbSize = NONCLIENTMETRICS.sizeof;
 			if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
-				LOGFONT logFont = OS.IsUnicode ? (LOGFONT) ((NONCLIENTMETRICSW)info).lfCaptionFont : ((NONCLIENTMETRICSA)info).lfCaptionFont;
+				LOGFONT logFont = info.lfCaptionFont;
 				hCurrentFont = OS.CreateFontIndirect (logFont);
 			}
 		}
@@ -314,7 +314,7 @@ Control findThemeControl () {
 int getBandHeight () {
 	long /*int*/ hDC = OS.GetDC (handle);
 	long /*int*/ oldHFont = OS.SelectObject (hDC, hFont == 0 ? defaultFont () : hFont);
-	TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
+	TEXTMETRIC lptm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, lptm);
 	OS.SelectObject (hDC, oldHFont);
 	OS.ReleaseDC (handle, hDC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
index 1ee4245968..b9512fcd6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
@@ -202,7 +202,7 @@ void drawItem (GC gc, long /*int*/ hTheme, RECT clipRect, boolean drawFocus) {
 	if (text.length () > 0) {
 		rect.left += ExpandItem.TEXT_INSET;
 		TCHAR buffer;
-		if (OS.IsUnicode && (style & SWT.FLIP_TEXT_DIRECTION) != 0) {
+		if ((style & SWT.FLIP_TEXT_DIRECTION) != 0) {
 			int bits  = OS.GetWindowLong (parent.handle, OS.GWL_EXSTYLE);
 			if ((bits & OS.WS_EX_LAYOUTRTL) != 0) {
 				buffer = new TCHAR (parent.getCodePage (), LRE + text, false);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
index 5488c58535..2728b9f2dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
@@ -236,7 +236,7 @@ public FontData open () {
 
 	/* Compute the result */
 	if (success) {
-		LOGFONT logFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
+		LOGFONT logFont = new LOGFONT ();
 		OS.MoveMemory (logFont, lpLogFont, LOGFONT.sizeof);
 
 		/*
@@ -257,7 +257,7 @@ public FontData open () {
 			 */
 			long /*int*/ hFont = OS.CreateFontIndirect(logFont);
 			long /*int*/ oldFont = OS.SelectObject(hDC, hFont);
-			TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+			TEXTMETRIC lptm = new TEXTMETRIC ();
 			OS.GetTextMetrics(hDC, lptm);
 			OS.SelectObject(hDC, oldFont);
 			OS.DeleteObject(hFont);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
index b9e8d92b28..a337b61415 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
@@ -172,7 +172,7 @@ protected void checkSubclass () {
 	long /*int*/ hDC = OS.GetDC (handle);
 	newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 	if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-	TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+	TEXTMETRIC tm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, tm);
 	if (newFont != 0) OS.SelectObject (hDC, oldFont);
 	OS.ReleaseDC (handle, hDC);
@@ -248,7 +248,7 @@ String fixText (boolean enabled) {
 	long /*int*/ hDC = OS.GetDC (handle);
 	newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 	if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-	TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+	TEXTMETRIC tm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, tm);
 	if (newFont != 0) OS.SelectObject (hDC, oldFont);
 	OS.ReleaseDC (handle, hDC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index d7ae2bf378..fbfe3348ea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
@@ -167,7 +167,7 @@ static int checkStyle (int style) {
 		long /*int*/ oldFont = OS.SelectObject (hDC, newFont);
 		int length = OS.GetWindowTextLength (handle);
 		if (length == 0) {
-			TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+			TEXTMETRIC tm = new TEXTMETRIC ();
 			OS.GetTextMetrics (hDC, tm);
 			height = Math.max (height, tm.tmHeight);
 		} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
index dbe666d603..864648f903 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
@@ -188,7 +188,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo
 			width = rect.right - rect.left;
 			height = rect.bottom;
 		} else {
-			TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW () : new TEXTMETRICA ();
+			TEXTMETRIC lptm = new TEXTMETRIC ();
 			OS.GetTextMetrics (hDC, lptm);
 			width = 0;
 			height = lptm.tmHeight;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
index 036d56650c..d2be79f253 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
@@ -1852,22 +1852,6 @@ void setToolTipText (long /*int*/ hwnd, String text) {
 	}
 }
 
-void setToolTipText (NMTTDISPINFO lpnmtdi, byte [] buffer) {
-	/*
-	* Ensure that the current position of the mouse
-	* is inside the client area of the shell.  This
-	* prevents tool tips from popping up over the
-	* shell trimmings.
-	*/
-	if (!hasCursor ()) return;
-	long /*int*/ hHeap = OS.GetProcessHeap ();
-	if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip);
-	int byteCount = buffer.length;
-	lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
-	OS.MoveMemory (lpstrTip, buffer, byteCount);
-	lpnmtdi.lpszText = lpstrTip;
-}
-
 void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) {
 	/*
 	* Ensure that the current position of the mouse
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
index a734b76537..b55fac8859 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
@@ -298,7 +298,7 @@ long /*int*/ borderHandle () {
 		long /*int*/ hDC = OS.GetDC (hwndText);
 		newFont = OS.SendMessage (hwndText, OS.WM_GETFONT, 0, 0);
 		if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-		TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+		TEXTMETRIC tm = new TEXTMETRIC ();
 		OS.GetTextMetrics (hDC, tm);
 		height = tm.tmHeight;
 		RECT rect = new RECT ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index f138eb7d8e..3554e74ff8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -4275,7 +4275,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
 	OS.FillRect (memDC, rect, hBrush);
 	OS.DeleteObject (hBrush);
 	long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ());
-	TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+	TEXTMETRIC tm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, tm);
 	OS.SelectObject (hDC, oldFont);
 	int itemWidth = Math.min (tm.tmHeight, width);
@@ -5718,8 +5718,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /
 				switch (hdr.code) {
 					case OS.TTN_SHOW:
 					case OS.TTN_POP:
-					case OS.TTN_GETDISPINFOA:
-					case OS.TTN_GETDISPINFOW:
+					case OS.TTN_GETDISPINFO:
 						return OS.SendMessage (handle, msg, wParam, lParam);
 				}
 				break;
@@ -6538,8 +6537,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 @Override
 LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	switch (hdr.code) {
-		case OS.LVN_ODFINDITEMA:
-		case OS.LVN_ODFINDITEMW: {
+		case OS.LVN_ODFINDITEM: {
 			if ((style & SWT.VIRTUAL) != 0) return new LRESULT (-1);
 			break;
 		}
@@ -6555,8 +6553,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.LVN_GETDISPINFOA:
-		case OS.LVN_GETDISPINFOW: {
+		case OS.LVN_GETDISPINFO: {
 //			if (drawCount != 0 || !OS.IsWindowVisible (handle)) break;
 			NMLVDISPINFO plvfi = new NMLVDISPINFO ();
 			OS.MoveMemory (plvfi, lParam, NMLVDISPINFO.sizeof);
@@ -6875,10 +6872,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	* both.
 	*/
 	switch (hdr.code) {
-		case OS.HDN_BEGINTRACKW:
-		case OS.HDN_BEGINTRACKA:
-		case OS.HDN_DIVIDERDBLCLICKW:
-		case OS.HDN_DIVIDERDBLCLICKA: {
+		case OS.HDN_BEGINTRACK:
+		case OS.HDN_DIVIDERDBLCLICK: {
 			if (columnCount == 0) return LRESULT.ONE;
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
@@ -6887,13 +6882,11 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 				return LRESULT.ONE;
 			}
 			ignoreColumnMove = true;
-			switch (hdr.code) {
-				case OS.HDN_DIVIDERDBLCLICKW:
-				case OS.HDN_DIVIDERDBLCLICKA:
-					if (column != null && hooks (SWT.MeasureItem)) {
-						column.pack ();
-						return LRESULT.ONE;
-					}
+			if (hdr.code == OS.HDN_DIVIDERDBLCLICK) {
+				if (column != null && hooks (SWT.MeasureItem)) {
+					column.pack ();
+					return LRESULT.ONE;
+				}
 			}
 			break;
 		}
@@ -7100,8 +7093,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMCHANGEDW:
-		case OS.HDN_ITEMCHANGEDA: {
+		case OS.HDN_ITEMCHANGED: {
 			/*
 			* Bug in Windows.  When a table has the LVS_EX_GRIDLINES extended
 			* style and the user drags any column over the first column in the
@@ -7157,8 +7149,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMDBLCLICKW:
-		case OS.HDN_ITEMDBLCLICKA: {
+		case OS.HDN_ITEMDBLCLICK: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			TableColumn column = columns [phdn.iItem];
@@ -7182,8 +7173,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.TTN_GETDISPINFOA:
-		case OS.TTN_GETDISPINFOW:
+		case OS.TTN_GETDISPINFO:
 		case OS.TTN_SHOW: {
 			LRESULT result = super.wmNotify (hdr, wParam, lParam);
 			if (result != null) return result;
@@ -7225,21 +7215,11 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 							int width = toolRect.right - toolRect.left, height = toolRect.bottom - toolRect.top;
 							OS.SetWindowPos (hwndToolTip, 0, toolRect.left , toolRect.top, width, height, flags);
 						} else {
-							NMTTDISPINFO lpnmtdi = null;
-							if (hdr.code == OS.TTN_GETDISPINFOA) {
-								lpnmtdi = new NMTTDISPINFOA ();
-								OS.MoveMemory ((NMTTDISPINFOA)lpnmtdi, lParam, NMTTDISPINFOA.sizeof);
-								if (lpnmtdi.lpszText != 0) {
-									OS.MoveMemory (lpnmtdi.lpszText, new byte [1], 1);
-									OS.MoveMemory (lParam, (NMTTDISPINFOA)lpnmtdi, NMTTDISPINFOA.sizeof);
-								}
-							} else {
-								lpnmtdi = new NMTTDISPINFOW ();
-								OS.MoveMemory ((NMTTDISPINFOW)lpnmtdi, lParam, NMTTDISPINFOW.sizeof);
-								if (lpnmtdi.lpszText != 0) {
-									OS.MoveMemory (lpnmtdi.lpszText, new char [1], 2);
-									OS.MoveMemory (lParam, (NMTTDISPINFOW)lpnmtdi, NMTTDISPINFOW.sizeof);
-								}
+							NMTTDISPINFO lpnmtdi = new NMTTDISPINFO ();
+							OS.MoveMemory (lpnmtdi, lParam, NMTTDISPINFO.sizeof);
+							if (lpnmtdi.lpszText != 0) {
+								OS.MoveMemory (lpnmtdi.lpszText, new char [1], 2);
+								OS.MoveMemory (lParam, lpnmtdi, NMTTDISPINFO.sizeof);
 							}
 							RECT cellRect = item.getBounds (pinfo.iItem, pinfo.iSubItem, true, true, true, true, hDC);
 							RECT clientRect = new RECT ();
@@ -7258,15 +7238,8 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 									Shell shell = getShell ();
 									char [] chars = new char [string.length () + 1];
 									string.getChars (0, string.length (), chars, 0);
-									if (hdr.code == OS.TTN_GETDISPINFOA) {
-										byte [] bytes = new byte [chars.length * 2];
-										OS.WideCharToMultiByte (getCodePage (), 0, chars, chars.length, bytes, bytes.length, null, null);
-										shell.setToolTipText (lpnmtdi, bytes);
-										OS.MoveMemory (lParam, (NMTTDISPINFOA)lpnmtdi, NMTTDISPINFOA.sizeof);
-									} else {
-										shell.setToolTipText (lpnmtdi, chars);
-										OS.MoveMemory (lParam, (NMTTDISPINFOW)lpnmtdi, NMTTDISPINFOW.sizeof);
-									}
+									shell.setToolTipText (lpnmtdi, chars);
+									OS.MoveMemory (lParam, lpnmtdi, NMTTDISPINFO.sizeof);
 								}
 							}
 						}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
index 783f0c23d9..700b0e99e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
@@ -520,10 +520,10 @@ void updateText () {
 	TCHAR buffer = new TCHAR (shell.getCodePage (), overlayText, false);
 	int length = buffer.length();
 	long /*int*/ hFont = 0, oldHFont = 0;
-	NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
+	NONCLIENTMETRICS info = new NONCLIENTMETRICS ();
 	info.cbSize = NONCLIENTMETRICS.sizeof;
 	if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
-		LOGFONT logFont = OS.IsUnicode ? (LOGFONT) ((NONCLIENTMETRICSW)info).lfMessageFont : ((NONCLIENTMETRICSA)info).lfMessageFont;
+		LOGFONT logFont = info.lfMessageFont;
 		logFont.lfHeight = -10;
 		hFont = OS.CreateFontIndirect (logFont);
 		oldHFont = OS.SelectObject (dstHdc, hFont);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
index f9ed988480..6b1cffd8fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
@@ -641,7 +641,7 @@ public void clearSelection () {
 		long /*int*/ hDC = OS.GetDC (handle);
 		newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 		if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-		TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+		TEXTMETRIC tm = new TEXTMETRIC ();
 		OS.GetTextMetrics (hDC, tm);
 		int count = (style & SWT.SINGLE) != 0 ? 1 : (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0);
 		height = count * tm.tmHeight;
@@ -1128,7 +1128,7 @@ int getLineHeightInPixels () {
 	long /*int*/ hDC = OS.GetDC (handle);
 	newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 	if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-	TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+	TEXTMETRIC tm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, tm);
 	if (newFont != 0) OS.SelectObject (hDC, oldFont);
 	OS.ReleaseDC (handle, hDC);
@@ -1839,7 +1839,7 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags) {
 			long /*int*/ hDC = OS.GetDC (handle);
 			newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 			if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
-			TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+			TEXTMETRIC tm = new TEXTMETRIC ();
 			OS.GetTextMetrics (hDC, tm);
 			if (newFont != 0) OS.SelectObject (hDC, oldFont);
 			OS.ReleaseDC (handle, hDC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
index 6b58d8a2d2..26c6a3b046 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
@@ -558,24 +558,13 @@ public void setVisible (boolean visible) {
 	}
 	if (item != null) {
 		if (visible) {
-			NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
-			TCHAR buffer1 = new TCHAR (0, text, true);
-			TCHAR buffer2 = new TCHAR (0, message, true);
-			if (OS.IsUnicode) {
-				char [] szInfoTitle = ((NOTIFYICONDATAW) iconData).szInfoTitle;
-				int length1 = Math.min (szInfoTitle.length - 1, buffer1.length ());
-				System.arraycopy (buffer1.chars, 0, szInfoTitle, 0, length1);
-				char [] szInfo = ((NOTIFYICONDATAW) iconData).szInfo;
-				int length2 = Math.min (szInfo.length - 1, buffer2.length ());
-				System.arraycopy (buffer2.chars, 0, szInfo, 0, length2);
-			} else {
-				byte [] szInfoTitle = ((NOTIFYICONDATAA) iconData).szInfoTitle;
-				int length = Math.min (szInfoTitle.length - 1, buffer1.length ());
-				System.arraycopy (buffer1.bytes, 0, szInfoTitle, 0, length);
-				byte [] szInfo = ((NOTIFYICONDATAA) iconData).szInfo;
-				int length2 = Math.min (szInfo.length - 1, buffer2.length ());
-				System.arraycopy (buffer2.bytes, 0, szInfo, 0, length2);
-			}
+			NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
+			char [] szInfoTitle = iconData.szInfoTitle;
+			int length1 = Math.min (szInfoTitle.length - 1, text.length ());
+			text.getChars (0, length1, szInfoTitle, 0);
+			char [] szInfo = iconData.szInfo;
+			int length2 = Math.min (szInfo.length - 1, message.length ());
+			message.getChars (0, length2, szInfo, 0);
 			Display display = item.getDisplay ();
 			iconData.cbSize = NOTIFYICONDATA.sizeof;
 			iconData.uID = item.id;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
index 7083c8d11e..feb1d4a2ee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
@@ -150,7 +150,7 @@ protected void checkSubclass () {
 }
 
 void createUpdateWidget (boolean newIcon) {
-	NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
+	NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
 	iconData.cbSize = NOTIFYICONDATA.sizeof;
 	/*
 	 * As per MSDN article iconData.uID is unique for every TrayItem
@@ -360,7 +360,7 @@ void releaseWidget () {
 	image2 = null;
 	highlightImage = null;
 	toolTipText = null;
-	NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
+	NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
 	iconData.cbSize = NOTIFYICONDATA.sizeof;
 	iconData.uID = id;
 	iconData.hWnd = display.hwndMessage;
@@ -473,7 +473,7 @@ public void setImage (Image image) {
 				break;
 		}
 	}
-	NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
+	NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
 	iconData.cbSize = NOTIFYICONDATA.sizeof;
 	iconData.uID = id;
 	iconData.hWnd = display.hwndMessage;
@@ -531,20 +531,11 @@ public void setToolTip (ToolTip toolTip) {
 public void setToolTipText (String string) {
 	checkWidget ();
 	toolTipText = string;
-	NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
-	TCHAR buffer = new TCHAR (0, toolTipText == null ? "" : toolTipText, true);
-	/*
-	* Note that the size of the szTip field is different in version 5.0 of shell32.dll.
-	*/
-	int length = 128;
-	if (OS.IsUnicode) {
-		char [] szTip = ((NOTIFYICONDATAW) iconData).szTip;
-		length = Math.min (length - 1, buffer.length ());
-		System.arraycopy (buffer.chars, 0, szTip, 0, length);
-	} else {
-		byte [] szTip = ((NOTIFYICONDATAA) iconData).szTip;
-		length = Math.min (length - 1, buffer.length ());
-		System.arraycopy (buffer.bytes, 0, szTip, 0, length);
+	NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
+	if (string != null) {
+		char [] szTip = iconData.szTip;
+		int length = Math.min (szTip.length - 1, string.length ());
+		string.getChars (0, length, szTip, 0);
 	}
 	iconData.cbSize = NOTIFYICONDATA.sizeof;
 	iconData.uID = id;
@@ -577,7 +568,7 @@ public void setVisible (boolean visible) {
 		if (isDisposed ()) return;
 	}
 	this.visible = visible;
-	NOTIFYICONDATA iconData = OS.IsUnicode ? (NOTIFYICONDATA) new NOTIFYICONDATAW () : new NOTIFYICONDATAA ();
+	NOTIFYICONDATA iconData = new NOTIFYICONDATA ();
 	iconData.cbSize = NOTIFYICONDATA.sizeof;
 	iconData.uID = id;
 	iconData.hWnd = display.hwndMessage;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 16a13846c5..b92d9ad6cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -4605,7 +4605,7 @@ void setCheckboxImageList () {
 	OS.FillRect (memDC, rect, hBrush);
 	OS.DeleteObject (hBrush);
 	long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ());
-	TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
+	TEXTMETRIC tm = new TEXTMETRIC ();
 	OS.GetTextMetrics (hDC, tm);
 	OS.SelectObject (hDC, oldFont);
 	int itemWidth = Math.min (tm.tmHeight, width);
@@ -5757,8 +5757,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /
 				switch (hdr.code) {
 					case OS.TTN_SHOW:
 					case OS.TTN_POP:
-					case OS.TTN_GETDISPINFOA:
-					case OS.TTN_GETDISPINFOW:
+					case OS.TTN_GETDISPINFO:
 						return OS.SendMessage (handle, msg, wParam, lParam);
 				}
 				break;
@@ -7224,8 +7223,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 @Override
 LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	switch (hdr.code) {
-		case OS.TVN_GETDISPINFOA:
-		case OS.TVN_GETDISPINFOW: {
+		case OS.TVN_GETDISPINFO: {
 			NMTVDISPINFO lptvdi = new NMTVDISPINFO ();
 			OS.MoveMemory (lptvdi, lParam, NMTVDISPINFO.sizeof);
 			if ((style & SWT.VIRTUAL) != 0) {
@@ -7411,8 +7409,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 		* changing on all but the item that is supposed to be
 		* selected.
 		*/
-		case OS.TVN_ITEMCHANGINGA:
-		case OS.TVN_ITEMCHANGINGW: {
+		case OS.TVN_ITEMCHANGING: {
 			if ((style & SWT.MULTI) != 0) {
 				if (hSelect != 0) {
 					NMTVITEMCHANGE pnm = new NMTVITEMCHANGE ();
@@ -7423,8 +7420,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.TVN_SELCHANGINGA:
-		case OS.TVN_SELCHANGINGW: {
+		case OS.TVN_SELCHANGING: {
 			if ((style & SWT.MULTI) != 0) {
 				if (lockSelection) {
 					/* Save the old selection state for both items */
@@ -7442,8 +7438,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.TVN_SELCHANGEDA:
-		case OS.TVN_SELCHANGEDW: {
+		case OS.TVN_SELCHANGED: {
 			NMTREEVIEW treeView = null;
 			if ((style & SWT.MULTI) != 0) {
 				if (lockSelection) {
@@ -7486,8 +7481,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			updateScrollBar ();
 			break;
 		}
-		case OS.TVN_ITEMEXPANDINGA:
-		case OS.TVN_ITEMEXPANDINGW: {
+		case OS.TVN_ITEMEXPANDING: {
 			if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
 			boolean runExpanded = false;
 			if ((style & SWT.VIRTUAL) != 0) style &= ~SWT.DOUBLE_BUFFERED;
@@ -7553,8 +7547,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			if (!runExpanded) break;
 			//FALL THROUGH
 		}
-		case OS.TVN_ITEMEXPANDEDA:
-		case OS.TVN_ITEMEXPANDEDW: {
+		case OS.TVN_ITEMEXPANDED: {
 			if ((style & SWT.VIRTUAL) != 0) style |= SWT.DOUBLE_BUFFERED;
 			if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) style |= SWT.DOUBLE_BUFFERED;
 			if (findImageControl () != null && getDrawing () /*&& OS.IsWindowVisible (handle)*/) {
@@ -7595,12 +7588,10 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			updateScrollBar ();
 			break;
 		}
-		case OS.TVN_BEGINDRAGA:
-		case OS.TVN_BEGINDRAGW:
+		case OS.TVN_BEGINDRAG:
 			if (OS.GetKeyState (OS.VK_LBUTTON) >= 0) break;
 			//FALL THROUGH
-		case OS.TVN_BEGINRDRAGA:
-		case OS.TVN_BEGINRDRAGW: {
+		case OS.TVN_BEGINRDRAG: {
 			dragStarted = true;
 			NMTREEVIEW treeView = new NMTREEVIEW ();
 			OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof);
@@ -7634,10 +7625,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	* both.
 	*/
 	switch (hdr.code) {
-		case OS.HDN_BEGINTRACKW:
-		case OS.HDN_BEGINTRACKA:
-		case OS.HDN_DIVIDERDBLCLICKW:
-		case OS.HDN_DIVIDERDBLCLICKA: {
+		case OS.HDN_BEGINTRACK:
+		case OS.HDN_DIVIDERDBLCLICK: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			TreeColumn column = columns [phdn.iItem];
@@ -7645,10 +7634,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 				return LRESULT.ONE;
 			}
 			ignoreColumnMove = true;
-			switch (hdr.code) {
-				case OS.HDN_DIVIDERDBLCLICKW:
-				case OS.HDN_DIVIDERDBLCLICKA:
-					if (column != null) column.pack ();
+			if (hdr.code == OS.HDN_DIVIDERDBLCLICK) {
+				if (column != null) column.pack ();
 			}
 			break;
 		}
@@ -7854,8 +7841,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMCHANGINGW:
-		case OS.HDN_ITEMCHANGINGA: {
+		case OS.HDN_ITEMCHANGING: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			if (phdn.pitem != 0) {
@@ -7893,8 +7879,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMCHANGEDW:
-		case OS.HDN_ITEMCHANGEDA: {
+		case OS.HDN_ITEMCHANGED: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			if (phdn.pitem != 0) {
@@ -7929,8 +7914,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMCLICKW:
-		case OS.HDN_ITEMCLICKA: {
+		case OS.HDN_ITEMCLICK: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			TreeColumn column = columns [phdn.iItem];
@@ -7939,8 +7923,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 			}
 			break;
 		}
-		case OS.HDN_ITEMDBLCLICKW:
-		case OS.HDN_ITEMDBLCLICKA: {
+		case OS.HDN_ITEMDBLCLICK: {
 			NMHEADER phdn = new NMHEADER ();
 			OS.MoveMemory (phdn, lParam, NMHEADER.sizeof);
 			TreeColumn column = columns [phdn.iItem];