Bug 559389 - [Win32] Remove dead code and obsolete comments

Remove the following:

 * Display.getLastErrorText() - never used.
 * Canvas.clearArea() - never used.
 * Control.checkHandle() - pre-XP code to check GWLP_USERDATA.
 * DirectoryDialog.openCommonFileDialog() - pre-Vista code.
 * Some "This code is intentionally commented" comments that lost
   relevance.
 * All "Use the character encoding for the default locale" comments.
 * Win98/NT4 code in BidiUtil.

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

7 files changed, 2 insertions, 235 deletions

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 aa93c83754..4a6ec03282 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
@@ -232,18 +232,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(BP_1PAINTPARAMS_1sizeof)
 }
 #endif
 
-#ifndef NO_BROWSEINFO_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(BROWSEINFO_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, BROWSEINFO_1sizeof_FUNC);
-	rc = (jint)BROWSEINFO_sizeof();
-	OS_NATIVE_EXIT(env, that, BROWSEINFO_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_BUTTON_1IMAGELIST_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(BUTTON_1IMAGELIST_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -2136,22 +2124,6 @@ fail:
 }
 #endif
 
-#ifndef NO_FormatMessage
-JNIEXPORT jint JNICALL OS_NATIVE(FormatMessage)
-	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4, jint arg5, jlong arg6)
-{
-	jlong *lparg4=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, FormatMessage_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)FormatMessage(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, FormatMessage_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_GCP_1RESULTS_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(GCP_1RESULTS_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -7965,22 +7937,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(SCROLLINFO_1sizeof)
 }
 #endif
 
-#ifndef NO_SHBrowseForFolder
-JNIEXPORT jlong JNICALL OS_NATIVE(SHBrowseForFolder)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	BROWSEINFO _arg0, *lparg0=NULL;
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, SHBrowseForFolder_FUNC);
-	if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jlong)SHBrowseForFolder((LPBROWSEINFOW)lparg0);
-fail:
-	if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, SHBrowseForFolder_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SHDRAGIMAGE_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(SHDRAGIMAGE_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -8036,38 +7992,6 @@ fail:
 }
 #endif
 
-#ifndef NO_SHGetMalloc
-JNIEXPORT jint JNICALL OS_NATIVE(SHGetMalloc)
-	(JNIEnv *env, jclass that, jlongArray arg0)
-{
-	jlong *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetMalloc_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)SHGetMalloc((LPMALLOC *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, SHGetMalloc_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_SHGetPathFromIDList
-JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDList)
-	(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1)
-{
-	jchar *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, SHGetPathFromIDList_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)SHGetPathFromIDList((LPCITEMIDLIST)arg0, (LPWSTR)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, SHGetPathFromIDList_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SIZE_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(SIZE_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -9190,18 +9114,6 @@ fail:
 }
 #endif
 
-#ifndef NO_SetErrorMode
-JNIEXPORT jint JNICALL OS_NATIVE(SetErrorMode)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, SetErrorMode_FUNC);
-	rc = (jint)SetErrorMode(arg0);
-	OS_NATIVE_EXIT(env, that, SetErrorMode_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_SetFocus
 JNIEXPORT jlong JNICALL OS_NATIVE(SetFocus)
 	(JNIEnv *env, jclass that, jlong arg0)
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 a64f6d811c..1c12c8c057 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
@@ -36,7 +36,6 @@ char * OS_nativeFunctionNames[] = {
 	"BITMAP_1sizeof",
 	"BLENDFUNCTION_1sizeof",
 	"BP_1PAINTPARAMS_1sizeof",
-	"BROWSEINFO_1sizeof",
 	"BUTTON_1IMAGELIST_1sizeof",
 	"BeginBufferedPaint",
 	"BeginDeferWindowPos",
@@ -173,7 +172,6 @@ char * OS_nativeFunctionNames[] = {
 	"FLICK_1POINT_1sizeof",
 	"FileTimeToSystemTime",
 	"FillRect",
-	"FormatMessage",
 	"GCP_1RESULTS_1sizeof",
 	"GESTURECONFIG_1sizeof",
 	"GESTUREINFO_1sizeof",
@@ -597,13 +595,10 @@ char * OS_nativeFunctionNames[] = {
 	"SCRIPT_1STRING_1ANALYSIS_1sizeof",
 	"SCROLLBARINFO_1sizeof",
 	"SCROLLINFO_1sizeof",
-	"SHBrowseForFolder",
 	"SHDRAGIMAGE_1sizeof",
 	"SHELLEXECUTEINFO_1sizeof",
 	"SHFILEINFO_1sizeof",
 	"SHGetFileInfo",
-	"SHGetMalloc",
-	"SHGetPathFromIDList",
 	"SIZE_1sizeof",
 	"STARTUPINFO_1sizeof",
 	"SYSTEMTIME_1sizeof",
@@ -674,7 +669,6 @@ char * OS_nativeFunctionNames[] = {
 	"SetCursorPos",
 	"SetDIBColorTable",
 	"SetDllDirectory",
-	"SetErrorMode",
 	"SetFocus",
 	"SetForegroundWindow",
 	"SetGestureConfig",
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 8390bc4026..0faf8a4aa3 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
@@ -46,7 +46,6 @@ typedef enum {
 	BITMAP_1sizeof_FUNC,
 	BLENDFUNCTION_1sizeof_FUNC,
 	BP_1PAINTPARAMS_1sizeof_FUNC,
-	BROWSEINFO_1sizeof_FUNC,
 	BUTTON_1IMAGELIST_1sizeof_FUNC,
 	BeginBufferedPaint_FUNC,
 	BeginDeferWindowPos_FUNC,
@@ -183,7 +182,6 @@ typedef enum {
 	FLICK_1POINT_1sizeof_FUNC,
 	FileTimeToSystemTime_FUNC,
 	FillRect_FUNC,
-	FormatMessage_FUNC,
 	GCP_1RESULTS_1sizeof_FUNC,
 	GESTURECONFIG_1sizeof_FUNC,
 	GESTUREINFO_1sizeof_FUNC,
@@ -607,13 +605,10 @@ typedef enum {
 	SCRIPT_1STRING_1ANALYSIS_1sizeof_FUNC,
 	SCROLLBARINFO_1sizeof_FUNC,
 	SCROLLINFO_1sizeof_FUNC,
-	SHBrowseForFolder_FUNC,
 	SHDRAGIMAGE_1sizeof_FUNC,
 	SHELLEXECUTEINFO_1sizeof_FUNC,
 	SHFILEINFO_1sizeof_FUNC,
 	SHGetFileInfo_FUNC,
-	SHGetMalloc_FUNC,
-	SHGetPathFromIDList_FUNC,
 	SIZE_1sizeof_FUNC,
 	STARTUPINFO_1sizeof_FUNC,
 	SYSTEMTIME_1sizeof_FUNC,
@@ -684,7 +679,6 @@ typedef enum {
 	SetCursorPos_FUNC,
 	SetDIBColorTable_FUNC,
 	SetDllDirectory_FUNC,
-	SetErrorMode_FUNC,
 	SetFocus_FUNC,
 	SetForegroundWindow_FUNC,
 	SetGestureConfig_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 3bb1523d8c..0b48b8495f 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
@@ -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
@@ -300,58 +300,6 @@ void setBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTPARAMS *lpSt
 }
 #endif
 
-#ifndef NO_BROWSEINFO
-typedef struct BROWSEINFO_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID hwndOwner, pidlRoot, pszDisplayName, lpszTitle, ulFlags, lpfn, lParam, iImage;
-} BROWSEINFO_FID_CACHE;
-
-BROWSEINFO_FID_CACHE BROWSEINFOFc;
-
-void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject)
-{
-	if (BROWSEINFOFc.cached) return;
-	BROWSEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	BROWSEINFOFc.hwndOwner = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "hwndOwner", "J");
-	BROWSEINFOFc.pidlRoot = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pidlRoot", "J");
-	BROWSEINFOFc.pszDisplayName = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pszDisplayName", "J");
-	BROWSEINFOFc.lpszTitle = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpszTitle", "J");
-	BROWSEINFOFc.ulFlags = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "ulFlags", "I");
-	BROWSEINFOFc.lpfn = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpfn", "J");
-	BROWSEINFOFc.lParam = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lParam", "J");
-	BROWSEINFOFc.iImage = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "iImage", "I");
-	BROWSEINFOFc.cached = 1;
-}
-
-BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct)
-{
-	if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject);
-	lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.hwndOwner);
-	lpStruct->pidlRoot = (LPCITEMIDLIST)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.pidlRoot);
-	lpStruct->pszDisplayName = (LPTSTR)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.pszDisplayName);
-	lpStruct->lpszTitle = (LPCTSTR)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.lpszTitle);
-	lpStruct->ulFlags = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.ulFlags);
-	lpStruct->lpfn = (BFFCALLBACK)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.lpfn);
-	lpStruct->lParam = (*env)->GetLongField(env, lpObject, BROWSEINFOFc.lParam);
-	lpStruct->iImage = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.iImage);
-	return lpStruct;
-}
-
-void setBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct)
-{
-	if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.hwndOwner, (jlong)lpStruct->hwndOwner);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.pidlRoot, (jlong)lpStruct->pidlRoot);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.pszDisplayName, (jlong)lpStruct->pszDisplayName);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.lpszTitle, (jlong)lpStruct->lpszTitle);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.ulFlags, (jint)lpStruct->ulFlags);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.lpfn, (jlong)lpStruct->lpfn);
-	(*env)->SetLongField(env, lpObject, BROWSEINFOFc.lParam, (jlong)lpStruct->lParam);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.iImage, (jint)lpStruct->iImage);
-}
-#endif
-
 #ifndef NO_BUTTON_IMAGELIST
 typedef struct BUTTON_IMAGELIST_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 6182b6c01b..9ac559204a 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
@@ -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
@@ -89,18 +89,6 @@ void setBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTPARAMS *lpSt
 #define BP_PAINTPARAMS_sizeof() 0
 #endif
 
-#ifndef NO_BROWSEINFO
-void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject);
-BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct);
-void setBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct);
-#define BROWSEINFO_sizeof() sizeof(BROWSEINFO)
-#else
-#define cacheBROWSEINFOFields(a,b)
-#define getBROWSEINFOFields(a,b,c) NULL
-#define setBROWSEINFOFields(a,b,c)
-#define BROWSEINFO_sizeof() 0
-#endif
-
 #ifndef NO_BUTTON_IMAGELIST
 void cacheBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject);
 BUTTON_IMAGELIST *getBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTON_IMAGELIST *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
deleted file mode 100644
index 3a9ee0731b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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 BROWSEINFO {
-	/** @field cast=(HWND) */
-	public long hwndOwner;
-	/** @field cast=(LPCITEMIDLIST) */
-	public long pidlRoot;
-	/** @field cast=(LPTSTR) */
-	public long pszDisplayName;
-	/** @field cast=(LPCTSTR) */
-	public long lpszTitle;
-	public int ulFlags;
-	/** @field cast=(BFFCALLBACK) */
-	public long lpfn;
-	public long lParam;
-	public int iImage;
-	public static final int sizeof = OS.BROWSEINFO_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 2b8352f9d1..e941b2b877 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
@@ -113,19 +113,12 @@ public class OS extends C {
 	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 BFFM_INITIALIZED = 0x1;
-	public static final int BFFM_SETSELECTION = 0x467;
-	public static final int BFFM_VALIDATEFAILED = 0x4;
 	public static final int BF_ADJUST = 0x2000;
 	public static final int BF_LEFT = 0x0001;
 	public static final int BF_TOP = 0x0002;
 	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 BIF_EDITBOX = 0x10;
-	public static final int BIF_NEWDIALOGSTYLE = 0x40;
-	public static final int BIF_RETURNONLYFSDIRS = 0x1;
-	public static final int BIF_VALIDATE = 0x20;
 	public static final int BITSPIXEL = 0xc;
 	public static final int BI_BITFIELDS = 3;
 	public static final int BI_RGB = 0;
@@ -347,10 +340,6 @@ public class OS extends C {
 	public static final int CWP_SKIPINVISIBLE = 0x0001;
 	public static final String DATETIMEPICK_CLASS = "SysDateTimePick32"; //$NON-NLS-1$
 	public static final int DCX_CACHE = 0x2;
-	public static final int DCX_CLIPCHILDREN = 0x8;
-	public static final int DCX_CLIPSIBLINGS = 0x10;
-	public static final int DCX_INTERSECTRGN = 0x80;
-	public static final int DCX_WINDOW = 0x1;
 	public static final int DEFAULT_CHARSET = 0x1;
 	public static final int DEFAULT_GUI_FONT = 0x11;
 	public static final int DFCS_BUTTONCHECK = 0x0;
@@ -514,9 +503,6 @@ public class OS extends C {
 	public static final int FLICKDIRECTION_INVALID = 8;
 	public static final int FNERR_INVALIDFILENAME = 0x3002;
 	public static final int FNERR_BUFFERTOOSMALL = 0x3003;
-	public static final int FORMAT_MESSAGE_ALLOCATE_BUFFER = 0x00000100;
-	public static final int FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000;
-	public static final int FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200;
 	public static final int FOS_NOCHANGEDIR = 0x8;
 	public static final int FOS_PICKFOLDERS = 0x20;
 	public static final int FOS_FORCEFILESYSTEM = 0x40;
@@ -718,7 +704,6 @@ public class OS extends C {
 	public static final int LANG_JAPANESE = 0x11;
 	public static final int LANG_KOREAN = 0x12;
 	public static final int LANG_NEUTRAL = 0x0;
-	public static final int LANG_USER_DEFAULT = 1 << 10;
 	public static final int LAYOUT_RTL = 0x1;
 	public static final int LBN_DBLCLK = 0x2;
 	public static final int LBN_SELCHANGE = 0x1;
@@ -1259,7 +1244,6 @@ public class OS extends C {
 	public static final int SCRBS_HOT = 2;
 	public static final int SCRBS_PRESSED = 3;
 	public static final int SCRBS_DISABLED = 4;
-	public static final int SEM_FAILCRITICALERRORS = 0x1;
 	public static final int SET_FEATURE_ON_PROCESS = 0x2;
 	public static final int SHADEBLENDCAPS = 120;
 	public static final int SHGFI_ICON = 0x000000100;
@@ -1981,7 +1965,6 @@ public static final native int BITMAP_sizeof ();
 public static final native int BITMAPINFOHEADER_sizeof ();
 public static final native int BLENDFUNCTION_sizeof ();
 public static final native int BP_PAINTPARAMS_sizeof ();
-public static final native int BROWSEINFO_sizeof ();
 public static final native int BUTTON_IMAGELIST_sizeof ();
 public static final native int CANDIDATEFORM_sizeof ();
 public static final native int CERT_CONTEXT_sizeof ();
@@ -2348,11 +2331,6 @@ public static final boolean SetWindowText (long hWnd, TCHAR lpString) {
 	return SetWindowText (hWnd, lpString1);
 }
 
-public static final boolean SHGetPathFromIDList (long pidl, TCHAR pszPath) {
-	char [] pszPath1 = pszPath == null ? null : pszPath.chars;
-	return SHGetPathFromIDList (pidl, pszPath1);
-}
-
 public static final boolean UnregisterClass (TCHAR lpClassName, long hInstance) {
 	char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
 	return UnregisterClass (lpClassName1, hInstance);
@@ -2751,12 +2729,6 @@ public static final native boolean FileTimeToSystemTime (FILETIME lpFileTime, SY
  * @param hbr cast=(HBRUSH)
  */
 public static final native int FillRect (long hDC, RECT lprc, long hbr);
-/**
- * @param lpSource cast=(LPCVOID)
- * @param lpBuffer cast=(LPWSTR)
- * @param Arguments cast=(va_list*)
- */
-public static final native int FormatMessage (int dwFlags, long lpSource, int dwMessageId, int dwLanguageId, long [] lpBuffer, int nSize, long Arguments);
 /** @param dwLimit cast=(DWORD) */
 public static final native int GdiSetBatchLimit (int dwLimit);
 public static final native int GET_WHEEL_DELTA_WPARAM(long wParam);
@@ -4359,7 +4331,6 @@ public static final native boolean SetCursorPos (int X, int Y);
  */
 public static final native int SetDIBColorTable (long hdc, int uStartIndex, int cEntries, byte[] pColors);
 public static final native boolean SetDllDirectory (char [] lpString);
-public static final native int SetErrorMode (int uMode);
 /** @param hWnd cast=(HWND) */
 public static final native long SetFocus (long hWnd);
 /** @param hWnd cast=(HWND) */
@@ -4473,8 +4444,6 @@ public static final native long SetWindowsHookEx (int idHook, long lpfn,  long h
  * @param lpXform cast=(XFORM *)
  */
 public static final native boolean SetWorldTransform(long hdc, float[] lpXform);
-/** @param lpbi cast=(LPBROWSEINFOW) */
-public static final native long SHBrowseForFolder (BROWSEINFO lpbi);
 /**
  * @param pszPath cast=(LPCWSTR)
  * @param psfi cast=(SHFILEINFOW *)
@@ -4483,13 +4452,6 @@ public static final native long SHGetFileInfo (char [] pszPath, int dwFileAttrib
 /** @param lpExecInfo cast=(LPSHELLEXECUTEINFOW) */
 public static final native boolean ShellExecuteEx (SHELLEXECUTEINFO lpExecInfo);
 public static final native boolean Shell_NotifyIcon (int dwMessage, NOTIFYICONDATA lpData);
-/** @param ppMalloc cast=(LPMALLOC *) */
-public static final native int SHGetMalloc (long [] ppMalloc);
-/**
- * @param pidl cast=(LPCITEMIDLIST)
- * @param pszPath cast=(LPWSTR)
- */
-public static final native boolean SHGetPathFromIDList (long pidl, char [] pszPath);
 /** @param hWnd cast=(HWND) */
 public static final native boolean ShowCaret (long hWnd);
 /** @param hWnd cast=(HWND) */