Bug 560191 - [Win32] Remove unused functions, structures, constants

Change-Id: Ica8ad9af138f24762a19d19084825bcb9918c6b1
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

37 files changed, 28 insertions, 2286 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
index ff4ae9cdf8..4f7c1adf3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -55,18 +55,6 @@ fail:
 }
 #endif
 
-#ifndef NO_GetPixelFormat
-JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	WGL_NATIVE_ENTER(env, that, GetPixelFormat_FUNC);
-	rc = (jint)GetPixelFormat((HDC)arg0);
-	WGL_NATIVE_EXIT(env, that, GetPixelFormat_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SetPixelFormat
 JNIEXPORT jboolean JNICALL WGL_NATIVE(SetPixelFormat)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
@@ -95,18 +83,6 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers)
 }
 #endif
 
-#ifndef NO_wglCopyContext
-JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
-{
-	jboolean rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglCopyContext_FUNC);
-	rc = (jboolean)wglCopyContext((HGLRC)arg0, (HGLRC)arg1, arg2);
-	WGL_NATIVE_EXIT(env, that, wglCopyContext_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_wglCreateContext
 JNIEXPORT jlong JNICALL WGL_NATIVE(wglCreateContext)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -119,18 +95,6 @@ JNIEXPORT jlong JNICALL WGL_NATIVE(wglCreateContext)
 }
 #endif
 
-#ifndef NO_wglCreateLayerContext
-JNIEXPORT jlong JNICALL WGL_NATIVE(wglCreateLayerContext)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	jlong rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglCreateLayerContext_FUNC);
-	rc = (jlong)wglCreateLayerContext((HDC)arg0, arg1);
-	WGL_NATIVE_EXIT(env, that, wglCreateLayerContext_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_wglDeleteContext
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -143,22 +107,6 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
 }
 #endif
 
-#ifndef NO_wglDescribeLayerPlane
-JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDescribeLayerPlane)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
-{
-	LAYERPLANEDESCRIPTOR _arg4, *lparg4=NULL;
-	jboolean rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglDescribeLayerPlane_FUNC);
-	if (arg4) if ((lparg4 = getLAYERPLANEDESCRIPTORFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jboolean)wglDescribeLayerPlane((HDC)arg0, arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) setLAYERPLANEDESCRIPTORFields(env, arg4, lparg4);
-	WGL_NATIVE_EXIT(env, that, wglDescribeLayerPlane_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_wglGetCurrentContext
 JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetCurrentContext)
 	(JNIEnv *env, jclass that)
@@ -171,50 +119,6 @@ JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetCurrentContext)
 }
 #endif
 
-#ifndef NO_wglGetCurrentDC
-JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetCurrentDC)
-	(JNIEnv *env, jclass that)
-{
-	jlong rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglGetCurrentDC_FUNC);
-	rc = (jlong)wglGetCurrentDC();
-	WGL_NATIVE_EXIT(env, that, wglGetCurrentDC_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_wglGetLayerPaletteEntries
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglGetLayerPaletteEntries_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)wglGetLayerPaletteEntries((HDC)arg0, arg1, arg2, arg3, (COLORREF *)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	WGL_NATIVE_EXIT(env, that, wglGetLayerPaletteEntries_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_wglGetProcAddress
-JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetProcAddress)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jlong rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglGetProcAddress_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jlong)wglGetProcAddress(lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	WGL_NATIVE_EXIT(env, that, wglGetProcAddress_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_wglMakeCurrent
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -227,34 +131,6 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
 }
 #endif
 
-#ifndef NO_wglRealizeLayerPalette
-JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2)
-{
-	jboolean rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglRealizeLayerPalette_FUNC);
-	rc = (jboolean)wglRealizeLayerPalette((HDC)arg0, arg1, arg2);
-	WGL_NATIVE_EXIT(env, that, wglRealizeLayerPalette_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_wglSetLayerPaletteEntries
-JNIEXPORT jint JNICALL WGL_NATIVE(wglSetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglSetLayerPaletteEntries_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)wglSetLayerPaletteEntries((HDC)arg0, arg1, arg2, arg3, (COLORREF *)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	WGL_NATIVE_EXIT(env, that, wglSetLayerPaletteEntries_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_wglShareLists
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -267,15 +143,3 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
 }
 #endif
 
-#ifndef NO_wglSwapLayerBuffers
-JNIEXPORT jboolean JNICALL WGL_NATIVE(wglSwapLayerBuffers)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	jboolean rc = 0;
-	WGL_NATIVE_ENTER(env, that, wglSwapLayerBuffers_FUNC);
-	rc = (jboolean)wglSwapLayerBuffers((HDC)arg0, arg1);
-	WGL_NATIVE_EXIT(env, that, wglSwapLayerBuffers_FUNC);
-	return rc;
-}
-#endif
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c
index 0d9a780f10..bf118bbd9a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -23,23 +23,13 @@
 char * WGL_nativeFunctionNames[] = {
 	"ChoosePixelFormat",
 	"DescribePixelFormat",
-	"GetPixelFormat",
 	"SetPixelFormat",
 	"SwapBuffers",
-	"wglCopyContext",
 	"wglCreateContext",
-	"wglCreateLayerContext",
 	"wglDeleteContext",
-	"wglDescribeLayerPlane",
 	"wglGetCurrentContext",
-	"wglGetCurrentDC",
-	"wglGetLayerPaletteEntries",
-	"wglGetProcAddress",
 	"wglMakeCurrent",
-	"wglRealizeLayerPalette",
-	"wglSetLayerPaletteEntries",
 	"wglShareLists",
-	"wglSwapLayerBuffers",
 };
 #define NATIVE_FUNCTION_COUNT sizeof(WGL_nativeFunctionNames) / sizeof(char*)
 int WGL_nativeFunctionCount = NATIVE_FUNCTION_COUNT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h
index 0975156d6f..6c9331165a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -33,21 +33,11 @@ extern char* WGL_nativeFunctionNames[];
 typedef enum {
 	ChoosePixelFormat_FUNC,
 	DescribePixelFormat_FUNC,
-	GetPixelFormat_FUNC,
 	SetPixelFormat_FUNC,
 	SwapBuffers_FUNC,
-	wglCopyContext_FUNC,
 	wglCreateContext_FUNC,
-	wglCreateLayerContext_FUNC,
 	wglDeleteContext_FUNC,
-	wglDescribeLayerPlane_FUNC,
 	wglGetCurrentContext_FUNC,
-	wglGetCurrentDC_FUNC,
-	wglGetLayerPaletteEntries_FUNC,
-	wglGetProcAddress_FUNC,
 	wglMakeCurrent_FUNC,
-	wglRealizeLayerPalette_FUNC,
-	wglSetLayerPaletteEntries_FUNC,
 	wglShareLists_FUNC,
-	wglSwapLayerBuffers_FUNC,
 } WGL_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.c
index 675de355db..eb9badfc2c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -18,106 +18,6 @@
 #include "swt.h"
 #include "wgl_structs.h"
 
-#ifndef NO_LAYERPLANEDESCRIPTOR
-typedef struct LAYERPLANEDESCRIPTOR_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID nSize, nVersion, dwFlags, iPixelType, cColorBits, cRedBits, cRedShift, cGreenBits, cGreenShift, cBlueBits, cBlueShift, cAlphaBits, cAlphaShift, cAccumBits, cAccumRedBits, cAccumGreenBits, cAccumBlueBits, cAccumAlphaBits, cDepthBits, cStencilBits, cAuxBuffers, iLayerPlane, bReserved, crTransparent;
-} LAYERPLANEDESCRIPTOR_FID_CACHE;
-
-LAYERPLANEDESCRIPTOR_FID_CACHE LAYERPLANEDESCRIPTORFc;
-
-void cacheLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject)
-{
-	if (LAYERPLANEDESCRIPTORFc.cached) return;
-	LAYERPLANEDESCRIPTORFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	LAYERPLANEDESCRIPTORFc.nSize = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "nSize", "S");
-	LAYERPLANEDESCRIPTORFc.nVersion = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "nVersion", "S");
-	LAYERPLANEDESCRIPTORFc.dwFlags = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "dwFlags", "I");
-	LAYERPLANEDESCRIPTORFc.iPixelType = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "iPixelType", "B");
-	LAYERPLANEDESCRIPTORFc.cColorBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cColorBits", "B");
-	LAYERPLANEDESCRIPTORFc.cRedBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cRedBits", "B");
-	LAYERPLANEDESCRIPTORFc.cRedShift = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cRedShift", "B");
-	LAYERPLANEDESCRIPTORFc.cGreenBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cGreenBits", "B");
-	LAYERPLANEDESCRIPTORFc.cGreenShift = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cGreenShift", "B");
-	LAYERPLANEDESCRIPTORFc.cBlueBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cBlueBits", "B");
-	LAYERPLANEDESCRIPTORFc.cBlueShift = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cBlueShift", "B");
-	LAYERPLANEDESCRIPTORFc.cAlphaBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAlphaBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAlphaShift = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAlphaShift", "B");
-	LAYERPLANEDESCRIPTORFc.cAccumBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAccumBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAccumRedBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAccumRedBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAccumGreenBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAccumGreenBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAccumBlueBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAccumBlueBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAccumAlphaBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAccumAlphaBits", "B");
-	LAYERPLANEDESCRIPTORFc.cDepthBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cDepthBits", "B");
-	LAYERPLANEDESCRIPTORFc.cStencilBits = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cStencilBits", "B");
-	LAYERPLANEDESCRIPTORFc.cAuxBuffers = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "cAuxBuffers", "B");
-	LAYERPLANEDESCRIPTORFc.iLayerPlane = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "iLayerPlane", "B");
-	LAYERPLANEDESCRIPTORFc.bReserved = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "bReserved", "B");
-	LAYERPLANEDESCRIPTORFc.crTransparent = (*env)->GetFieldID(env, LAYERPLANEDESCRIPTORFc.clazz, "crTransparent", "I");
-	LAYERPLANEDESCRIPTORFc.cached = 1;
-}
-
-LAYERPLANEDESCRIPTOR *getLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject, LAYERPLANEDESCRIPTOR *lpStruct)
-{
-	if (!LAYERPLANEDESCRIPTORFc.cached) cacheLAYERPLANEDESCRIPTORFields(env, lpObject);
-	lpStruct->nSize = (*env)->GetShortField(env, lpObject, LAYERPLANEDESCRIPTORFc.nSize);
-	lpStruct->nVersion = (*env)->GetShortField(env, lpObject, LAYERPLANEDESCRIPTORFc.nVersion);
-	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, LAYERPLANEDESCRIPTORFc.dwFlags);
-	lpStruct->iPixelType = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.iPixelType);
-	lpStruct->cColorBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cColorBits);
-	lpStruct->cRedBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cRedBits);
-	lpStruct->cRedShift = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cRedShift);
-	lpStruct->cGreenBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cGreenBits);
-	lpStruct->cGreenShift = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cGreenShift);
-	lpStruct->cBlueBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cBlueBits);
-	lpStruct->cBlueShift = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cBlueShift);
-	lpStruct->cAlphaBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAlphaBits);
-	lpStruct->cAlphaShift = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAlphaShift);
-	lpStruct->cAccumBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumBits);
-	lpStruct->cAccumRedBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumRedBits);
-	lpStruct->cAccumGreenBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumGreenBits);
-	lpStruct->cAccumBlueBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumBlueBits);
-	lpStruct->cAccumAlphaBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumAlphaBits);
-	lpStruct->cDepthBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cDepthBits);
-	lpStruct->cStencilBits = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cStencilBits);
-	lpStruct->cAuxBuffers = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAuxBuffers);
-	lpStruct->iLayerPlane = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.iLayerPlane);
-	lpStruct->bReserved = (*env)->GetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.bReserved);
-	lpStruct->crTransparent = (*env)->GetIntField(env, lpObject, LAYERPLANEDESCRIPTORFc.crTransparent);
-	return lpStruct;
-}
-
-void setLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject, LAYERPLANEDESCRIPTOR *lpStruct)
-{
-	if (!LAYERPLANEDESCRIPTORFc.cached) cacheLAYERPLANEDESCRIPTORFields(env, lpObject);
-	(*env)->SetShortField(env, lpObject, LAYERPLANEDESCRIPTORFc.nSize, (jshort)lpStruct->nSize);
-	(*env)->SetShortField(env, lpObject, LAYERPLANEDESCRIPTORFc.nVersion, (jshort)lpStruct->nVersion);
-	(*env)->SetIntField(env, lpObject, LAYERPLANEDESCRIPTORFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.iPixelType, (jbyte)lpStruct->iPixelType);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cColorBits, (jbyte)lpStruct->cColorBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cRedBits, (jbyte)lpStruct->cRedBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cRedShift, (jbyte)lpStruct->cRedShift);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cGreenBits, (jbyte)lpStruct->cGreenBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cGreenShift, (jbyte)lpStruct->cGreenShift);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cBlueBits, (jbyte)lpStruct->cBlueBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cBlueShift, (jbyte)lpStruct->cBlueShift);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAlphaBits, (jbyte)lpStruct->cAlphaBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAlphaShift, (jbyte)lpStruct->cAlphaShift);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumBits, (jbyte)lpStruct->cAccumBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumRedBits, (jbyte)lpStruct->cAccumRedBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumGreenBits, (jbyte)lpStruct->cAccumGreenBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumBlueBits, (jbyte)lpStruct->cAccumBlueBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAccumAlphaBits, (jbyte)lpStruct->cAccumAlphaBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cDepthBits, (jbyte)lpStruct->cDepthBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cStencilBits, (jbyte)lpStruct->cStencilBits);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.cAuxBuffers, (jbyte)lpStruct->cAuxBuffers);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.iLayerPlane, (jbyte)lpStruct->iLayerPlane);
-	(*env)->SetByteField(env, lpObject, LAYERPLANEDESCRIPTORFc.bReserved, (jbyte)lpStruct->bReserved);
-	(*env)->SetIntField(env, lpObject, LAYERPLANEDESCRIPTORFc.crTransparent, (jint)lpStruct->crTransparent);
-}
-#endif
-
 #ifndef NO_PIXELFORMATDESCRIPTOR
 typedef struct PIXELFORMATDESCRIPTOR_FID_CACHE {
 	int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.h
index 7c1d3ecece..6b20e833b6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_structs.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -17,18 +17,6 @@
 
 #include "wgl.h"
 
-#ifndef NO_LAYERPLANEDESCRIPTOR
-void cacheLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject);
-LAYERPLANEDESCRIPTOR *getLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject, LAYERPLANEDESCRIPTOR *lpStruct);
-void setLAYERPLANEDESCRIPTORFields(JNIEnv *env, jobject lpObject, LAYERPLANEDESCRIPTOR *lpStruct);
-#define LAYERPLANEDESCRIPTOR_sizeof() sizeof(LAYERPLANEDESCRIPTOR)
-#else
-#define cacheLAYERPLANEDESCRIPTORFields(a,b)
-#define getLAYERPLANEDESCRIPTORFields(a,b,c) NULL
-#define setLAYERPLANEDESCRIPTORFields(a,b,c)
-#define LAYERPLANEDESCRIPTOR_sizeof() 0
-#endif
-
 #ifndef NO_PIXELFORMATDESCRIPTOR
 void cachePIXELFORMATDESCRIPTORFields(JNIEnv *env, jobject lpObject);
 PIXELFORMATDESCRIPTOR *getPIXELFORMATDESCRIPTORFields(JNIEnv *env, jobject lpObject, PIXELFORMATDESCRIPTOR *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java
deleted file mode 100644
index 0cf59147c3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2011 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.opengl.win32;
-
-
-public class LAYERPLANEDESCRIPTOR {
-	public short nSize;
-	public short nVersion;
-	public int dwFlags;
-	public byte iPixelType;
-	public byte cColorBits;
-	public byte cRedBits;
-	public byte cRedShift;
-	public byte cGreenBits;
-	public byte cGreenShift;
-	public byte cBlueBits;
-	public byte cBlueShift;
-	public byte cAlphaBits;
-	public byte cAlphaShift;
-	public byte cAccumBits;
-	public byte cAccumRedBits;
-	public byte cAccumGreenBits;
-	public byte cAccumBlueBits;
-	public byte cAccumAlphaBits;
-	public byte cDepthBits;
-	public byte cStencilBits;
-	public byte cAuxBuffers;
-	public byte iLayerPlane;
-	public byte bReserved;
-	public int crTransparent;
-	public static final int sizeof = 36;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
index bbcd315c27..cf8a41adc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
@@ -20,111 +20,26 @@ public class WGL extends Platform {
 		Library.loadLibrary("swt-wgl");
 	}
 
-	public static final int WGL_FONT_LINES      = 0;
-	public static final int WGL_FONT_POLYGONS   = 1;
-
-	/* LAYERPLANEDESCRIPTOR flags */
-	public static final int LPD_DOUBLEBUFFER        = 0x00000001;
-	public static final int LPD_STEREO              = 0x00000002;
-	public static final int LPD_SUPPORT_GDI         = 0x00000010;
-	public static final int LPD_SUPPORT_OPENGL      = 0x00000020;
-	public static final int LPD_SHARE_DEPTH         = 0x00000040;
-	public static final int LPD_SHARE_STENCIL       = 0x00000080;
-	public static final int LPD_SHARE_ACCUM         = 0x00000100;
-	public static final int LPD_SWAP_EXCHANGE       = 0x00000200;
-	public static final int LPD_SWAP_COPY           = 0x00000400;
-	public static final int LPD_TRANSPARENT         = 0x00001000;
-
-	public static final int LPD_TYPE_RGBA        = 0;
-	public static final int LPD_TYPE_COLORINDEX  = 1;
-
-	/* wglSwapLayerBuffers flags */
-	public static final int WGL_SWAP_MAIN_PLANE     = 0x00000001;
-	public static final int WGL_SWAP_OVERLAY1       = 0x00000002;
-	public static final int WGL_SWAP_OVERLAY2       = 0x00000004;
-	public static final int WGL_SWAP_OVERLAY3       = 0x00000008;
-	public static final int WGL_SWAP_OVERLAY4       = 0x00000010;
-	public static final int WGL_SWAP_OVERLAY5       = 0x00000020;
-	public static final int WGL_SWAP_OVERLAY6       = 0x00000040;
-	public static final int WGL_SWAP_OVERLAY7       = 0x00000080;
-	public static final int WGL_SWAP_OVERLAY8       = 0x00000100;
-	public static final int WGL_SWAP_OVERLAY9       = 0x00000200;
-	public static final int WGL_SWAP_OVERLAY10      = 0x00000400;
-	public static final int WGL_SWAP_OVERLAY11      = 0x00000800;
-	public static final int WGL_SWAP_OVERLAY12      = 0x00001000;
-	public static final int WGL_SWAP_OVERLAY13      = 0x00002000;
-	public static final int WGL_SWAP_OVERLAY14      = 0x00004000;
-	public static final int WGL_SWAP_OVERLAY15      = 0x00008000;
-	public static final int WGL_SWAP_UNDERLAY1      = 0x00010000;
-	public static final int WGL_SWAP_UNDERLAY2      = 0x00020000;
-	public static final int WGL_SWAP_UNDERLAY3      = 0x00040000;
-	public static final int WGL_SWAP_UNDERLAY4      = 0x00080000;
-	public static final int WGL_SWAP_UNDERLAY5      = 0x00100000;
-	public static final int WGL_SWAP_UNDERLAY6      = 0x00200000;
-	public static final int WGL_SWAP_UNDERLAY7      = 0x00400000;
-	public static final int WGL_SWAP_UNDERLAY8      = 0x00800000;
-	public static final int WGL_SWAP_UNDERLAY9      = 0x01000000;
-	public static final int WGL_SWAP_UNDERLAY10     = 0x02000000;
-	public static final int WGL_SWAP_UNDERLAY11     = 0x04000000;
-	public static final int WGL_SWAP_UNDERLAY12     = 0x08000000;
-	public static final int WGL_SWAP_UNDERLAY13     = 0x10000000;
-	public static final int WGL_SWAP_UNDERLAY14     = 0x20000000;
-	public static final int WGL_SWAP_UNDERLAY15     = 0x40000000;
-
-	/* pixel types */
 	public static final int PFD_TYPE_RGBA        = 0;
-	public static final int PFD_TYPE_COLORINDEX  = 1;
-
-	/* layer types */
 	public static final int PFD_MAIN_PLANE       = 0;
-	public static final int PFD_OVERLAY_PLANE    = 1;
-	public static final int PFD_UNDERLAY_PLANE   = (-1);
-
-	/* PIXELFORMATDESCRIPTOR flags */
 	public static final int PFD_DOUBLEBUFFER            = 0x00000001;
 	public static final int PFD_STEREO                  = 0x00000002;
 	public static final int PFD_DRAW_TO_WINDOW          = 0x00000004;
-	public static final int PFD_DRAW_TO_BITMAP          = 0x00000008;
-	public static final int PFD_SUPPORT_GDI             = 0x00000010;
 	public static final int PFD_SUPPORT_OPENGL          = 0x00000020;
-	public static final int PFD_GENERIC_FORMAT          = 0x00000040;
-	public static final int PFD_NEED_PALETTE            = 0x00000080;
-	public static final int PFD_NEED_SYSTEM_PALETTE     = 0x00000100;
-	public static final int PFD_SWAP_EXCHANGE           = 0x00000200;
-	public static final int PFD_SWAP_COPY               = 0x00000400;
-	public static final int PFD_SWAP_LAYER_BUFFERS      = 0x00000800;
-	public static final int PFD_GENERIC_ACCELERATED     = 0x00001000;
-	public static final int PFD_SUPPORT_DIRECTDRAW      = 0x00002000;
-
-	/* PIXELFORMATDESCRIPTOR flags for use in ChoosePixelFormat only */
-	public static final int PFD_DEPTH_DONTCARE          = 0x20000000;
-	public static final int PFD_DOUBLEBUFFER_DONTCARE   = 0x40000000;
-	public static final int PFD_STEREO_DONTCARE         = 0x80000000;
 
 /** @param hdc cast=(HDC) */
 public static final native int ChoosePixelFormat(long hdc, PIXELFORMATDESCRIPTOR ppfd);
 /** @param hdc cast=(HDC) */
 public static final native int DescribePixelFormat(long hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd);
 /** @param hdc cast=(HDC) */
-public static final native int GetPixelFormat(long hdc);
-/** @param hdc cast=(HDC) */
 public static final native boolean SetPixelFormat(long hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd);
 /** @param hdc cast=(HDC) */
 public static final native boolean SwapBuffers(long hdc);
-/**
- * @param hglrcSrc cast=(HGLRC)
- * @param hglrcDst cast=(HGLRC)
- */
-public static final native boolean wglCopyContext(long hglrcSrc, long hglrcDst, int mask);
 /** @param hdc cast=(HDC) */
 public static final native long wglCreateContext(long hdc);
-/** @param hdc cast=(HDC) */
-public static final native long wglCreateLayerContext(long hdc, int iLayerPlane);
 /** @param hglrc cast=(HGLRC) */
 public static final native boolean wglDeleteContext(long hglrc);
 public static final native long wglGetCurrentContext();
-public static final native long wglGetCurrentDC();
-public static final native long wglGetProcAddress(byte[] lpszProc);
 /**
  * @param hdc cast=(HDC)
  * @param hglrc cast=(HGLRC)
@@ -135,20 +50,5 @@ public static final native boolean wglMakeCurrent(long hdc, long hglrc);
  * @param hglrc2 cast=(HGLRC)
  */
 public static final native boolean wglShareLists(long hglrc1, long hglrc2);
-/** @param hdc cast=(HDC) */
-public static final native boolean wglDescribeLayerPlane(long hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd);
-/**
- * @param hdc cast=(HDC)
- * @param pcr cast=(COLORREF *)
- */
-public static final native int wglSetLayerPaletteEntries(long hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
-/**
- * @param hdc cast=(HDC)
- * @param pcr cast=(COLORREF *)
- */
-public static final native int wglGetLayerPaletteEntries(long hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
-/** @param hdc cast=(HDC) */
-public static final native boolean wglRealizeLayerPalette(long hdc, int iLayerPlane, boolean bRealize);
-/** @param hdc cast=(HDC) */
-public static final native boolean wglSwapLayerBuffers(long hdc, int fuPlanes);
+
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
index a2255ad4e8..0c3d512397 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
@@ -23,57 +23,6 @@
 #define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func
 #endif
 
-#ifndef NO_AccessibleChildren
-JNIEXPORT jint JNICALL COM_NATIVE(AccessibleChildren)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jintArray arg4)
-{
-	jint *lparg4=NULL;
-	jint rc = 0;
-	COM_NATIVE_ENTER(env, that, AccessibleChildren_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AccessibleChildren((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4);
-*/
-	{
-		COM_LOAD_FUNCTION(fp, AccessibleChildren)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(IAccessible *, LONG, LONG, VARIANT *, LONG *))fp)((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4);
-		}
-	}
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	COM_NATIVE_EXIT(env, that, AccessibleChildren_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_AccessibleObjectFromWindow
-JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2, jlongArray arg3)
-{
-	GUID _arg2, *lparg2=NULL;
-	jlong *lparg3=NULL;
-	jint rc = 0;
-	COM_NATIVE_ENTER(env, that, AccessibleObjectFromWindow_FUNC);
-	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
-	rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
-*/
-	{
-		COM_LOAD_FUNCTION(fp, AccessibleObjectFromWindow)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWORD, GUID *, LPVOID *))fp)((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
-		}
-	}
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
-	COM_NATIVE_EXIT(env, that, AccessibleObjectFromWindow_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_CAUUID_1sizeof
 JNIEXPORT jint JNICALL COM_NATIVE(CAUUID_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -212,15 +161,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject)
 	COM_NATIVE_ENTER(env, that, CreateStdAccessibleObject_FUNC);
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
 	rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
-*/
-	{
-		COM_LOAD_FUNCTION(fp, CreateStdAccessibleObject)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, jint, GUID *, LPVOID *))fp)((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
-		}
-	}
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
index 64eec0e880..78313e23c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -21,8 +21,6 @@
 #ifdef NATIVE_STATS
 
 char * COM_nativeFunctionNames[] = {
-	"AccessibleChildren",
-	"AccessibleObjectFromWindow",
 	"CAUUID_1sizeof",
 	"CLSIDFromProgID",
 	"CLSIDFromString",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
index 6480352297..af78291802 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -31,8 +31,6 @@ extern char* COM_nativeFunctionNames[];
 #endif
 
 typedef enum {
-	AccessibleChildren_FUNC,
-	AccessibleObjectFromWindow_FUNC,
 	CAUUID_1sizeof_FUNC,
 	CLSIDFromProgID_FUNC,
 	CLSIDFromString_FUNC,
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 8040176609..99b6a21dcc 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
@@ -25,7 +25,7 @@ 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 Uxtheme.lib Propsys.lib Urlmon.lib \
+	wininet.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 \
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 4a6ec03282..c46c8de646 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
@@ -294,18 +294,6 @@ fail:
 }
 #endif
 
-#ifndef NO_BeginPath
-JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, BeginPath_FUNC);
-	rc = (jboolean)BeginPath((HDC)arg0);
-	OS_NATIVE_EXIT(env, that, BeginPath_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_BitBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8)
@@ -366,54 +354,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(CANDIDATEFORM_1sizeof)
 }
 #endif
 
-#ifndef NO_CERT_1CONTEXT_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CERT_1CONTEXT_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CERT_1CONTEXT_1sizeof_FUNC);
-	rc = (jint)CERT_CONTEXT_sizeof();
-	OS_NATIVE_EXIT(env, that, CERT_1CONTEXT_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CERT_1INFO_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CERT_1INFO_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CERT_1INFO_1sizeof_FUNC);
-	rc = (jint)CERT_INFO_sizeof();
-	OS_NATIVE_EXIT(env, that, CERT_1INFO_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CERT_1NAME_1BLOB_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CERT_1NAME_1BLOB_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CERT_1NAME_1BLOB_1sizeof_FUNC);
-	rc = (jint)CERT_NAME_BLOB_sizeof();
-	OS_NATIVE_EXIT(env, that, CERT_1NAME_1BLOB_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CERT_1PUBLIC_1KEY_1INFO_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CERT_1PUBLIC_1KEY_1INFO_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CERT_1PUBLIC_1KEY_1INFO_1sizeof_FUNC);
-	rc = (jint)CERT_PUBLIC_KEY_INFO_sizeof();
-	OS_NATIVE_EXIT(env, that, CERT_1PUBLIC_1KEY_1INFO_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_CHOOSECOLOR_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(CHOOSECOLOR_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -486,54 +426,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(CREATESTRUCT_1sizeof)
 }
 #endif
 
-#ifndef NO_CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof_FUNC);
-	rc = (jint)CRYPT_ALGORITHM_IDENTIFIER_sizeof();
-	OS_NATIVE_EXIT(env, that, CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CRYPT_1BIT_1BLOB_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CRYPT_1BIT_1BLOB_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CRYPT_1BIT_1BLOB_1sizeof_FUNC);
-	rc = (jint)CRYPT_BIT_BLOB_sizeof();
-	OS_NATIVE_EXIT(env, that, CRYPT_1BIT_1BLOB_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CRYPT_1INTEGER_1BLOB_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CRYPT_1INTEGER_1BLOB_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CRYPT_1INTEGER_1BLOB_1sizeof_FUNC);
-	rc = (jint)CRYPT_INTEGER_BLOB_sizeof();
-	OS_NATIVE_EXIT(env, that, CRYPT_1INTEGER_1BLOB_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_CRYPT_1OBJID_1BLOB_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(CRYPT_1OBJID_1BLOB_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CRYPT_1OBJID_1BLOB_1sizeof_FUNC);
-	rc = (jint)CRYPT_OBJID_BLOB_sizeof();
-	OS_NATIVE_EXIT(env, that, CRYPT_1OBJID_1BLOB_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_CallNextHookEx
 JNIEXPORT jlong JNICALL OS_NATIVE(CallNextHookEx)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3)
@@ -558,25 +450,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(CallWindowProc)
 }
 #endif
 
-#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, 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)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, CertNameToStr_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_CharLower
 JNIEXPORT jlong JNICALL OS_NATIVE(CharLower)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -765,28 +638,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseTouchInputHandle)
 }
 #endif
 
-#ifndef NO_CoCreateInstance
-JNIEXPORT jint JNICALL OS_NATIVE(CoCreateInstance)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jlongArray arg4)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg3=NULL;
-	jlong *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, CoCreateInstance_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)CoCreateInstance((REFCLSID)lparg0, (LPUNKNOWN)arg1, arg2, (REFIID)lparg3, (LPVOID *)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, CoCreateInstance_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_CoInternetIsFeatureEnabled
 JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -1306,18 +1157,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(DROPFILES_1sizeof)
 }
 #endif
 
-#ifndef NO_DTTOPTS_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(DTTOPTS_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, DTTOPTS_1sizeof_FUNC);
-	rc = (jint)DTTOPTS_sizeof();
-	OS_NATIVE_EXIT(env, that, DTTOPTS_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_DefFrameProc
 JNIEXPORT jlong JNICALL OS_NATIVE(DefFrameProc)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4)
@@ -2054,18 +1893,6 @@ fail:
 }
 #endif
 
-#ifndef NO_FILETIME_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(FILETIME_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, FILETIME_1sizeof_FUNC);
-	rc = (jint)FILETIME_sizeof();
-	OS_NATIVE_EXIT(env, that, FILETIME_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_FLICK_1DATA_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(FLICK_1DATA_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -2090,25 +1917,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(FLICK_1POINT_1sizeof)
 }
 #endif
 
-#ifndef NO_FileTimeToSystemTime
-JNIEXPORT jboolean JNICALL OS_NATIVE(FileTimeToSystemTime)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1)
-{
-	FILETIME _arg0, *lparg0=NULL;
-	SYSTEMTIME _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, FileTimeToSystemTime_FUNC);
-	if (arg0) if ((lparg0 = getFILETIMEFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = getSYSTEMTIMEFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jboolean)FileTimeToSystemTime(lparg0, lparg1);
-fail:
-	if (arg1 && lparg1) setSYSTEMTIMEFields(env, arg1, lparg1);
-	if (arg0 && lparg0) setFILETIMEFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, FileTimeToSystemTime_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_FillRect
 JNIEXPORT jint JNICALL OS_NATIVE(FillRect)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
@@ -3528,18 +3336,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(GetSysColorBrush)
 }
 #endif
 
-#ifndef NO_GetSystemDefaultUILanguage
-JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
-	(JNIEnv *env, jclass that)
-{
-	jshort rc = 0;
-	OS_NATIVE_ENTER(env, that, GetSystemDefaultUILanguage_FUNC);
-	rc = (jshort)GetSystemDefaultUILanguage();
-	OS_NATIVE_EXIT(env, that, GetSystemDefaultUILanguage_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_GetSystemMenu
 JNIEXPORT jlong JNICALL OS_NATIVE(GetSystemMenu)
 	(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
@@ -5807,34 +5603,6 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI)
-	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2)
-{
-	CERT_CONTEXT _arg0, *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC);
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setCERT_CONTEXTFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC);
-}
-#endif
-
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI)
-	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2)
-{
-	CERT_INFO _arg0, *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC);
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
-fail:
-	if (arg0 && lparg0) setCERT_INFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC);
-}
-#endif
-
 #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CIDA_2JI
 JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CIDA_2JI)
 	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2)
@@ -7108,18 +6876,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(PAINTSTRUCT_1sizeof)
 }
 #endif
 
-#ifndef NO_PANOSE_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PANOSE_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PANOSE_1sizeof_FUNC);
-	rc = (jint)PANOSE_sizeof();
-	OS_NATIVE_EXIT(env, that, PANOSE_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_POINTSTOPOINT
 JNIEXPORT void JNICALL OS_NATIVE(POINTSTOPOINT)
 	(JNIEnv *env, jclass that, jobject arg0, jlong arg1)
@@ -7512,14 +7268,13 @@ fail:
 
 #ifndef NO_RegEnumKeyEx
 JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyEx)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jlong arg7)
 {
 	jchar *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jint *lparg6=NULL;
-	FILETIME _arg7, *lparg7=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, RegEnumKeyEx_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
@@ -7527,10 +7282,8 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyEx)
 	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)RegEnumKeyEx((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, (PFILETIME)arg7);
 fail:
-	if (arg7 && lparg7) setFILETIMEFields(env, arg7, lparg7);
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseCharArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
@@ -7829,18 +7582,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1CONTROL_1sizeof)
 }
 #endif
 
-#ifndef NO_SCRIPT_1DIGITSUBSTITUTE_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1DIGITSUBSTITUTE_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC);
-	rc = (jint)SCRIPT_DIGITSUBSTITUTE_sizeof();
-	OS_NATIVE_EXIT(env, that, SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SCRIPT_1FONTPROPERTIES_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(SCRIPT_1FONTPROPERTIES_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -8058,21 +7799,18 @@ fail:
 
 #ifndef NO_ScriptApplyDigitSubstitution
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptApplyDigitSubstitution)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2)
 {
-	SCRIPT_DIGITSUBSTITUTE _arg0, *lparg0=NULL;
 	SCRIPT_CONTROL _arg1, *lparg1=NULL;
 	SCRIPT_STATE _arg2, *lparg2=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ScriptApplyDigitSubstitution_FUNC);
-	if (arg0) if ((lparg0 = getSCRIPT_DIGITSUBSTITUTEFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getSCRIPT_CONTROLFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getSCRIPT_STATEFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)ScriptApplyDigitSubstitution((const SCRIPT_DIGITSUBSTITUTE*)lparg0, (SCRIPT_CONTROL*)lparg1, (SCRIPT_STATE*)lparg2);
+	rc = (jint)ScriptApplyDigitSubstitution((const SCRIPT_DIGITSUBSTITUTE*)arg0, (SCRIPT_CONTROL*)lparg1, (SCRIPT_STATE*)lparg2);
 fail:
 	if (arg2 && lparg2) setSCRIPT_STATEFields(env, arg2, lparg2);
 	if (arg1 && lparg1) setSCRIPT_CONTROLFields(env, arg1, lparg1);
-	if (arg0 && lparg0) setSCRIPT_DIGITSUBSTITUTEFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, ScriptApplyDigitSubstitution_FUNC);
 	return rc;
 }
@@ -8295,22 +8033,6 @@ fail:
 }
 #endif
 
-#ifndef NO_ScriptRecordDigitSubstitution
-JNIEXPORT jint JNICALL OS_NATIVE(ScriptRecordDigitSubstitution)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	SCRIPT_DIGITSUBSTITUTE _arg1, *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, ScriptRecordDigitSubstitution_FUNC);
-	if (arg1) if ((lparg1 = getSCRIPT_DIGITSUBSTITUTEFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)ScriptRecordDigitSubstitution((LCID)arg0, (SCRIPT_DIGITSUBSTITUTE*)lparg1);
-fail:
-	if (arg1 && lparg1) setSCRIPT_DIGITSUBSTITUTEFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, ScriptRecordDigitSubstitution_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_ScriptShape
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptShape)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jobject arg5, jlong arg6, jlong arg7, jlong arg8, jintArray arg9)
@@ -9098,22 +8820,6 @@ fail:
 }
 #endif
 
-#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, SetDllDirectory_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jboolean)SetDllDirectory(lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SetDllDirectory_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SetFocus
 JNIEXPORT jlong JNICALL OS_NATIVE(SetFocus)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -9909,18 +9615,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(TVINSERTSTRUCT_1sizeof)
 }
 #endif
 
-#ifndef NO_TVITEMEX_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(TVITEMEX_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, TVITEMEX_1sizeof_FUNC);
-	rc = (jint)TVITEMEX_sizeof();
-	OS_NATIVE_EXIT(env, that, TVITEMEX_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_TVITEM_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(TVITEM_1sizeof)
 	(JNIEnv *env, jclass that)
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 e3ad68a964..653d841016 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
@@ -15,6 +15,7 @@
 /* Special sizeof's */
 #define SCRIPT_STRING_ANALYSIS_sizeof() sizeof(SCRIPT_STRING_ANALYSIS)
 #define PROPVARIANT_sizeof() sizeof(PROPVARIANT)
+#define LOGPEN_sizeof() sizeof(LOGPEN)
 
 /* Libraries for dynamic loaded functions */
 #define CloseGestureInfoHandle_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 1c12c8c057..513330f14d 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
@@ -40,29 +40,19 @@ char * OS_nativeFunctionNames[] = {
 	"BeginBufferedPaint",
 	"BeginDeferWindowPos",
 	"BeginPaint",
-	"BeginPath",
 	"BitBlt",
 	"BringWindowToTop",
 	"BufferedPaintInit",
 	"BufferedPaintUnInit",
 	"CANDIDATEFORM_1sizeof",
-	"CERT_1CONTEXT_1sizeof",
-	"CERT_1INFO_1sizeof",
-	"CERT_1NAME_1BLOB_1sizeof",
-	"CERT_1PUBLIC_1KEY_1INFO_1sizeof",
 	"CHOOSECOLOR_1sizeof",
 	"CHOOSEFONT_1sizeof",
 	"CIDA_1sizeof",
 	"COMBOBOXINFO_1sizeof",
 	"COMPOSITIONFORM_1sizeof",
 	"CREATESTRUCT_1sizeof",
-	"CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof",
-	"CRYPT_1BIT_1BLOB_1sizeof",
-	"CRYPT_1INTEGER_1BLOB_1sizeof",
-	"CRYPT_1OBJID_1BLOB_1sizeof",
 	"CallNextHookEx",
 	"CallWindowProc",
-	"CertNameToStr",
 	"CharLower",
 	"CharUpper",
 	"ChildWindowFromPointEx",
@@ -76,7 +66,6 @@ char * OS_nativeFunctionNames[] = {
 	"ClosePrinter",
 	"CloseThemeData",
 	"CloseTouchInputHandle",
-	"CoCreateInstance",
 	"CoInternetIsFeatureEnabled",
 	"CoInternetSetFeatureEnabled",
 	"CoTaskMemAlloc",
@@ -114,7 +103,6 @@ char * OS_nativeFunctionNames[] = {
 	"DOCINFO_1sizeof",
 	"DRAWITEMSTRUCT_1sizeof",
 	"DROPFILES_1sizeof",
-	"DTTOPTS_1sizeof",
 	"DefFrameProc",
 	"DefMDIChildProc",
 	"DefWindowProc",
@@ -167,10 +155,8 @@ char * OS_nativeFunctionNames[] = {
 	"ExtCreateRegion",
 	"ExtTextOut",
 	"ExtractIconEx",
-	"FILETIME_1sizeof",
 	"FLICK_1DATA_1sizeof",
 	"FLICK_1POINT_1sizeof",
-	"FileTimeToSystemTime",
 	"FillRect",
 	"GCP_1RESULTS_1sizeof",
 	"GESTURECONFIG_1sizeof",
@@ -271,7 +257,6 @@ char * OS_nativeFunctionNames[] = {
 	"GetStockObject",
 	"GetSysColor",
 	"GetSysColorBrush",
-	"GetSystemDefaultUILanguage",
 	"GetSystemMenu",
 	"GetSystemMetrics",
 	"GetTextColor",
@@ -441,8 +426,6 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__J_3SI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI",
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI",
-	"MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_CIDA_2JI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI",
@@ -537,7 +520,6 @@ char * OS_nativeFunctionNames[] = {
 	"OpenProcess",
 	"OpenThemeData",
 	"PAINTSTRUCT_1sizeof",
-	"PANOSE_1sizeof",
 	"POINTSTOPOINT",
 	"POINT_1sizeof",
 	"PRIMARYLANGID",
@@ -586,7 +568,6 @@ char * OS_nativeFunctionNames[] = {
 	"SAFEARRAY_1sizeof",
 	"SCRIPT_1ANALYSIS_1sizeof",
 	"SCRIPT_1CONTROL_1sizeof",
-	"SCRIPT_1DIGITSUBSTITUTE_1sizeof",
 	"SCRIPT_1FONTPROPERTIES_1sizeof",
 	"SCRIPT_1ITEM_1sizeof",
 	"SCRIPT_1LOGATTR_1sizeof",
@@ -617,7 +598,6 @@ char * OS_nativeFunctionNames[] = {
 	"ScriptJustify",
 	"ScriptLayout",
 	"ScriptPlace",
-	"ScriptRecordDigitSubstitution",
 	"ScriptShape",
 	"ScriptStringAnalyse",
 	"ScriptStringFree",
@@ -668,7 +648,6 @@ char * OS_nativeFunctionNames[] = {
 	"SetCursor",
 	"SetCursorPos",
 	"SetDIBColorTable",
-	"SetDllDirectory",
 	"SetFocus",
 	"SetForegroundWindow",
 	"SetGestureConfig",
@@ -729,7 +708,6 @@ char * OS_nativeFunctionNames[] = {
 	"TRIVERTEX_1sizeof",
 	"TVHITTESTINFO_1sizeof",
 	"TVINSERTSTRUCT_1sizeof",
-	"TVITEMEX_1sizeof",
 	"TVITEM_1sizeof",
 	"TVSORTCB_1sizeof",
 	"ToUnicode",
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 0faf8a4aa3..3fe592bcc9 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
@@ -50,29 +50,19 @@ typedef enum {
 	BeginBufferedPaint_FUNC,
 	BeginDeferWindowPos_FUNC,
 	BeginPaint_FUNC,
-	BeginPath_FUNC,
 	BitBlt_FUNC,
 	BringWindowToTop_FUNC,
 	BufferedPaintInit_FUNC,
 	BufferedPaintUnInit_FUNC,
 	CANDIDATEFORM_1sizeof_FUNC,
-	CERT_1CONTEXT_1sizeof_FUNC,
-	CERT_1INFO_1sizeof_FUNC,
-	CERT_1NAME_1BLOB_1sizeof_FUNC,
-	CERT_1PUBLIC_1KEY_1INFO_1sizeof_FUNC,
 	CHOOSECOLOR_1sizeof_FUNC,
 	CHOOSEFONT_1sizeof_FUNC,
 	CIDA_1sizeof_FUNC,
 	COMBOBOXINFO_1sizeof_FUNC,
 	COMPOSITIONFORM_1sizeof_FUNC,
 	CREATESTRUCT_1sizeof_FUNC,
-	CRYPT_1ALGORITHM_1IDENTIFIER_1sizeof_FUNC,
-	CRYPT_1BIT_1BLOB_1sizeof_FUNC,
-	CRYPT_1INTEGER_1BLOB_1sizeof_FUNC,
-	CRYPT_1OBJID_1BLOB_1sizeof_FUNC,
 	CallNextHookEx_FUNC,
 	CallWindowProc_FUNC,
-	CertNameToStr_FUNC,
 	CharLower_FUNC,
 	CharUpper_FUNC,
 	ChildWindowFromPointEx_FUNC,
@@ -86,7 +76,6 @@ typedef enum {
 	ClosePrinter_FUNC,
 	CloseThemeData_FUNC,
 	CloseTouchInputHandle_FUNC,
-	CoCreateInstance_FUNC,
 	CoInternetIsFeatureEnabled_FUNC,
 	CoInternetSetFeatureEnabled_FUNC,
 	CoTaskMemAlloc_FUNC,
@@ -124,7 +113,6 @@ typedef enum {
 	DOCINFO_1sizeof_FUNC,
 	DRAWITEMSTRUCT_1sizeof_FUNC,
 	DROPFILES_1sizeof_FUNC,
-	DTTOPTS_1sizeof_FUNC,
 	DefFrameProc_FUNC,
 	DefMDIChildProc_FUNC,
 	DefWindowProc_FUNC,
@@ -177,10 +165,8 @@ typedef enum {
 	ExtCreateRegion_FUNC,
 	ExtTextOut_FUNC,
 	ExtractIconEx_FUNC,
-	FILETIME_1sizeof_FUNC,
 	FLICK_1DATA_1sizeof_FUNC,
 	FLICK_1POINT_1sizeof_FUNC,
-	FileTimeToSystemTime_FUNC,
 	FillRect_FUNC,
 	GCP_1RESULTS_1sizeof_FUNC,
 	GESTURECONFIG_1sizeof_FUNC,
@@ -281,7 +267,6 @@ typedef enum {
 	GetStockObject_FUNC,
 	GetSysColor_FUNC,
 	GetSysColorBrush_FUNC,
-	GetSystemDefaultUILanguage_FUNC,
 	GetSystemMenu_FUNC,
 	GetSystemMetrics_FUNC,
 	GetTextColor_FUNC,
@@ -451,8 +436,6 @@ typedef enum {
 	MoveMemory__J_3SI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI_FUNC,
-	MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC,
-	MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_CIDA_2JI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC,
@@ -547,7 +530,6 @@ typedef enum {
 	OpenProcess_FUNC,
 	OpenThemeData_FUNC,
 	PAINTSTRUCT_1sizeof_FUNC,
-	PANOSE_1sizeof_FUNC,
 	POINTSTOPOINT_FUNC,
 	POINT_1sizeof_FUNC,
 	PRIMARYLANGID_FUNC,
@@ -596,7 +578,6 @@ typedef enum {
 	SAFEARRAY_1sizeof_FUNC,
 	SCRIPT_1ANALYSIS_1sizeof_FUNC,
 	SCRIPT_1CONTROL_1sizeof_FUNC,
-	SCRIPT_1DIGITSUBSTITUTE_1sizeof_FUNC,
 	SCRIPT_1FONTPROPERTIES_1sizeof_FUNC,
 	SCRIPT_1ITEM_1sizeof_FUNC,
 	SCRIPT_1LOGATTR_1sizeof_FUNC,
@@ -627,7 +608,6 @@ typedef enum {
 	ScriptJustify_FUNC,
 	ScriptLayout_FUNC,
 	ScriptPlace_FUNC,
-	ScriptRecordDigitSubstitution_FUNC,
 	ScriptShape_FUNC,
 	ScriptStringAnalyse_FUNC,
 	ScriptStringFree_FUNC,
@@ -678,7 +658,6 @@ typedef enum {
 	SetCursor_FUNC,
 	SetCursorPos_FUNC,
 	SetDIBColorTable_FUNC,
-	SetDllDirectory_FUNC,
 	SetFocus_FUNC,
 	SetForegroundWindow_FUNC,
 	SetGestureConfig_FUNC,
@@ -739,7 +718,6 @@ typedef enum {
 	TRIVERTEX_1sizeof_FUNC,
 	TVHITTESTINFO_1sizeof_FUNC,
 	TVINSERTSTRUCT_1sizeof_FUNC,
-	TVITEMEX_1sizeof_FUNC,
 	TVITEM_1sizeof_FUNC,
 	TVSORTCB_1sizeof_FUNC,
 	ToUnicode_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
index 0b48b8495f..89251cbe0e 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
@@ -398,247 +398,6 @@ void setCANDIDATEFORMFields(JNIEnv *env, jobject lpObject, CANDIDATEFORM *lpStru
 }
 #endif
 
-#ifndef NO_CERT_CONTEXT
-typedef struct CERT_CONTEXT_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dwCertEncodingType, pbCertEncoded, cbCertEncoded, pCertInfo, hCertStore;
-} CERT_CONTEXT_FID_CACHE;
-
-CERT_CONTEXT_FID_CACHE CERT_CONTEXTFc;
-
-void cacheCERT_CONTEXTFields(JNIEnv *env, jobject lpObject)
-{
-	if (CERT_CONTEXTFc.cached) return;
-	CERT_CONTEXTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CERT_CONTEXTFc.dwCertEncodingType = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "dwCertEncodingType", "I");
-	CERT_CONTEXTFc.pbCertEncoded = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pbCertEncoded", "J");
-	CERT_CONTEXTFc.cbCertEncoded = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "cbCertEncoded", "I");
-	CERT_CONTEXTFc.pCertInfo = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pCertInfo", "J");
-	CERT_CONTEXTFc.hCertStore = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "hCertStore", "J");
-	CERT_CONTEXTFc.cached = 1;
-}
-
-CERT_CONTEXT *getCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT *lpStruct)
-{
-	if (!CERT_CONTEXTFc.cached) cacheCERT_CONTEXTFields(env, lpObject);
-	lpStruct->dwCertEncodingType = (*env)->GetIntField(env, lpObject, CERT_CONTEXTFc.dwCertEncodingType);
-	lpStruct->pbCertEncoded = (BYTE *)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded);
-	lpStruct->cbCertEncoded = (*env)->GetIntField(env, lpObject, CERT_CONTEXTFc.cbCertEncoded);
-	lpStruct->pCertInfo = (PCERT_INFO)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo);
-	lpStruct->hCertStore = (HCERTSTORE)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.hCertStore);
-	return lpStruct;
-}
-
-void setCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT *lpStruct)
-{
-	if (!CERT_CONTEXTFc.cached) cacheCERT_CONTEXTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CERT_CONTEXTFc.dwCertEncodingType, (jint)lpStruct->dwCertEncodingType);
-	(*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded, (jlong)lpStruct->pbCertEncoded);
-	(*env)->SetIntField(env, lpObject, CERT_CONTEXTFc.cbCertEncoded, (jint)lpStruct->cbCertEncoded);
-	(*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo, (jlong)lpStruct->pCertInfo);
-	(*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.hCertStore, (jlong)lpStruct->hCertStore);
-}
-#endif
-
-#ifndef NO_CERT_INFO
-typedef struct CERT_INFO_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dwVersion, SerialNumber, SignatureAlgorithm, Issuer, NotBefore, NotAfter, Subject, SubjectPublicKeyInfo, IssuerUniqueId, SubjectUniqueId, cExtension, rgExtension;
-} CERT_INFO_FID_CACHE;
-
-CERT_INFO_FID_CACHE CERT_INFOFc;
-
-void cacheCERT_INFOFields(JNIEnv *env, jobject lpObject)
-{
-	if (CERT_INFOFc.cached) return;
-	CERT_INFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CERT_INFOFc.dwVersion = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "dwVersion", "I");
-	CERT_INFOFc.SerialNumber = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "SerialNumber", "Lorg/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB;");
-	CERT_INFOFc.SignatureAlgorithm = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "SignatureAlgorithm", "Lorg/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER;");
-	CERT_INFOFc.Issuer = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "Issuer", "Lorg/eclipse/swt/internal/win32/CERT_NAME_BLOB;");
-	CERT_INFOFc.NotBefore = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "NotBefore", "Lorg/eclipse/swt/internal/win32/FILETIME;");
-	CERT_INFOFc.NotAfter = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "NotAfter", "Lorg/eclipse/swt/internal/win32/FILETIME;");
-	CERT_INFOFc.Subject = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "Subject", "Lorg/eclipse/swt/internal/win32/CERT_NAME_BLOB;");
-	CERT_INFOFc.SubjectPublicKeyInfo = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "SubjectPublicKeyInfo", "Lorg/eclipse/swt/internal/win32/CERT_PUBLIC_KEY_INFO;");
-	CERT_INFOFc.IssuerUniqueId = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "IssuerUniqueId", "Lorg/eclipse/swt/internal/win32/CRYPT_BIT_BLOB;");
-	CERT_INFOFc.SubjectUniqueId = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "SubjectUniqueId", "Lorg/eclipse/swt/internal/win32/CRYPT_BIT_BLOB;");
-	CERT_INFOFc.cExtension = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "cExtension", "I");
-	CERT_INFOFc.rgExtension = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "rgExtension", "J");
-	CERT_INFOFc.cached = 1;
-}
-
-CERT_INFO *getCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct)
-{
-	if (!CERT_INFOFc.cached) cacheCERT_INFOFields(env, lpObject);
-	lpStruct->dwVersion = (*env)->GetIntField(env, lpObject, CERT_INFOFc.dwVersion);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SerialNumber);
-	if (lpObject1 != NULL) getCRYPT_INTEGER_BLOBFields(env, lpObject1, &lpStruct->SerialNumber);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SignatureAlgorithm);
-	if (lpObject1 != NULL) getCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject1, &lpStruct->SignatureAlgorithm);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.Issuer);
-	if (lpObject1 != NULL) getCERT_NAME_BLOBFields(env, lpObject1, &lpStruct->Issuer);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.NotBefore);
-	if (lpObject1 != NULL) getFILETIMEFields(env, lpObject1, &lpStruct->NotBefore);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.NotAfter);
-	if (lpObject1 != NULL) getFILETIMEFields(env, lpObject1, &lpStruct->NotAfter);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.Subject);
-	if (lpObject1 != NULL) getCERT_NAME_BLOBFields(env, lpObject1, &lpStruct->Subject);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SubjectPublicKeyInfo);
-	if (lpObject1 != NULL) getCERT_PUBLIC_KEY_INFOFields(env, lpObject1, &lpStruct->SubjectPublicKeyInfo);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.IssuerUniqueId);
-	if (lpObject1 != NULL) getCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->IssuerUniqueId);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SubjectUniqueId);
-	if (lpObject1 != NULL) getCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->SubjectUniqueId);
-	}
-	lpStruct->cExtension = (*env)->GetIntField(env, lpObject, CERT_INFOFc.cExtension);
-	lpStruct->rgExtension = (PCERT_EXTENSION)(*env)->GetLongField(env, lpObject, CERT_INFOFc.rgExtension);
-	return lpStruct;
-}
-
-void setCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct)
-{
-	if (!CERT_INFOFc.cached) cacheCERT_INFOFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CERT_INFOFc.dwVersion, (jint)lpStruct->dwVersion);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SerialNumber);
-	if (lpObject1 != NULL) setCRYPT_INTEGER_BLOBFields(env, lpObject1, &lpStruct->SerialNumber);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SignatureAlgorithm);
-	if (lpObject1 != NULL) setCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject1, &lpStruct->SignatureAlgorithm);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.Issuer);
-	if (lpObject1 != NULL) setCERT_NAME_BLOBFields(env, lpObject1, &lpStruct->Issuer);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.NotBefore);
-	if (lpObject1 != NULL) setFILETIMEFields(env, lpObject1, &lpStruct->NotBefore);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.NotAfter);
-	if (lpObject1 != NULL) setFILETIMEFields(env, lpObject1, &lpStruct->NotAfter);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.Subject);
-	if (lpObject1 != NULL) setCERT_NAME_BLOBFields(env, lpObject1, &lpStruct->Subject);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SubjectPublicKeyInfo);
-	if (lpObject1 != NULL) setCERT_PUBLIC_KEY_INFOFields(env, lpObject1, &lpStruct->SubjectPublicKeyInfo);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.IssuerUniqueId);
-	if (lpObject1 != NULL) setCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->IssuerUniqueId);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_INFOFc.SubjectUniqueId);
-	if (lpObject1 != NULL) setCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->SubjectUniqueId);
-	}
-	(*env)->SetIntField(env, lpObject, CERT_INFOFc.cExtension, (jint)lpStruct->cExtension);
-	(*env)->SetLongField(env, lpObject, CERT_INFOFc.rgExtension, (jlong)lpStruct->rgExtension);
-}
-#endif
-
-#ifndef NO_CERT_NAME_BLOB
-typedef struct CERT_NAME_BLOB_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID cbData, pbData;
-} CERT_NAME_BLOB_FID_CACHE;
-
-CERT_NAME_BLOB_FID_CACHE CERT_NAME_BLOBFc;
-
-void cacheCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject)
-{
-	if (CERT_NAME_BLOBFc.cached) return;
-	CERT_NAME_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CERT_NAME_BLOBFc.cbData = (*env)->GetFieldID(env, CERT_NAME_BLOBFc.clazz, "cbData", "I");
-	CERT_NAME_BLOBFc.pbData = (*env)->GetFieldID(env, CERT_NAME_BLOBFc.clazz, "pbData", "J");
-	CERT_NAME_BLOBFc.cached = 1;
-}
-
-CERT_NAME_BLOB *getCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME_BLOB *lpStruct)
-{
-	if (!CERT_NAME_BLOBFc.cached) cacheCERT_NAME_BLOBFields(env, lpObject);
-	lpStruct->cbData = (*env)->GetIntField(env, lpObject, CERT_NAME_BLOBFc.cbData);
-	lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CERT_NAME_BLOBFc.pbData);
-	return lpStruct;
-}
-
-void setCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME_BLOB *lpStruct)
-{
-	if (!CERT_NAME_BLOBFc.cached) cacheCERT_NAME_BLOBFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CERT_NAME_BLOBFc.cbData, (jint)lpStruct->cbData);
-	(*env)->SetLongField(env, lpObject, CERT_NAME_BLOBFc.pbData, (jlong)lpStruct->pbData);
-}
-#endif
-
-#ifndef NO_CERT_PUBLIC_KEY_INFO
-typedef struct CERT_PUBLIC_KEY_INFO_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID Algorithm, PublicKey;
-} CERT_PUBLIC_KEY_INFO_FID_CACHE;
-
-CERT_PUBLIC_KEY_INFO_FID_CACHE CERT_PUBLIC_KEY_INFOFc;
-
-void cacheCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject)
-{
-	if (CERT_PUBLIC_KEY_INFOFc.cached) return;
-	CERT_PUBLIC_KEY_INFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CERT_PUBLIC_KEY_INFOFc.Algorithm = (*env)->GetFieldID(env, CERT_PUBLIC_KEY_INFOFc.clazz, "Algorithm", "Lorg/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER;");
-	CERT_PUBLIC_KEY_INFOFc.PublicKey = (*env)->GetFieldID(env, CERT_PUBLIC_KEY_INFOFc.clazz, "PublicKey", "Lorg/eclipse/swt/internal/win32/CRYPT_BIT_BLOB;");
-	CERT_PUBLIC_KEY_INFOFc.cached = 1;
-}
-
-CERT_PUBLIC_KEY_INFO *getCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject, CERT_PUBLIC_KEY_INFO *lpStruct)
-{
-	if (!CERT_PUBLIC_KEY_INFOFc.cached) cacheCERT_PUBLIC_KEY_INFOFields(env, lpObject);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_PUBLIC_KEY_INFOFc.Algorithm);
-	if (lpObject1 != NULL) getCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject1, &lpStruct->Algorithm);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_PUBLIC_KEY_INFOFc.PublicKey);
-	if (lpObject1 != NULL) getCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->PublicKey);
-	}
-	return lpStruct;
-}
-
-void setCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject, CERT_PUBLIC_KEY_INFO *lpStruct)
-{
-	if (!CERT_PUBLIC_KEY_INFOFc.cached) cacheCERT_PUBLIC_KEY_INFOFields(env, lpObject);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_PUBLIC_KEY_INFOFc.Algorithm);
-	if (lpObject1 != NULL) setCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject1, &lpStruct->Algorithm);
-	}
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CERT_PUBLIC_KEY_INFOFc.PublicKey);
-	if (lpObject1 != NULL) setCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->PublicKey);
-	}
-}
-#endif
-
 #ifndef NO_CHOOSECOLOR
 typedef struct CHOOSECOLOR_FID_CACHE {
 	int cached;
@@ -981,151 +740,6 @@ void setCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct
 }
 #endif
 
-#ifndef NO_CRYPT_ALGORITHM_IDENTIFIER
-typedef struct CRYPT_ALGORITHM_IDENTIFIER_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID pszObjId, Parameters;
-} CRYPT_ALGORITHM_IDENTIFIER_FID_CACHE;
-
-CRYPT_ALGORITHM_IDENTIFIER_FID_CACHE CRYPT_ALGORITHM_IDENTIFIERFc;
-
-void cacheCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject)
-{
-	if (CRYPT_ALGORITHM_IDENTIFIERFc.cached) return;
-	CRYPT_ALGORITHM_IDENTIFIERFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId = (*env)->GetFieldID(env, CRYPT_ALGORITHM_IDENTIFIERFc.clazz, "pszObjId", "J");
-	CRYPT_ALGORITHM_IDENTIFIERFc.Parameters = (*env)->GetFieldID(env, CRYPT_ALGORITHM_IDENTIFIERFc.clazz, "Parameters", "Lorg/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB;");
-	CRYPT_ALGORITHM_IDENTIFIERFc.cached = 1;
-}
-
-CRYPT_ALGORITHM_IDENTIFIER *getCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct)
-{
-	if (!CRYPT_ALGORITHM_IDENTIFIERFc.cached) cacheCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject);
-	lpStruct->pszObjId = (LPSTR)(*env)->GetLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.Parameters);
-	if (lpObject1 != NULL) getCRYPT_OBJID_BLOBFields(env, lpObject1, &lpStruct->Parameters);
-	}
-	return lpStruct;
-}
-
-void setCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct)
-{
-	if (!CRYPT_ALGORITHM_IDENTIFIERFc.cached) cacheCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject);
-	(*env)->SetLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId, (jlong)lpStruct->pszObjId);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.Parameters);
-	if (lpObject1 != NULL) setCRYPT_OBJID_BLOBFields(env, lpObject1, &lpStruct->Parameters);
-	}
-}
-#endif
-
-#ifndef NO_CRYPT_BIT_BLOB
-typedef struct CRYPT_BIT_BLOB_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID cbData, pbData, cUnusedBits;
-} CRYPT_BIT_BLOB_FID_CACHE;
-
-CRYPT_BIT_BLOB_FID_CACHE CRYPT_BIT_BLOBFc;
-
-void cacheCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject)
-{
-	if (CRYPT_BIT_BLOBFc.cached) return;
-	CRYPT_BIT_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CRYPT_BIT_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "cbData", "I");
-	CRYPT_BIT_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "pbData", "J");
-	CRYPT_BIT_BLOBFc.cUnusedBits = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "cUnusedBits", "I");
-	CRYPT_BIT_BLOBFc.cached = 1;
-}
-
-CRYPT_BIT_BLOB *getCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT_BLOB *lpStruct)
-{
-	if (!CRYPT_BIT_BLOBFc.cached) cacheCRYPT_BIT_BLOBFields(env, lpObject);
-	lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cbData);
-	lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData);
-	lpStruct->cUnusedBits = (*env)->GetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cUnusedBits);
-	return lpStruct;
-}
-
-void setCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT_BLOB *lpStruct)
-{
-	if (!CRYPT_BIT_BLOBFc.cached) cacheCRYPT_BIT_BLOBFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cbData, (jint)lpStruct->cbData);
-	(*env)->SetLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData, (jlong)lpStruct->pbData);
-	(*env)->SetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cUnusedBits, (jint)lpStruct->cUnusedBits);
-}
-#endif
-
-#ifndef NO_CRYPT_INTEGER_BLOB
-typedef struct CRYPT_INTEGER_BLOB_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID cbData, pbData;
-} CRYPT_INTEGER_BLOB_FID_CACHE;
-
-CRYPT_INTEGER_BLOB_FID_CACHE CRYPT_INTEGER_BLOBFc;
-
-void cacheCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject)
-{
-	if (CRYPT_INTEGER_BLOBFc.cached) return;
-	CRYPT_INTEGER_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CRYPT_INTEGER_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_INTEGER_BLOBFc.clazz, "cbData", "I");
-	CRYPT_INTEGER_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_INTEGER_BLOBFc.clazz, "pbData", "J");
-	CRYPT_INTEGER_BLOBFc.cached = 1;
-}
-
-CRYPT_INTEGER_BLOB *getCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_INTEGER_BLOB *lpStruct)
-{
-	if (!CRYPT_INTEGER_BLOBFc.cached) cacheCRYPT_INTEGER_BLOBFields(env, lpObject);
-	lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_INTEGER_BLOBFc.cbData);
-	lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData);
-	return lpStruct;
-}
-
-void setCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_INTEGER_BLOB *lpStruct)
-{
-	if (!CRYPT_INTEGER_BLOBFc.cached) cacheCRYPT_INTEGER_BLOBFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CRYPT_INTEGER_BLOBFc.cbData, (jint)lpStruct->cbData);
-	(*env)->SetLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData, (jlong)lpStruct->pbData);
-}
-#endif
-
-#ifndef NO_CRYPT_OBJID_BLOB
-typedef struct CRYPT_OBJID_BLOB_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID cbData, pbData;
-} CRYPT_OBJID_BLOB_FID_CACHE;
-
-CRYPT_OBJID_BLOB_FID_CACHE CRYPT_OBJID_BLOBFc;
-
-void cacheCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject)
-{
-	if (CRYPT_OBJID_BLOBFc.cached) return;
-	CRYPT_OBJID_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CRYPT_OBJID_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_OBJID_BLOBFc.clazz, "cbData", "I");
-	CRYPT_OBJID_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_OBJID_BLOBFc.clazz, "pbData", "J");
-	CRYPT_OBJID_BLOBFc.cached = 1;
-}
-
-CRYPT_OBJID_BLOB *getCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB *lpStruct)
-{
-	if (!CRYPT_OBJID_BLOBFc.cached) cacheCRYPT_OBJID_BLOBFields(env, lpObject);
-	lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_OBJID_BLOBFc.cbData);
-	lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData);
-	return lpStruct;
-}
-
-void setCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB *lpStruct)
-{
-	if (!CRYPT_OBJID_BLOBFc.cached) cacheCRYPT_OBJID_BLOBFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CRYPT_OBJID_BLOBFc.cbData, (jint)lpStruct->cbData);
-	(*env)->SetLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData, (jlong)lpStruct->pbData);
-}
-#endif
-
 #ifndef NO_DEVMODE
 typedef struct DEVMODE_FID_CACHE {
 	int cached;
@@ -1540,85 +1154,6 @@ void setDROPFILESFields(JNIEnv *env, jobject lpObject, DROPFILES *lpStruct)
 }
 #endif
 
-#ifndef NO_DTTOPTS
-typedef struct DTTOPTS_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dwSize, dwFlags, crText, crBorder, crShadow, iTextShadowType, ptShadowOffset, iBorderSize, iFontPropId, iColorPropId, iStateId, fApplyOverlay, iGlowSize, pfnDrawTextCallback, lParam;
-} DTTOPTS_FID_CACHE;
-
-DTTOPTS_FID_CACHE DTTOPTSFc;
-
-void cacheDTTOPTSFields(JNIEnv *env, jobject lpObject)
-{
-	if (DTTOPTSFc.cached) return;
-	DTTOPTSFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DTTOPTSFc.dwSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "dwSize", "I");
-	DTTOPTSFc.dwFlags = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "dwFlags", "I");
-	DTTOPTSFc.crText = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crText", "I");
-	DTTOPTSFc.crBorder = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crBorder", "I");
-	DTTOPTSFc.crShadow = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "crShadow", "I");
-	DTTOPTSFc.iTextShadowType = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iTextShadowType", "I");
-	DTTOPTSFc.ptShadowOffset = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "ptShadowOffset", "Lorg/eclipse/swt/internal/win32/POINT;");
-	DTTOPTSFc.iBorderSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iBorderSize", "I");
-	DTTOPTSFc.iFontPropId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iFontPropId", "I");
-	DTTOPTSFc.iColorPropId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iColorPropId", "I");
-	DTTOPTSFc.iStateId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iStateId", "I");
-	DTTOPTSFc.fApplyOverlay = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "fApplyOverlay", "Z");
-	DTTOPTSFc.iGlowSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iGlowSize", "I");
-	DTTOPTSFc.pfnDrawTextCallback = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "pfnDrawTextCallback", "J");
-	DTTOPTSFc.lParam = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "lParam", "J");
-	DTTOPTSFc.cached = 1;
-}
-
-DTTOPTS *getDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct)
-{
-	if (!DTTOPTSFc.cached) cacheDTTOPTSFields(env, lpObject);
-	lpStruct->dwSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.dwSize);
-	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, DTTOPTSFc.dwFlags);
-	lpStruct->crText = (*env)->GetIntField(env, lpObject, DTTOPTSFc.crText);
-	lpStruct->crBorder = (*env)->GetIntField(env, lpObject, DTTOPTSFc.crBorder);
-	lpStruct->crShadow = (*env)->GetIntField(env, lpObject, DTTOPTSFc.crShadow);
-	lpStruct->iTextShadowType = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iTextShadowType);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, DTTOPTSFc.ptShadowOffset);
-	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->ptShadowOffset);
-	}
-	lpStruct->iBorderSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iBorderSize);
-	lpStruct->iFontPropId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iFontPropId);
-	lpStruct->iColorPropId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iColorPropId);
-	lpStruct->iStateId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iStateId);
-	lpStruct->fApplyOverlay = (*env)->GetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay);
-	lpStruct->iGlowSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iGlowSize);
-	lpStruct->pfnDrawTextCallback = (DTT_CALLBACK_PROC)(*env)->GetLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback);
-	lpStruct->lParam = (*env)->GetLongField(env, lpObject, DTTOPTSFc.lParam);
-	return lpStruct;
-}
-
-void setDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct)
-{
-	if (!DTTOPTSFc.cached) cacheDTTOPTSFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.dwSize, (jint)lpStruct->dwSize);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.crText, (jint)lpStruct->crText);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.crBorder, (jint)lpStruct->crBorder);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.crShadow, (jint)lpStruct->crShadow);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iTextShadowType, (jint)lpStruct->iTextShadowType);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, DTTOPTSFc.ptShadowOffset);
-	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->ptShadowOffset);
-	}
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iBorderSize, (jint)lpStruct->iBorderSize);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iFontPropId, (jint)lpStruct->iFontPropId);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iColorPropId, (jint)lpStruct->iColorPropId);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iStateId, (jint)lpStruct->iStateId);
-	(*env)->SetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay, (jboolean)lpStruct->fApplyOverlay);
-	(*env)->SetIntField(env, lpObject, DTTOPTSFc.iGlowSize, (jint)lpStruct->iGlowSize);
-	(*env)->SetLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback, (jlong)lpStruct->pfnDrawTextCallback);
-	(*env)->SetLongField(env, lpObject, DTTOPTSFc.lParam, (jlong)lpStruct->lParam);
-}
-#endif
-
 #ifndef NO_EMR
 typedef struct EMR_FID_CACHE {
 	int cached;
@@ -1706,7 +1241,7 @@ void setEMREXTCREATEFONTINDIRECTWFields(JNIEnv *env, jobject lpObject, EMREXTCRE
 typedef struct EXTLOGFONTW_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID elfLogFont, elfFullName, elfStyle, elfVersion, elfStyleSize, elfMatch, elfReserved, elfVendorId, elfCulture, elfPanose;
+	jfieldID elfLogFont;
 } EXTLOGFONTW_FID_CACHE;
 
 EXTLOGFONTW_FID_CACHE EXTLOGFONTWFc;
@@ -1716,15 +1251,6 @@ 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/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");
-	EXTLOGFONTWFc.elfStyleSize = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfStyleSize", "I");
-	EXTLOGFONTWFc.elfMatch = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfMatch", "I");
-	EXTLOGFONTWFc.elfReserved = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfReserved", "I");
-	EXTLOGFONTWFc.elfVendorId = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfVendorId", "[B");
-	EXTLOGFONTWFc.elfCulture = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfCulture", "I");
-	EXTLOGFONTWFc.elfPanose = (*env)->GetFieldID(env, EXTLOGFONTWFc.clazz, "elfPanose", "Lorg/eclipse/swt/internal/win32/PANOSE;");
 	EXTLOGFONTWFc.cached = 1;
 }
 
@@ -1735,27 +1261,6 @@ EXTLOGFONTW *getEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lp
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfLogFont);
 	if (lpObject1 != NULL) getLOGFONTFields(env, lpObject1, &lpStruct->elfLogFont);
 	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / sizeof(jchar), (jchar *)lpStruct->elfFullName);
-	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfStyle);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / sizeof(jchar), (jchar *)lpStruct->elfStyle);
-	}
-	lpStruct->elfVersion = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfVersion);
-	lpStruct->elfStyleSize = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfStyleSize);
-	lpStruct->elfMatch = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfMatch);
-	lpStruct->elfReserved = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfReserved);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfVendorId);
-	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfVendorId), (jbyte *)lpStruct->elfVendorId);
-	}
-	lpStruct->elfCulture = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfCulture);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfPanose);
-	if (lpObject1 != NULL) getPANOSEFields(env, lpObject1, &lpStruct->elfPanose);
-	}
 	return lpStruct;
 }
 
@@ -1766,61 +1271,6 @@ void setEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lpStruct)
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfLogFont);
 	if (lpObject1 != NULL) setLOGFONTFields(env, lpObject1, &lpStruct->elfLogFont);
 	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / sizeof(jchar), (jchar *)lpStruct->elfFullName);
-	}
-	{
-	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfStyle);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / sizeof(jchar), (jchar *)lpStruct->elfStyle);
-	}
-	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfVersion, (jint)lpStruct->elfVersion);
-	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfStyleSize, (jint)lpStruct->elfStyleSize);
-	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfMatch, (jint)lpStruct->elfMatch);
-	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfReserved, (jint)lpStruct->elfReserved);
-	{
-	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfVendorId);
-	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfVendorId), (jbyte *)lpStruct->elfVendorId);
-	}
-	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfCulture, (jint)lpStruct->elfCulture);
-	{
-	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfPanose);
-	if (lpObject1 != NULL) setPANOSEFields(env, lpObject1, &lpStruct->elfPanose);
-	}
-}
-#endif
-
-#ifndef NO_FILETIME
-typedef struct FILETIME_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID dwLowDateTime, dwHighDateTime;
-} FILETIME_FID_CACHE;
-
-FILETIME_FID_CACHE FILETIMEFc;
-
-void cacheFILETIMEFields(JNIEnv *env, jobject lpObject)
-{
-	if (FILETIMEFc.cached) return;
-	FILETIMEFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	FILETIMEFc.dwLowDateTime = (*env)->GetFieldID(env, FILETIMEFc.clazz, "dwLowDateTime", "I");
-	FILETIMEFc.dwHighDateTime = (*env)->GetFieldID(env, FILETIMEFc.clazz, "dwHighDateTime", "I");
-	FILETIMEFc.cached = 1;
-}
-
-FILETIME *getFILETIMEFields(JNIEnv *env, jobject lpObject, FILETIME *lpStruct)
-{
-	if (!FILETIMEFc.cached) cacheFILETIMEFields(env, lpObject);
-	lpStruct->dwLowDateTime = (*env)->GetIntField(env, lpObject, FILETIMEFc.dwLowDateTime);
-	lpStruct->dwHighDateTime = (*env)->GetIntField(env, lpObject, FILETIMEFc.dwHighDateTime);
-	return lpStruct;
-}
-
-void setFILETIMEFields(JNIEnv *env, jobject lpObject, FILETIME *lpStruct)
-{
-	if (!FILETIMEFc.cached) cacheFILETIMEFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, FILETIMEFc.dwLowDateTime, (jint)lpStruct->dwLowDateTime);
-	(*env)->SetIntField(env, lpObject, FILETIMEFc.dwHighDateTime, (jint)lpStruct->dwHighDateTime);
 }
 #endif
 
@@ -2707,46 +2157,6 @@ void setLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct)
 }
 #endif
 
-#ifndef NO_LOGPEN
-typedef struct LOGPEN_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID lopnStyle, x, y, lopnColor;
-} LOGPEN_FID_CACHE;
-
-LOGPEN_FID_CACHE LOGPENFc;
-
-void cacheLOGPENFields(JNIEnv *env, jobject lpObject)
-{
-	if (LOGPENFc.cached) return;
-	LOGPENFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	LOGPENFc.lopnStyle = (*env)->GetFieldID(env, LOGPENFc.clazz, "lopnStyle", "I");
-	LOGPENFc.x = (*env)->GetFieldID(env, LOGPENFc.clazz, "x", "I");
-	LOGPENFc.y = (*env)->GetFieldID(env, LOGPENFc.clazz, "y", "I");
-	LOGPENFc.lopnColor = (*env)->GetFieldID(env, LOGPENFc.clazz, "lopnColor", "I");
-	LOGPENFc.cached = 1;
-}
-
-LOGPEN *getLOGPENFields(JNIEnv *env, jobject lpObject, LOGPEN *lpStruct)
-{
-	if (!LOGPENFc.cached) cacheLOGPENFields(env, lpObject);
-	lpStruct->lopnStyle = (*env)->GetIntField(env, lpObject, LOGPENFc.lopnStyle);
-	lpStruct->lopnWidth.x = (*env)->GetIntField(env, lpObject, LOGPENFc.x);
-	lpStruct->lopnWidth.y = (*env)->GetIntField(env, lpObject, LOGPENFc.y);
-	lpStruct->lopnColor = (*env)->GetIntField(env, lpObject, LOGPENFc.lopnColor);
-	return lpStruct;
-}
-
-void setLOGPENFields(JNIEnv *env, jobject lpObject, LOGPEN *lpStruct)
-{
-	if (!LOGPENFc.cached) cacheLOGPENFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, LOGPENFc.lopnStyle, (jint)lpStruct->lopnStyle);
-	(*env)->SetIntField(env, lpObject, LOGPENFc.x, (jint)lpStruct->lopnWidth.x);
-	(*env)->SetIntField(env, lpObject, LOGPENFc.y, (jint)lpStruct->lopnWidth.y);
-	(*env)->SetIntField(env, lpObject, LOGPENFc.lopnColor, (jint)lpStruct->lopnColor);
-}
-#endif
-
 #ifndef NO_LVCOLUMN
 typedef struct LVCOLUMN_FID_CACHE {
 	int cached;
@@ -5176,64 +4586,6 @@ void setPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct)
 }
 #endif
 
-#ifndef NO_PANOSE
-typedef struct PANOSE_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID bFamilyType, bSerifStyle, bWeight, bProportion, bContrast, bStrokeVariation, bArmStyle, bLetterform, bMidline, bXHeight;
-} PANOSE_FID_CACHE;
-
-PANOSE_FID_CACHE PANOSEFc;
-
-void cachePANOSEFields(JNIEnv *env, jobject lpObject)
-{
-	if (PANOSEFc.cached) return;
-	PANOSEFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PANOSEFc.bFamilyType = (*env)->GetFieldID(env, PANOSEFc.clazz, "bFamilyType", "B");
-	PANOSEFc.bSerifStyle = (*env)->GetFieldID(env, PANOSEFc.clazz, "bSerifStyle", "B");
-	PANOSEFc.bWeight = (*env)->GetFieldID(env, PANOSEFc.clazz, "bWeight", "B");
-	PANOSEFc.bProportion = (*env)->GetFieldID(env, PANOSEFc.clazz, "bProportion", "B");
-	PANOSEFc.bContrast = (*env)->GetFieldID(env, PANOSEFc.clazz, "bContrast", "B");
-	PANOSEFc.bStrokeVariation = (*env)->GetFieldID(env, PANOSEFc.clazz, "bStrokeVariation", "B");
-	PANOSEFc.bArmStyle = (*env)->GetFieldID(env, PANOSEFc.clazz, "bArmStyle", "B");
-	PANOSEFc.bLetterform = (*env)->GetFieldID(env, PANOSEFc.clazz, "bLetterform", "B");
-	PANOSEFc.bMidline = (*env)->GetFieldID(env, PANOSEFc.clazz, "bMidline", "B");
-	PANOSEFc.bXHeight = (*env)->GetFieldID(env, PANOSEFc.clazz, "bXHeight", "B");
-	PANOSEFc.cached = 1;
-}
-
-PANOSE *getPANOSEFields(JNIEnv *env, jobject lpObject, PANOSE *lpStruct)
-{
-	if (!PANOSEFc.cached) cachePANOSEFields(env, lpObject);
-	lpStruct->bFamilyType = (*env)->GetByteField(env, lpObject, PANOSEFc.bFamilyType);
-	lpStruct->bSerifStyle = (*env)->GetByteField(env, lpObject, PANOSEFc.bSerifStyle);
-	lpStruct->bWeight = (*env)->GetByteField(env, lpObject, PANOSEFc.bWeight);
-	lpStruct->bProportion = (*env)->GetByteField(env, lpObject, PANOSEFc.bProportion);
-	lpStruct->bContrast = (*env)->GetByteField(env, lpObject, PANOSEFc.bContrast);
-	lpStruct->bStrokeVariation = (*env)->GetByteField(env, lpObject, PANOSEFc.bStrokeVariation);
-	lpStruct->bArmStyle = (*env)->GetByteField(env, lpObject, PANOSEFc.bArmStyle);
-	lpStruct->bLetterform = (*env)->GetByteField(env, lpObject, PANOSEFc.bLetterform);
-	lpStruct->bMidline = (*env)->GetByteField(env, lpObject, PANOSEFc.bMidline);
-	lpStruct->bXHeight = (*env)->GetByteField(env, lpObject, PANOSEFc.bXHeight);
-	return lpStruct;
-}
-
-void setPANOSEFields(JNIEnv *env, jobject lpObject, PANOSE *lpStruct)
-{
-	if (!PANOSEFc.cached) cachePANOSEFields(env, lpObject);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bFamilyType, (jbyte)lpStruct->bFamilyType);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bSerifStyle, (jbyte)lpStruct->bSerifStyle);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bWeight, (jbyte)lpStruct->bWeight);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bProportion, (jbyte)lpStruct->bProportion);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bContrast, (jbyte)lpStruct->bContrast);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bStrokeVariation, (jbyte)lpStruct->bStrokeVariation);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bArmStyle, (jbyte)lpStruct->bArmStyle);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bLetterform, (jbyte)lpStruct->bLetterform);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bMidline, (jbyte)lpStruct->bMidline);
-	(*env)->SetByteField(env, lpObject, PANOSEFc.bXHeight, (jbyte)lpStruct->bXHeight);
-}
-#endif
-
 #ifndef NO_POINT
 typedef struct POINT_FID_CACHE {
 	int cached;
@@ -5769,46 +5121,6 @@ void setSCRIPT_CONTROLFields(JNIEnv *env, jobject lpObject, SCRIPT_CONTROL *lpSt
 }
 #endif
 
-#ifndef NO_SCRIPT_DIGITSUBSTITUTE
-typedef struct SCRIPT_DIGITSUBSTITUTE_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID NationalDigitLanguage, TraditionalDigitLanguage, DigitSubstitute, dwReserved;
-} SCRIPT_DIGITSUBSTITUTE_FID_CACHE;
-
-SCRIPT_DIGITSUBSTITUTE_FID_CACHE SCRIPT_DIGITSUBSTITUTEFc;
-
-void cacheSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject)
-{
-	if (SCRIPT_DIGITSUBSTITUTEFc.cached) return;
-	SCRIPT_DIGITSUBSTITUTEFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	SCRIPT_DIGITSUBSTITUTEFc.NationalDigitLanguage = (*env)->GetFieldID(env, SCRIPT_DIGITSUBSTITUTEFc.clazz, "NationalDigitLanguage", "S");
-	SCRIPT_DIGITSUBSTITUTEFc.TraditionalDigitLanguage = (*env)->GetFieldID(env, SCRIPT_DIGITSUBSTITUTEFc.clazz, "TraditionalDigitLanguage", "S");
-	SCRIPT_DIGITSUBSTITUTEFc.DigitSubstitute = (*env)->GetFieldID(env, SCRIPT_DIGITSUBSTITUTEFc.clazz, "DigitSubstitute", "B");
-	SCRIPT_DIGITSUBSTITUTEFc.dwReserved = (*env)->GetFieldID(env, SCRIPT_DIGITSUBSTITUTEFc.clazz, "dwReserved", "I");
-	SCRIPT_DIGITSUBSTITUTEFc.cached = 1;
-}
-
-SCRIPT_DIGITSUBSTITUTE *getSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject, SCRIPT_DIGITSUBSTITUTE *lpStruct)
-{
-	if (!SCRIPT_DIGITSUBSTITUTEFc.cached) cacheSCRIPT_DIGITSUBSTITUTEFields(env, lpObject);
-	lpStruct->NationalDigitLanguage = (*env)->GetShortField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.NationalDigitLanguage);
-	lpStruct->TraditionalDigitLanguage = (*env)->GetShortField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.TraditionalDigitLanguage);
-	lpStruct->DigitSubstitute = (*env)->GetByteField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.DigitSubstitute);
-	lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.dwReserved);
-	return lpStruct;
-}
-
-void setSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject, SCRIPT_DIGITSUBSTITUTE *lpStruct)
-{
-	if (!SCRIPT_DIGITSUBSTITUTEFc.cached) cacheSCRIPT_DIGITSUBSTITUTEFields(env, lpObject);
-	(*env)->SetShortField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.NationalDigitLanguage, (jshort)lpStruct->NationalDigitLanguage);
-	(*env)->SetShortField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.TraditionalDigitLanguage, (jshort)lpStruct->TraditionalDigitLanguage);
-	(*env)->SetByteField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.DigitSubstitute, (jbyte)lpStruct->DigitSubstitute);
-	(*env)->SetIntField(env, lpObject, SCRIPT_DIGITSUBSTITUTEFc.dwReserved, (jint)lpStruct->dwReserved);
-}
-#endif
-
 #ifndef NO_SCRIPT_FONTPROPERTIES
 typedef struct SCRIPT_FONTPROPERTIES_FID_CACHE {
 	int cached;
@@ -7282,40 +6594,6 @@ void setTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct)
 }
 #endif
 
-#ifndef NO_TVITEMEX
-typedef struct TVITEMEX_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID iIntegral;
-} TVITEMEX_FID_CACHE;
-
-TVITEMEX_FID_CACHE TVITEMEXFc;
-
-void cacheTVITEMEXFields(JNIEnv *env, jobject lpObject)
-{
-	if (TVITEMEXFc.cached) return;
-	cacheTVITEMFields(env, lpObject);
-	TVITEMEXFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	TVITEMEXFc.iIntegral = (*env)->GetFieldID(env, TVITEMEXFc.clazz, "iIntegral", "I");
-	TVITEMEXFc.cached = 1;
-}
-
-TVITEMEX *getTVITEMEXFields(JNIEnv *env, jobject lpObject, TVITEMEX *lpStruct)
-{
-	if (!TVITEMEXFc.cached) cacheTVITEMEXFields(env, lpObject);
-	getTVITEMFields(env, lpObject, (TVITEM *)lpStruct);
-	lpStruct->iIntegral = (*env)->GetIntField(env, lpObject, TVITEMEXFc.iIntegral);
-	return lpStruct;
-}
-
-void setTVITEMEXFields(JNIEnv *env, jobject lpObject, TVITEMEX *lpStruct)
-{
-	if (!TVITEMEXFc.cached) cacheTVITEMEXFields(env, lpObject);
-	setTVITEMFields(env, lpObject, (TVITEM *)lpStruct);
-	(*env)->SetIntField(env, lpObject, TVITEMEXFc.iIntegral, (jint)lpStruct->iIntegral);
-}
-#endif
-
 #ifndef NO_TVSORTCB
 typedef struct TVSORTCB_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 9ac559204a..4e99d22fb5 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
@@ -113,54 +113,6 @@ void setCANDIDATEFORMFields(JNIEnv *env, jobject lpObject, CANDIDATEFORM *lpStru
 #define CANDIDATEFORM_sizeof() 0
 #endif
 
-#ifndef NO_CERT_CONTEXT
-void cacheCERT_CONTEXTFields(JNIEnv *env, jobject lpObject);
-CERT_CONTEXT *getCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT *lpStruct);
-void setCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT *lpStruct);
-#define CERT_CONTEXT_sizeof() sizeof(CERT_CONTEXT)
-#else
-#define cacheCERT_CONTEXTFields(a,b)
-#define getCERT_CONTEXTFields(a,b,c) NULL
-#define setCERT_CONTEXTFields(a,b,c)
-#define CERT_CONTEXT_sizeof() 0
-#endif
-
-#ifndef NO_CERT_INFO
-void cacheCERT_INFOFields(JNIEnv *env, jobject lpObject);
-CERT_INFO *getCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct);
-void setCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct);
-#define CERT_INFO_sizeof() sizeof(CERT_INFO)
-#else
-#define cacheCERT_INFOFields(a,b)
-#define getCERT_INFOFields(a,b,c) NULL
-#define setCERT_INFOFields(a,b,c)
-#define CERT_INFO_sizeof() 0
-#endif
-
-#ifndef NO_CERT_NAME_BLOB
-void cacheCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject);
-CERT_NAME_BLOB *getCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME_BLOB *lpStruct);
-void setCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME_BLOB *lpStruct);
-#define CERT_NAME_BLOB_sizeof() sizeof(CERT_NAME_BLOB)
-#else
-#define cacheCERT_NAME_BLOBFields(a,b)
-#define getCERT_NAME_BLOBFields(a,b,c) NULL
-#define setCERT_NAME_BLOBFields(a,b,c)
-#define CERT_NAME_BLOB_sizeof() 0
-#endif
-
-#ifndef NO_CERT_PUBLIC_KEY_INFO
-void cacheCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject);
-CERT_PUBLIC_KEY_INFO *getCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject, CERT_PUBLIC_KEY_INFO *lpStruct);
-void setCERT_PUBLIC_KEY_INFOFields(JNIEnv *env, jobject lpObject, CERT_PUBLIC_KEY_INFO *lpStruct);
-#define CERT_PUBLIC_KEY_INFO_sizeof() sizeof(CERT_PUBLIC_KEY_INFO)
-#else
-#define cacheCERT_PUBLIC_KEY_INFOFields(a,b)
-#define getCERT_PUBLIC_KEY_INFOFields(a,b,c) NULL
-#define setCERT_PUBLIC_KEY_INFOFields(a,b,c)
-#define CERT_PUBLIC_KEY_INFO_sizeof() 0
-#endif
-
 #ifndef NO_CHOOSECOLOR
 void cacheCHOOSECOLORFields(JNIEnv *env, jobject lpObject);
 CHOOSECOLOR *getCHOOSECOLORFields(JNIEnv *env, jobject lpObject, CHOOSECOLOR *lpStruct);
@@ -233,54 +185,6 @@ void setCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct
 #define CREATESTRUCT_sizeof() 0
 #endif
 
-#ifndef NO_CRYPT_ALGORITHM_IDENTIFIER
-void cacheCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject);
-CRYPT_ALGORITHM_IDENTIFIER *getCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct);
-void setCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct);
-#define CRYPT_ALGORITHM_IDENTIFIER_sizeof() sizeof(CRYPT_ALGORITHM_IDENTIFIER)
-#else
-#define cacheCRYPT_ALGORITHM_IDENTIFIERFields(a,b)
-#define getCRYPT_ALGORITHM_IDENTIFIERFields(a,b,c) NULL
-#define setCRYPT_ALGORITHM_IDENTIFIERFields(a,b,c)
-#define CRYPT_ALGORITHM_IDENTIFIER_sizeof() 0
-#endif
-
-#ifndef NO_CRYPT_BIT_BLOB
-void cacheCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject);
-CRYPT_BIT_BLOB *getCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT_BLOB *lpStruct);
-void setCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT_BLOB *lpStruct);
-#define CRYPT_BIT_BLOB_sizeof() sizeof(CRYPT_BIT_BLOB)
-#else
-#define cacheCRYPT_BIT_BLOBFields(a,b)
-#define getCRYPT_BIT_BLOBFields(a,b,c) NULL
-#define setCRYPT_BIT_BLOBFields(a,b,c)
-#define CRYPT_BIT_BLOB_sizeof() 0
-#endif
-
-#ifndef NO_CRYPT_INTEGER_BLOB
-void cacheCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject);
-CRYPT_INTEGER_BLOB *getCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_INTEGER_BLOB *lpStruct);
-void setCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_INTEGER_BLOB *lpStruct);
-#define CRYPT_INTEGER_BLOB_sizeof() sizeof(CRYPT_INTEGER_BLOB)
-#else
-#define cacheCRYPT_INTEGER_BLOBFields(a,b)
-#define getCRYPT_INTEGER_BLOBFields(a,b,c) NULL
-#define setCRYPT_INTEGER_BLOBFields(a,b,c)
-#define CRYPT_INTEGER_BLOB_sizeof() 0
-#endif
-
-#ifndef NO_CRYPT_OBJID_BLOB
-void cacheCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject);
-CRYPT_OBJID_BLOB *getCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB *lpStruct);
-void setCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB *lpStruct);
-#define CRYPT_OBJID_BLOB_sizeof() sizeof(CRYPT_OBJID_BLOB)
-#else
-#define cacheCRYPT_OBJID_BLOBFields(a,b)
-#define getCRYPT_OBJID_BLOBFields(a,b,c) NULL
-#define setCRYPT_OBJID_BLOBFields(a,b,c)
-#define CRYPT_OBJID_BLOB_sizeof() 0
-#endif
-
 #ifndef NO_DEVMODE
 void cacheDEVMODEFields(JNIEnv *env, jobject lpObject);
 DEVMODE *getDEVMODEFields(JNIEnv *env, jobject lpObject, DEVMODE *lpStruct);
@@ -353,18 +257,6 @@ void setDROPFILESFields(JNIEnv *env, jobject lpObject, DROPFILES *lpStruct);
 #define DROPFILES_sizeof() 0
 #endif
 
-#ifndef NO_DTTOPTS
-void cacheDTTOPTSFields(JNIEnv *env, jobject lpObject);
-DTTOPTS *getDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct);
-void setDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct);
-#define DTTOPTS_sizeof() sizeof(DTTOPTS)
-#else
-#define cacheDTTOPTSFields(a,b)
-#define getDTTOPTSFields(a,b,c) NULL
-#define setDTTOPTSFields(a,b,c)
-#define DTTOPTS_sizeof() 0
-#endif
-
 #ifndef NO_EMR
 void cacheEMRFields(JNIEnv *env, jobject lpObject);
 EMR *getEMRFields(JNIEnv *env, jobject lpObject, EMR *lpStruct);
@@ -401,18 +293,6 @@ void setEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lpStruct);
 #define EXTLOGFONTW_sizeof() 0
 #endif
 
-#ifndef NO_FILETIME
-void cacheFILETIMEFields(JNIEnv *env, jobject lpObject);
-FILETIME *getFILETIMEFields(JNIEnv *env, jobject lpObject, FILETIME *lpStruct);
-void setFILETIMEFields(JNIEnv *env, jobject lpObject, FILETIME *lpStruct);
-#define FILETIME_sizeof() sizeof(FILETIME)
-#else
-#define cacheFILETIMEFields(a,b)
-#define getFILETIMEFields(a,b,c) NULL
-#define setFILETIMEFields(a,b,c)
-#define FILETIME_sizeof() 0
-#endif
-
 #ifndef NO_FLICK_DATA
 void cacheFLICK_DATAFields(JNIEnv *env, jobject lpObject);
 FLICK_DATA *getFLICK_DATAFields(JNIEnv *env, jobject lpObject, FLICK_DATA *lpStruct);
@@ -641,18 +521,6 @@ void setLOGFONTFields(JNIEnv *env, jobject lpObject, LOGFONT *lpStruct);
 #define LOGFONT_sizeof() 0
 #endif
 
-#ifndef NO_LOGPEN
-void cacheLOGPENFields(JNIEnv *env, jobject lpObject);
-LOGPEN *getLOGPENFields(JNIEnv *env, jobject lpObject, LOGPEN *lpStruct);
-void setLOGPENFields(JNIEnv *env, jobject lpObject, LOGPEN *lpStruct);
-#define LOGPEN_sizeof() sizeof(LOGPEN)
-#else
-#define cacheLOGPENFields(a,b)
-#define getLOGPENFields(a,b,c) NULL
-#define setLOGPENFields(a,b,c)
-#define LOGPEN_sizeof() 0
-#endif
-
 #ifndef NO_LVCOLUMN
 void cacheLVCOLUMNFields(JNIEnv *env, jobject lpObject);
 LVCOLUMN *getLVCOLUMNFields(JNIEnv *env, jobject lpObject, LVCOLUMN *lpStruct);
@@ -1145,18 +1013,6 @@ void setPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct);
 #define PAINTSTRUCT_sizeof() 0
 #endif
 
-#ifndef NO_PANOSE
-void cachePANOSEFields(JNIEnv *env, jobject lpObject);
-PANOSE *getPANOSEFields(JNIEnv *env, jobject lpObject, PANOSE *lpStruct);
-void setPANOSEFields(JNIEnv *env, jobject lpObject, PANOSE *lpStruct);
-#define PANOSE_sizeof() sizeof(PANOSE)
-#else
-#define cachePANOSEFields(a,b)
-#define getPANOSEFields(a,b,c) NULL
-#define setPANOSEFields(a,b,c)
-#define PANOSE_sizeof() 0
-#endif
-
 #ifndef NO_POINT
 void cachePOINTFields(JNIEnv *env, jobject lpObject);
 POINT *getPOINTFields(JNIEnv *env, jobject lpObject, POINT *lpStruct);
@@ -1277,18 +1133,6 @@ void setSCRIPT_CONTROLFields(JNIEnv *env, jobject lpObject, SCRIPT_CONTROL *lpSt
 #define SCRIPT_CONTROL_sizeof() 0
 #endif
 
-#ifndef NO_SCRIPT_DIGITSUBSTITUTE
-void cacheSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject);
-SCRIPT_DIGITSUBSTITUTE *getSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject, SCRIPT_DIGITSUBSTITUTE *lpStruct);
-void setSCRIPT_DIGITSUBSTITUTEFields(JNIEnv *env, jobject lpObject, SCRIPT_DIGITSUBSTITUTE *lpStruct);
-#define SCRIPT_DIGITSUBSTITUTE_sizeof() sizeof(SCRIPT_DIGITSUBSTITUTE)
-#else
-#define cacheSCRIPT_DIGITSUBSTITUTEFields(a,b)
-#define getSCRIPT_DIGITSUBSTITUTEFields(a,b,c) NULL
-#define setSCRIPT_DIGITSUBSTITUTEFields(a,b,c)
-#define SCRIPT_DIGITSUBSTITUTE_sizeof() 0
-#endif
-
 #ifndef NO_SCRIPT_FONTPROPERTIES
 void cacheSCRIPT_FONTPROPERTIESFields(JNIEnv *env, jobject lpObject);
 SCRIPT_FONTPROPERTIES *getSCRIPT_FONTPROPERTIESFields(JNIEnv *env, jobject lpObject, SCRIPT_FONTPROPERTIES *lpStruct);
@@ -1613,18 +1457,6 @@ void setTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct);
 #define TVITEM_sizeof() 0
 #endif
 
-#ifndef NO_TVITEMEX
-void cacheTVITEMEXFields(JNIEnv *env, jobject lpObject);
-TVITEMEX *getTVITEMEXFields(JNIEnv *env, jobject lpObject, TVITEMEX *lpStruct);
-void setTVITEMEXFields(JNIEnv *env, jobject lpObject, TVITEMEX *lpStruct);
-#define TVITEMEX_sizeof() sizeof(TVITEMEX)
-#else
-#define cacheTVITEMEXFields(a,b)
-#define getTVITEMEXFields(a,b,c) NULL
-#define setTVITEMEXFields(a,b,c)
-#define TVITEMEX_sizeof() 0
-#endif
-
 #ifndef NO_TVSORTCB
 void cacheTVSORTCBFields(JNIEnv *env, jobject lpObject);
 TVSORTCB *getTVSORTCBFields(JNIEnv *env, jobject lpObject, TVSORTCB *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index 1bff66d624..c49fc6e95d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
@@ -657,14 +657,6 @@ public static final int IA2_SCROLL_TYPE_ANYWHERE = 6;
 /** Accessibility natives */
 
 /**
- * @method flags=dynamic
- * @param hwnd cast=(HWND)
- * @param dwObjectID cast=(DWORD)
- * @param ppvObject cast=(LPVOID *)
- */
-public static final native int AccessibleObjectFromWindow (long hwnd, int dwObjectID, GUID riid, long[] ppvObject);
-/**
- * @method flags=dynamic
  * @param hwnd cast=(HWND)
  * @param ppvObject cast=(LPVOID *)
  */
@@ -674,15 +666,6 @@ public static final native int CreateStdAccessibleObject (long hwnd, int idObjec
  * @param pAcc cast=(LPUNKNOWN)
  */
 public static final native long LresultFromObject (GUID riid, long wParam, long pAcc);
-/**
- * @method flags=dynamic
- * @param paccContainer cast=(IAccessible *)
- * @param iChildStart cast=(LONG)
- * @param cChildren cast=(LONG)
- * @param rgvarChildren cast=(VARIANT *)
- * @param pcObtained cast=(LONG *)
- */
-public static final native int AccessibleChildren(long paccContainer, int iChildStart, int cChildren, long rgvarChildren, int [] pcObtained);
 
 /* sizeof's */
 public static final native int CAUUID_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java
deleted file mode 100644
index d4bb416b26..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CERT_CONTEXT {
-	public int dwCertEncodingType;
-	/** @field cast=(BYTE *) */
-	public long pbCertEncoded;
-	public int cbCertEncoded;
-	/** @field cast=(PCERT_INFO) */
-	public long pCertInfo;
-	/** @field cast=(HCERTSTORE) */
-	public long hCertStore;
-
-	public static final int sizeof = OS.CERT_CONTEXT_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java
deleted file mode 100644
index f38f3aaafe..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CERT_INFO {
-	public int dwVersion;
-	public CRYPT_INTEGER_BLOB SerialNumber = new CRYPT_INTEGER_BLOB ();
-	public CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm = new CRYPT_ALGORITHM_IDENTIFIER ();
-	public CERT_NAME_BLOB Issuer = new CERT_NAME_BLOB ();
-	public FILETIME NotBefore = new FILETIME ();
-	public FILETIME NotAfter = new FILETIME ();
-	public CERT_NAME_BLOB Subject = new CERT_NAME_BLOB ();
-	public CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo = new CERT_PUBLIC_KEY_INFO ();
-	public CRYPT_BIT_BLOB IssuerUniqueId = new CRYPT_BIT_BLOB ();
-	public CRYPT_BIT_BLOB SubjectUniqueId = new CRYPT_BIT_BLOB ();
-	public int cExtension;
-	/** @field cast=(PCERT_EXTENSION) */
-	public long rgExtension;
-
-	public static final int sizeof = OS.CERT_INFO_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java
deleted file mode 100644
index c563cbc3b2..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CERT_NAME_BLOB {
-	public int cbData;
-	/** @field cast=(BYTE *) */
-	public long pbData;
-
-	static final public int sizeof = OS.CERT_NAME_BLOB_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_PUBLIC_KEY_INFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_PUBLIC_KEY_INFO.java
deleted file mode 100644
index 64557cde33..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_PUBLIC_KEY_INFO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 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 CERT_PUBLIC_KEY_INFO {
-	public CRYPT_ALGORITHM_IDENTIFIER Algorithm = new CRYPT_ALGORITHM_IDENTIFIER ();
-	public CRYPT_BIT_BLOB PublicKey = new CRYPT_BIT_BLOB ();
-
-	static final public int sizeof = OS.CERT_PUBLIC_KEY_INFO_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java
deleted file mode 100644
index 47d3c4216b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CRYPT_ALGORITHM_IDENTIFIER {
-	/** @field cast=(LPSTR) */
-	public long pszObjId;
-	public CRYPT_OBJID_BLOB Parameters = new CRYPT_OBJID_BLOB ();
-
-	static final public int sizeof = OS.CRYPT_ALGORITHM_IDENTIFIER_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java
deleted file mode 100644
index a6cb3b1ef4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CRYPT_BIT_BLOB {
-	public int cbData;
-	/** @field cast=(BYTE *) */
-	public long pbData;
-	public int cUnusedBits;
-
-	static final public int sizeof = OS.CRYPT_BIT_BLOB_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java
deleted file mode 100644
index 1d83007c86..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CRYPT_INTEGER_BLOB {
-	public int cbData;
-	/** @field cast=(BYTE *) */
-	public long pbData;
-
-	static final public int sizeof = OS.CRYPT_INTEGER_BLOB_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java
deleted file mode 100644
index 56cccdf923..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 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 CRYPT_OBJID_BLOB {
-	public int cbData;
-	/** @field cast=(BYTE *) */
-	public long pbData;
-
-	static final public int sizeof = OS.CRYPT_OBJID_BLOB_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java
deleted file mode 100644
index a642165f91..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 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 DTTOPTS {
-	public int dwSize;
-	public int dwFlags;
-	public int crText;
-	public int crBorder;
-	public int crShadow;
-	public int iTextShadowType;
-	public POINT ptShadowOffset;
-	public int iBorderSize;
-	public int iFontPropId;
-	public int iColorPropId;
-	public int iStateId;
-	public boolean fApplyOverlay;
-	public int iGlowSize;
-	/** @field cast=(DTT_CALLBACK_PROC) */
-	public long pfnDrawTextCallback;
-	public long lParam;
-	public static final int sizeof = OS.DTTOPTS_sizeof ();
-}
\ No newline at end of file
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 5ca4ddb112..d3cb745728 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
@@ -15,14 +15,6 @@ package org.eclipse.swt.internal.win32;
 
 public class EXTLOGFONTW {
 	public LOGFONT elfLogFont = new LOGFONT();
-	public char[] elfFullName = new char[OS.LF_FULLFACESIZE];
-	public char[] elfStyle = new char[OS.LF_FACESIZE];
-	public int elfVersion;
-	public int elfStyleSize;
-	public int elfMatch;
-	public int elfReserved;
-	public byte[] elfVendorId = new byte[OS.ELF_VENDOR_SIZE];
-	public int elfCulture;
-	public PANOSE elfPanose = new PANOSE();
+	// the rest of the fields are omitted
 	public static final int sizeof = OS.EXTLOGFONTW_sizeof ();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
deleted file mode 100644
index 434305269f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
+++ /dev/null
@@ -1,21 +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 FILETIME {
-	public int dwLowDateTime;
-	public int dwHighDateTime;
-	static final public int sizeof = OS.FILETIME_sizeof ();
-}
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
deleted file mode 100644
index dec9b460bd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
+++ /dev/null
@@ -1,25 +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 LOGPEN {
-	public int lopnStyle;
-//	POINT lopnWidth;
-	/** @field accessor=lopnWidth.x */
-	public int x;
-	/** @field accessor=lopnWidth.y */
-	public int y;
-	public int lopnColor;
-	public static final int sizeof = OS.LOGPEN_sizeof ();
-}
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 722da0f222..1f8f91eb12 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
@@ -79,8 +79,8 @@ public class OS extends C {
 	public static final int ABS_LEFTPRESSED = 11;
 	public static final int ABS_RIGHTDISABLED = 16;
 	public static final int ABS_RIGHTHOT = 14;
-	public static final int	ABS_RIGHTNORMAL = 13;
-	public static final int	ABS_RIGHTPRESSED = 15;
+	public static final int ABS_RIGHTNORMAL = 13;
+	public static final int ABS_RIGHTPRESSED = 15;
 	public static final int ABS_UPDISABLED = 4;
 	public static final int ABS_UPHOT = 2;
 	public static final int ABS_UPNORMAL = 1;
@@ -107,20 +107,11 @@ public class OS extends C {
 	public static final int BCM_GETNOTELENGTH = BCM_FIRST + 0xb;
 	public static final int BCM_SETIMAGELIST = BCM_FIRST + 0x2;
 	public static final int BCM_SETNOTE = BCM_FIRST + 0x9;
-	public static final int BDR_RAISEDOUTER = 0x0001;
-	public static final int BDR_SUNKENOUTER = 0x0002;
-	public static final int BDR_RAISEDINNER = 0x0004;
 	public static final int BDR_SUNKENINNER = 0x0008;
-	public static final int BDR_OUTER = 0x0003;
-	public static final int BDR_INNER = 0x000c;
-	public static final int BDR_RAISED = 0x0005;
-	public static final int BDR_SUNKEN = 0x000a;
-	public static final int BF_ADJUST = 0x2000;
 	public static final int BF_LEFT = 0x0001;
 	public static final int BF_TOP = 0x0002;
 	public static final int BF_RIGHT = 0x0004;
 	public static final int BF_BOTTOM = 0x0008;
-	public static final int BF_RECT = (BF_LEFT | BF_TOP | BF_RIGHT | BF_BOTTOM);
 	public static final int BITSPIXEL = 0xc;
 	public static final int BI_BITFIELDS = 3;
 	public static final int BI_RGB = 0;
@@ -137,12 +128,6 @@ public class OS extends C {
 	public static final int BN_CLICKED = 0x0;
 	public static final int BN_DOUBLECLICKED = 0x5;
 	public static final int BPBF_COMPATIBLEBITMAP = 0;
-	public static final int BPBF_DIB = 1;
-	public static final int BPBF_TOPDOWNDIB = 2;
-	public static final int BPBF_TOPDOWNMONODIB = 3;
-	public static final int BPPF_ERASE = 0x0001;
-	public static final int BPPF_NOCLIP = 0x0002;
-	public static final int BPPF_NONCLIENT = 0x0004;
 	public static final int BP_PUSHBUTTON = 1;
 	public static final int BP_RADIOBUTTON = 2;
 	public static final int BP_CHECKBOX = 3;
@@ -227,9 +212,6 @@ public class OS extends C {
 	public static final int CCHDEVICENAME = 32;
 	public static final int CCHFORMNAME = 32;
 	public static final int CCHILDREN_SCROLLBAR = 5;
-	public static final int CCM_FIRST = 0x2000;
-	public static final int CCM_SETBKCOLOR = 0x2001;
-	public static final int CCM_SETVERSION = 0x2007;
 	public static final int CCS_NODIVIDER = 0x40;
 	public static final int CCS_NORESIZE = 0x4;
 	public static final int CCS_VERT = 0x80;
@@ -271,23 +253,7 @@ public class OS extends C {
 	public static final int CDRF_NOTIFYSUBITEMDRAW = 0x00000020;
 	public static final int CDRF_SKIPDEFAULT = 0x04;
 	public static final int CDRF_SKIPPOSTPAINT = 0x00000100;
-	public static final int CERT_SIMPLE_NAME_STR = 1;
-	public static final int CFE_AUTOCOLOR = 0x40000000;
-	public static final int CFE_ITALIC = 0x2;
-	public static final int CFE_STRIKEOUT = 0x8;
-	public static final int CFE_UNDERLINE = 0x4;
-	public static final int CFM_BOLD = 0x1;
-	public static final int CFM_CHARSET = 0x8000000;
-	public static final int CFM_COLOR = 0x40000000;
-	public static final int CFM_FACE = 0x20000000;
-	public static final int CFM_ITALIC = 0x2;
-	public static final int CFM_SIZE = 0x80000000;
-	public static final int CFM_STRIKEOUT = 0x8;
-	public static final int CFM_UNDERLINE = 0x4;
-	public static final int CFM_WEIGHT = 0x400000;
-	public static final int CFS_POINT = 0x2;
 	public static final int CFS_RECT = 0x1;
-	public static final int CFS_CANDIDATEPOS = 0x0040;
 	public static final int CFS_EXCLUDE = 0x0080;
 	public static final int CF_EFFECTS = 0x100;
 	public static final int CF_INITTOLOGFONTSTRUCT = 0x40;
@@ -421,11 +387,8 @@ public class OS extends C {
 	public static final int EBP_HEADERBACKGROUND = 1;
 	public static final int EC_LEFTMARGIN = 0x1;
 	public static final int EC_RIGHTMARGIN = 0x2;
-	public static final int EDGE_RAISED = (BDR_RAISEDOUTER | BDR_RAISEDINNER);
-	public static final int EDGE_SUNKEN = (BDR_SUNKENOUTER | BDR_SUNKENINNER);
-	public static final int EDGE_ETCHED = (BDR_SUNKENOUTER | BDR_RAISEDINNER);
-	public static final int EDGE_BUMP = (BDR_RAISEDOUTER | BDR_SUNKENINNER);
-	public static final int ELF_VENDOR_SIZE = 4;
+	public static final int EDGE_SUNKEN = 10;
+	public static final int EDGE_ETCHED = 6;
 	public static final int EM_CANUNDO = 0xc6;
 	public static final int EM_CHARFROMPOS = 0xd7;
 	public static final int EM_DISPLAYBAND = 0x433;
@@ -483,11 +446,7 @@ public class OS extends C {
 	public static final int ETS_FOCUSED = 5;
 	public static final int ETS_READONLY = 6;
 	public static final int EVENT_OBJECT_FOCUS = 0x8005;
-	public static final int EVENT_OBJECT_LOCATIONCHANGE = 0x800B;
-	public static final int EVENT_OBJECT_SELECTIONWITHIN = 0x8009;
-	public static final int EVENT_OBJECT_VALUECHANGE = 0x800E;
 	public static final short FADF_FIXEDSIZE = 0x10;
-	public static final short FADF_HAVEVARTYPE = 0x80;
 	public static final int FALT = 0x10;
 	public static final int FCONTROL = 0x8;
 	public static final int FE_FONTSMOOTHINGCLEARTYPE = 0x0002;
@@ -511,11 +470,6 @@ public class OS extends C {
 	public static final int FR_PRIVATE = 0x10;
 	public static final int FSHIFT = 0x4;
 	public static final int FVIRTKEY = 0x1;
-	public static final int GBS_NORMAL = 1;
-	public static final int GBS_DISABLED = 2;
-	public static final int GBF_DIRECT = 0x00000001;
-	public static final int GBF_COPY = 0x00000002;
-	public static final int GBF_VALIDBITS = 0x00000003;
 	public static final int GCP_REORDER = 0x0002;
 	public static final int GCP_GLYPHSHAPE = 0x0010;
 	public static final int GCP_CLASSIN = 0x00080000;
@@ -537,8 +491,6 @@ public class OS extends C {
 	public static final int GID_ROTATE = 5;
 	public static final int GID_TWOFINGERTAP = 6;
 	public static final int GID_PRESSANDTAP = 7;
-	public static final int GLPS_CLOSED = 1;
-	public static final int GLPS_OPENED = 2;
 	public static final int GM_ADVANCED = 2;
 	public static final int GMDI_USEDISABLED = 0x1;
 	public static final int GMEM_FIXED = 0x0;
@@ -546,8 +498,6 @@ public class OS extends C {
 	public static final int GMEM_ZEROINIT = 0x40;
 	public static final int GRADIENT_FILL_RECT_H = 0x0;
 	public static final int GRADIENT_FILL_RECT_V = 0x1;
-	public static final int GUI_16BITTASK = 0x20;
-	public static final int GUI_CARETBLINKING = 0x1;
 	public static final int GUI_INMENUMODE = 0x4;
 	public static final int GUI_INMOVESIZE = 0x2;
 	public static final int GUI_POPUPMENUMODE = 0x10;
@@ -611,15 +561,9 @@ public class OS extends C {
 	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;
-	public static final int HDS_FILTERBAR = 0x100;
-	public static final int HDS_FLAT = 0x200;
 	public static final int HDS_FULLDRAG = 0x80;
 	public static final int HDS_HIDDEN = 0x8;
-	public static final int HDS_HOTTRACK = 0x4;
-	public static final int HDS_NOSIZING = 0x800;
-	public static final int HDS_OVERFLOW = 0x1000;
 	public static final int HEAP_ZERO_MEMORY = 0x8;
 	public static final int HELPINFO_MENUITEM = 0x2;
 	public static final int HHT_ONDIVIDER = 0x4;
@@ -627,7 +571,6 @@ public class OS extends C {
 	public static final int HICF_ARROWKEYS = 0x2;
 	public static final int HICF_LEAVING = 0x20;
 	public static final int HICF_MOUSE = 0x1;
-	public static final int HINST_COMMCTRL = 0xffffffff;
 	public static final int HKEY_CLASSES_ROOT = 0x80000000;
 	public static final int HKEY_CURRENT_USER = 0x80000001;
 	public static final int HKEY_LOCAL_MACHINE = 0x80000002;
@@ -648,14 +591,11 @@ public class OS extends C {
 	public static final int HWND_NOTOPMOST = -2;
 	public static final int ICC_COOL_CLASSES = 0x400;
 	public static final int ICC_DATE_CLASSES = 0x100;
-	public static final int ICM_NOTOPEN = 0x0;
 	public static final int ICON_BIG = 0x1;
 	public static final int ICON_SMALL = 0x0;
 	public static final int I_IMAGECALLBACK = -1;
 	public static final int I_IMAGENONE = -2;
 	public static final int IDABORT = 0x3;
-	public static final int IDANI_CAPTION = 3;
-	public static final int IDB_STD_SMALL_COLOR = 0x0;
 	public static final int IDC_APPSTARTING = 0x7f8a;
 	public static final int IDC_ARROW = 0x7f00;
 	public static final int IDC_CROSS = 0x7f03;
@@ -695,8 +635,6 @@ public class OS extends C {
 	public static final int INPUT_MOUSE = 0;
 	public static final int INTERNET_MAX_URL_LENGTH = 2084;
 	public static final int INTERNET_OPTION_END_BROWSER_SESSION = 42;
-	public static final int KEY_ENUMERATE_SUB_KEYS = 0x8;
-	public static final int KEY_NOTIFY = 0x10;
 	public static final int KEY_QUERY_VALUE = 0x1;
 	public static final int KEY_READ = 0x20019;
 	public static final int KEY_WRITE = 0x20006;
@@ -741,7 +679,6 @@ public class OS extends C {
 	public static final int LB_SETHORIZONTALEXTENT = 0x194;
 	public static final int LB_SETSEL = 0x185;
 	public static final int LB_SETTOPINDEX = 0x197;
-	public static final int LF_FULLFACESIZE = 64;
 	public static final int LF_FACESIZE = 32;
 	public static final int LGRPID_ARABIC = 0xd;
 	public static final int LGRPID_HEBREW = 0xc;
@@ -875,7 +812,6 @@ public class OS extends C {
 	public static final int LVS_EX_TRACKSELECT = 0x8;
 	public static final int LVS_EX_TRANSPARENTBKGND = 0x800000;
 	public static final int LVS_EX_TWOCLICKACTIVATE = 0x80;
-	public static final int LVS_LIST = 0x3;
 	public static final int LVS_NOCOLUMNHEADER = 0x4000;
 	public static final int LVS_NOSCROLL = 0x2000;
 	public static final int LVS_OWNERDATA = 0x1000;
@@ -1083,7 +1019,6 @@ public class OS extends C {
 	public static final int PD_COLLATE = 0x10;
 	public static final int PD_PAGENUMS = 0x2;
 	public static final int PD_PRINTTOFILE = 0x20;
-	public static final int PD_RETURNDC = 0x100;
 	public static final int PD_RETURNDEFAULT = 0x00000400;
 	public static final int PD_SELECTION = 0x1;
 	public static final int PD_USEDEVMODECOPIESANDCOLLATE = 0x40000;
@@ -1112,10 +1047,6 @@ public class OS extends C {
 	public static final int PM_QS_SENDMESSAGE = QS_SENDMESSAGE << 16;
 	public static final int PM_REMOVE = 0x1;
 	public static final String PROGRESS_CLASS = "msctls_progress32"; //$NON-NLS-1$
-	public static final int PP_BAR = 1;
-	public static final int PP_BARVERT = 2;
-	public static final int PP_CHUNK = 3;
-	public static final int PP_CHUNKVERT = 4;
 	public static final int PRF_CHILDREN = 16;
 	public static final int PRF_CLIENT = 0x4;
 	public static final int PRF_ERASEBKGND = 0x8;
@@ -1201,17 +1132,7 @@ public class OS extends C {
 	public static final int RGN_DIFF = 0x4;
 	public static final int RGN_ERROR = 0;
 	public static final int RGN_OR = 0x2;
-	public static final int RP_BAND = 3;
 	public static final int SBP_ARROWBTN = 0x1;
-	public static final int SBP_THUMBBTNHORZ = 2;
-	public static final int SBP_THUMBBTNVERT = 3;
-	public static final int SBP_LOWERTRACKHORZ = 4;
-	public static final int SBP_UPPERTRACKHORZ = 5;
-	public static final int SBP_LOWERTRACKVERT = 6;
-	public static final int SBP_UPPERTRACKVERT = 7;
-	public static final int SBP_GRIPPERHORZ = 8;
-	public static final int SBP_GRIPPERVERT = 9;
-	public static final int SBP_SIZEBOX = 10;
 	public static final int SBS_HORZ = 0x0;
 	public static final int SBS_VERT = 0x1;
 	public static final int SB_BOTH = 0x3;
@@ -1258,9 +1179,6 @@ public class OS extends C {
 	public static final int SIF_POS = 0x4;
 	public static final int SIF_RANGE = 0x1;
 	public static final int SIF_TRACKPOS = 0x10;
-	public static final int SIP_DOWN = 1;
-	public static final int SIP_UP = 0;
-	public static final int SIPF_ON = 0x1;
 	public static final int SIZE_RESTORED = 0;
 	public static final int SIZE_MINIMIZED = 1;
 	public static final int SIZE_MAXIMIZED = 2;
@@ -1360,23 +1278,7 @@ public class OS extends C {
 	public static final int SYSRGN = 0x4;
 	public static final int SYSTEM_FONT = 0xd;
 	public static final int S_OK = 0x0;
-	public static final int TABP_TABITEM = 1;
-	public static final int TABP_TABITEMLEFTEDGE = 2;
-	public static final int TABP_TABITEMRIGHTEDGE = 3;
-	public static final int TABP_TABITEMBOTHEDGE = 4;
-	public static final int TABP_TOPTABITEM = 5;
-	public static final int TABP_TOPTABITEMLEFTEDGE = 6;
-	public static final int TABP_TOPTABITEMRIGHTEDGE = 7;
-	public static final int TABP_TOPTABITEMBOTHEDGE = 8;
-	public static final int TABP_PANE = 9;
 	public static final int TABP_BODY = 10;
-	public static final int TBCDRF_BLENDICON = 0x200000;
-	public static final int TBCDRF_HILITEHOTTRACK = 0x20000;
-	public static final int TBCDRF_NOBACKGROUND = 0x400000;
-	public static final int TBCDRF_NOEDGES = 0x10000;
-	public static final int TBCDRF_NOETCHEDEFFECT = 0x100000;
-	public static final int TBCDRF_NOMARK = 0x80000;
-	public static final int TBCDRF_NOOFFSET = 0x40000;
 	public static final int TBCDRF_USECDCOLORS = 0x800000;
 	public static final int TBIF_COMMAND = 0x20;
 	public static final int TBIF_STATE = 0x4;
@@ -1499,21 +1401,6 @@ public class OS extends C {
 	public static final int TF_LS_DOT = 2;
 	public static final int TF_LS_DASH = 3;
 	public static final int TF_LS_SQUIGGLE = 4;
-	public static final int TIS_NORMAL = 1;
-	public static final int TIS_HOT = 2;
-	public static final int TIS_SELECTED = 3;
-	public static final int TIS_DISABLED = 4;
-	public static final int TIS_FOCUSED = 5;
-	public static final int TKP_TRACK = 1;
-	public static final int TKP_TRACKVERT = 2;
-	public static final int TKP_THUMB = 3;
-	public static final int TKP_THUMBBOTTOM = 4;
-	public static final int TKP_THUMBTOP = 5;
-	public static final int TKP_THUMBVERT = 6;
-	public static final int TKP_THUMBLEFT = 7;
-	public static final int TKP_THUMBRIGHT = 8;
-	public static final int TKP_TICS = 9;
-	public static final int TKP_TICSVERT = 10;
 	public static final int TME_HOVER = 0x1;
 	public static final int TME_LEAVE = 0x2;
 	public static final int TME_QUERY = 0x40000000;
@@ -1528,12 +1415,6 @@ public class OS extends C {
 	public static final int TOUCHEVENTF_PALM = 0x0080;
 	public static final String TOOLBARCLASSNAME = "ToolbarWindow32"; //$NON-NLS-1$
 	public static final String TOOLTIPS_CLASS = "tooltips_class32"; //$NON-NLS-1$
-	public static final int TP_BUTTON = 1;
-	public static final int TP_DROPDOWNBUTTON = 2;
-	public static final int TP_SPLITBUTTON = 3;
-	public static final int TP_SPLITBUTTONDROPDOWN = 4;
-	public static final int TP_SEPARATOR = 5;
-	public static final int TP_SEPARATORVERT = 6;
 	public static final int TPM_LEFTALIGN = 0x0;
 	public static final int TPM_LEFTBUTTON = 0x0;
 	public static final int TPM_RIGHTBUTTON = 0x2;
@@ -1956,7 +1837,6 @@ public class OS extends C {
 	public static final int WM_XBUTTONDBLCLK = 0x020D;
 	public static final int XBUTTON1 = 0x1;
 	public static final int XBUTTON2 = 0x2;
-	public static final int X509_ASN_ENCODING = 1;
 
 public static int VERSION (int major, int minor) {
 	return major << 16 | minor;
@@ -1971,30 +1851,20 @@ public static final native int BLENDFUNCTION_sizeof ();
 public static final native int BP_PAINTPARAMS_sizeof ();
 public static final native int BUTTON_IMAGELIST_sizeof ();
 public static final native int CANDIDATEFORM_sizeof ();
-public static final native int CERT_CONTEXT_sizeof ();
-public static final native int CERT_INFO_sizeof ();
-public static final native int CERT_NAME_BLOB_sizeof ();
-public static final native int CERT_PUBLIC_KEY_INFO_sizeof ();
 public static final native int CHOOSECOLOR_sizeof ();
 public static final native int CHOOSEFONT_sizeof ();
 public static final native int COMBOBOXINFO_sizeof ();
 public static final native int COMPOSITIONFORM_sizeof ();
 public static final native int CREATESTRUCT_sizeof ();
-public static final native int 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 DEVMODE_sizeof ();
 public static final native int DIBSECTION_sizeof ();
 public static final native int DOCHOSTUIINFO_sizeof ();
 public static final native int DOCINFO_sizeof ();
 public static final native int DRAWITEMSTRUCT_sizeof ();
 public static final native int DROPFILES_sizeof ();
-public static final native int DTTOPTS_sizeof ();
 public static final native int EMR_sizeof ();
 public static final native int EMREXTCREATEFONTINDIRECTW_sizeof ();
 public static final native int EXTLOGFONTW_sizeof ();
-public static final native int FILETIME_sizeof ();
 public static final native int FLICK_DATA_sizeof ();
 public static final native int FLICK_POINT_sizeof ();
 public static final native int GCP_RESULTS_sizeof ();
@@ -2058,7 +1928,6 @@ public static final native int OFNOTIFY_sizeof ();
 public static final native int OPENFILENAME_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 ();
 public static final native int PRINTDLG_sizeof ();
 public static final native int PROCESS_INFORMATION_sizeof ();
@@ -2070,7 +1939,6 @@ public static final native int SAFEARRAY_sizeof ();
 public static final native int SAFEARRAYBOUND_sizeof ();
 public static final native int SCRIPT_ANALYSIS_sizeof ();
 public static final native int SCRIPT_CONTROL_sizeof ();
-public static final native int SCRIPT_DIGITSUBSTITUTE_sizeof ();
 public static final native int SCRIPT_FONTPROPERTIES_sizeof ();
 public static final native int SCRIPT_ITEM_sizeof ();
 public static final native int SCRIPT_LOGATTR_sizeof ();
@@ -2099,7 +1967,6 @@ public static final native int TRIVERTEX_sizeof ();
 public static final native int TVHITTESTINFO_sizeof ();
 public static final native int TVINSERTSTRUCT_sizeof ();
 public static final native int TVITEM_sizeof ();
-public static final native int TVITEMEX_sizeof ();
 public static final native int TVSORTCB_sizeof ();
 public static final native int UDACCEL_sizeof ();
 public static final native int WINDOWPLACEMENT_sizeof ();
@@ -2267,7 +2134,7 @@ public static final int RegDeleteValue (long hKey, TCHAR lpValueName) {
 	return RegDeleteValue (hKey, lpValueName1);
 }
 
-public static final int RegEnumKeyEx (long hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, FILETIME lpftLastWriteTime) {
+public static final int RegEnumKeyEx (long hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, long 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);
@@ -2364,11 +2231,6 @@ public static final void setTheme(boolean isDarkTheme) {
 	display.setData("org.eclipse.swt.internal.win32.Label.disabledForegroundColor", isDarkTheme ? new Color(display, 0x80, 0x80, 0x80) : null);
 }
 
-public static final boolean SetDllDirectory (TCHAR lpPathName) {
-	char [] lpPathName1 = lpPathName == null ? null : lpPathName.chars;
-	return SetDllDirectory (lpPathName1);
-}
-
 public static final boolean SetWindowText (long hWnd, TCHAR lpString) {
 	char [] lpString1 = lpString == null ? null : lpString.chars;
 	return SetWindowText (hWnd, lpString1);
@@ -2417,8 +2279,6 @@ public static final native long BeginBufferedPaint (long hdcTarget, RECT prcTarg
 public static final native long BeginDeferWindowPos (int nNumWindows);
 /** @param hWnd cast=(HWND) */
 public static final native long BeginPaint (long hWnd, PAINTSTRUCT lpPaint);
-/** @param hdc cast=(HDC) */
-public static final native boolean BeginPath(long hdc);
 /**
  * @param hdcDest cast=(HDC)
  * @param hdcSrc cast=(HDC)
@@ -2439,11 +2299,6 @@ public static final native long CallNextHookEx(long hhk, int nCode, long wParam,
  * @param hWnd cast=(HWND)
  */
 public static final native long CallWindowProc (long lpPrevWndFunc, long hWnd, int Msg, long wParam, long lParam);
-/**
- * @param pName cast=(PCERT_NAME_BLOB)
- * @param psz cast=(LPWSTR)
- */
-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 CharLower (long ch);
 /** @param ch cast=(LPWSTR) */
@@ -2479,13 +2334,6 @@ public static final native int CloseThemeData (long hTheme);
  * @param hTouchInput cast=(HTOUCHINPUT)
  */
 public static final native boolean CloseTouchInputHandle(long hTouchInput);
-/**
- * @param rclsid cast=(REFCLSID)
- * @param pUnkOuter cast=(LPUNKNOWN)
- * @param riid cast=(REFIID)
- * @param ppv cast=(LPVOID *)
- */
-public static final native int CoCreateInstance (byte[] rclsid, long pUnkOuter, int dwClsContext, byte[] riid, long[] ppv);
 public static final native int CoInternetIsFeatureEnabled (int FeatureEntry, int dwFlags);
 /** @param fEnable cast=(BOOL) */
 public static final native int CoInternetSetFeatureEnabled (int FeatureEntry, int dwFlags, boolean fEnable);
@@ -2765,7 +2613,6 @@ public static final native boolean ExtTextOut (long hdc, int X, int Y, int fuOpt
  * @param phiconSmall cast=(HICON FAR *)
  */
 public static final native int ExtractIconEx (char [] lpszFile, int nIconIndex, long [] phiconLarge, long [] phiconSmall, int nIcons);
-public static final native boolean FileTimeToSystemTime (FILETIME lpFileTime, SYSTEMTIME lpSystemTime);
 /**
  * @param hDC cast=(HDC)
  * @param lprc flags=no_out
@@ -3037,7 +2884,6 @@ public static final native void GetStartupInfo (STARTUPINFO lpStartupInfo);
 public static final native long GetStockObject (int fnObject);
 public static final native int GetSysColor (int nIndex);
 public static final native long GetSysColorBrush (int nIndex);
-public static final native short GetSystemDefaultUILanguage ();
 /** @param hWnd cast=(HWND) */
 public static final native long GetSystemMenu (long hWnd, boolean bRevert);
 public static final native int GetSystemMetrics (int nIndex);
@@ -3522,16 +3368,6 @@ public static final native void MoveMemory (BITMAPINFOHEADER Destination, long S
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
-public static final native void MoveMemory (CERT_CONTEXT Destination, long Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
-public static final native void MoveMemory (CERT_INFO Destination, long Source, int Length);
-/**
- * @param Destination cast=(PVOID),flags=no_in
- * @param Source cast=(CONST VOID *)
- */
 public static final native void MoveMemory (DEVMODE Destination, long Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
@@ -3945,8 +3781,9 @@ public static final native int RegDeleteValue (long hKey, char[] lpValueName);
  * @param lpReserved cast=(LPDWORD)
  * @param lpClass cast=(LPWSTR)
  * @param lpcClass cast=(LPDWORD)
+ * @param lpftLastWriteTime cast=(PFILETIME)
  */
-public static final native int RegEnumKeyEx (long hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime);
+public static final native int RegEnumKeyEx (long hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, long lpftLastWriteTime);
 /** @param lpWndClass cast=(LPWNDCLASSW) */
 public static final native int RegisterClass (WNDCLASS lpWndClass);
 /**
@@ -4019,7 +3856,7 @@ public static final native boolean ScreenToClient (long hWnd, POINT lpPoint);
  * @param psc cast=(SCRIPT_CONTROL*)
  * @param pss cast=(SCRIPT_STATE*)
  */
-public static final native int ScriptApplyDigitSubstitution (SCRIPT_DIGITSUBSTITUTE psds, SCRIPT_CONTROL psc, SCRIPT_STATE pss);
+public static final native int ScriptApplyDigitSubstitution (long psds, SCRIPT_CONTROL psc, SCRIPT_STATE pss);
 /**
  * @param pwcChars cast=(const WCHAR *)
  * @param psa cast=(const SCRIPT_ANALYSIS *)
@@ -4093,11 +3930,6 @@ public static final native int ScriptLayout (int cRuns, byte[] pbLevel, int[] pi
  */
 public static final native int ScriptPlace (long hdc, long psc, long pwGlyphs, int cGlyphs, long psva, SCRIPT_ANALYSIS psa, long piAdvance, long pGoffset, int[] pABC);
 /**
- * @param Locale cast=(LCID)
- * @param psds cast=(SCRIPT_DIGITSUBSTITUTE*)
- */
-public static final native int ScriptRecordDigitSubstitution (int Locale, SCRIPT_DIGITSUBSTITUTE psds);
-/**
  * @param hdc cast=(HDC)
  * @param psc cast=(SCRIPT_CACHE *)
  * @param pwcChars cast=(const WCHAR *)
@@ -4373,7 +4205,6 @@ 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 hdc, int uStartIndex, int cEntries, byte[] pColors);
-public static final native boolean SetDllDirectory (char [] lpString);
 /** @param hWnd cast=(HWND) */
 public static final native long SetFocus (long hWnd);
 /** @param hWnd cast=(HWND) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PANOSE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PANOSE.java
deleted file mode 100644
index 86ac7aadc3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PANOSE.java
+++ /dev/null
@@ -1,28 +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 PANOSE {
-	public byte bFamilyType;
-	public byte bSerifStyle;
-	public byte bWeight;
-	public byte bProportion;
-	public byte bContrast;
-	public byte bStrokeVariation;
-	public byte bArmStyle;
-	public byte bLetterform;
-	public byte bMidline;
-	public byte bXHeight;
-	public static final int sizeof = OS.PANOSE_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.java
deleted file mode 100644
index 09712951cd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCRIPT_DIGITSUBSTITUTE.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 SCRIPT_DIGITSUBSTITUTE {
-	public short NationalDigitLanguage;
-	public short TraditionalDigitLanguage;
-	public byte DigitSubstitute;
-	public int dwReserved;
-	public static final int sizeof = OS.SCRIPT_DIGITSUBSTITUTE_sizeof ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.java
deleted file mode 100644
index 9a3a813c11..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEMEX.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 TVITEMEX extends TVITEM {
-	public int iIntegral;
-	public static final int sizeof = OS.TVITEMEX_sizeof ();
-}
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 c8481e5205..f9c09004f7 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
@@ -114,9 +114,8 @@ public static String [] getExtensions () {
 	String [] extensions = new String [1024];
 	char [] lpName = new char [1024];
 	int [] lpcName = {lpName.length};
-	FILETIME ft = new FILETIME ();
 	int dwIndex = 0, count = 0;
-	while (OS.RegEnumKeyEx (OS.HKEY_CLASSES_ROOT, dwIndex, lpName, lpcName, null, null, null, ft) != OS.ERROR_NO_MORE_ITEMS) {
+	while (OS.RegEnumKeyEx (OS.HKEY_CLASSES_ROOT, dwIndex, lpName, lpcName, null, null, null, 0) != OS.ERROR_NO_MORE_ITEMS) {
 		String extension = new String (lpName, 0, lpcName [0]);
 		lpcName [0] = lpName.length;
 		if (extension.length () > 0 && extension.charAt (0) == '.') {
@@ -222,9 +221,8 @@ public static Program [] getPrograms () {
 	LinkedHashSet<Program> programs = new LinkedHashSet<>(1024);
 	char [] lpName = new char [1024];
 	int [] lpcName = new int [] {lpName.length};
-	FILETIME ft = new FILETIME ();
 	int dwIndex = 0;
-	while (OS.RegEnumKeyEx (OS.HKEY_CLASSES_ROOT, dwIndex, lpName, lpcName, null, null, null, ft) != OS.ERROR_NO_MORE_ITEMS) {
+	while (OS.RegEnumKeyEx (OS.HKEY_CLASSES_ROOT, dwIndex, lpName, lpcName, null, null, null, 0) != OS.ERROR_NO_MORE_ITEMS) {
 		String path = new String (lpName, 0, lpcName [0]);
 		lpcName [0] = lpName.length;
 		Program program = getProgram (path, null);
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 c0aa974fe1..bab384ef06 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
@@ -1911,7 +1911,7 @@ void drawRectangleInPixels (int x, int y, int width, int height) {
 		if (data.lineWidth > 1) {
 			if ((data.lineWidth % 2) == 1) x++;
 		} else {
-			if (data.hPen != 0 && OS.GetObject(data.hPen, 0, 0) != LOGPEN.sizeof) {
+			if (data.hPen != 0 && OS.GetObject(data.hPen, 0, 0) != OS.LOGPEN_sizeof()) {
 				x++;
 			}
 		}
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 0465f2f555..c519ef3dd7 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
@@ -2718,7 +2718,7 @@ StyleItem[] itemize () {
 	*/
 //	scriptControl.fReserved = 0x1;
 
-	OS.ScriptApplyDigitSubstitution(null, scriptControl, scriptState);
+	OS.ScriptApplyDigitSubstitution(0, scriptControl, scriptState);
 
 	long hHeap = OS.GetProcessHeap();
 	long pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof);