mingw-wsl-patches

Fork

# HG changeset patch
# Parent 37bd25af3b832cd6704a95f6d43eeb2fdf7479bf

diff --git a/wslapi/include/winbase.h b/wslapi/include/winbase.h
--- a/wslapi/include/winbase.h
+++ b/wslapi/include/winbase.h
@@ -951,36 +951,50 @@ typedef struct _WIN32_FIND_DATAA {
 	FILETIME ftCreationTime;
 	FILETIME ftLastAccessTime;
 	FILETIME ftLastWriteTime;
 	DWORD nFileSizeHigh;
 	DWORD nFileSizeLow;
-#ifdef _WIN32_WCE
+#if 0 /* defined _WIN32_WCE */
+/* FIXME: This seems wrong!  AFAIK, WinCE does not support anything
+ * other than a UCS-2 API, so should not require any definition for
+ * WIN32_FIND_DATAA.  In any case, WinCE isn't a supported MinGW
+ * target, so this really should just go away.
+ */
     DWORD dwOID;
 #else
 	DWORD dwReserved0;
 	DWORD dwReserved1;
 #endif
 	CHAR cFileName[MAX_PATH];
-#ifndef _WIN32_WCE
+#if 1 /* !defined _WIN32_WCE */
+/* FIXME: See note above; this is likely irrelevant, and should
+ * go away.
+ */
 	CHAR cAlternateFileName[14];
 #endif
 } WIN32_FIND_DATAA,*PWIN32_FIND_DATAA,*LPWIN32_FIND_DATAA;
 typedef struct _WIN32_FIND_DATAW {
 	DWORD dwFileAttributes;
 	FILETIME ftCreationTime;
 	FILETIME ftLastAccessTime;
 	FILETIME ftLastWriteTime;
 	DWORD nFileSizeHigh;
 	DWORD nFileSizeLow;
-#ifdef _WIN32_WCE
+#if 0 /* defined _WIN32_WCE */
+/* FIXME: Possibly closer to the WinCE structure, but the data
+ * type name is still wrong!  Also, irrelevant for MinGW, so it
+ * really should just go away.
+ */
     DWORD dwOID;
 #else
 	DWORD dwReserved0;
 	DWORD dwReserved1;
 #endif
 	WCHAR cFileName[MAX_PATH];
-#ifndef _WIN32_WCE
+#if 1 /* !defined _WIN32_WCE */
+/* FIXME: See preceding comment.
+ */
 	WCHAR cAlternateFileName[14];
 #endif
 } WIN32_FIND_DATAW,*PWIN32_FIND_DATAW,*LPWIN32_FIND_DATAW;
 typedef struct _WIN32_STREAM_ID {
 	DWORD dwStreamId;
@@ -1581,11 +1595,13 @@ WINBASEAPI DWORD WINAPI GetCurrentDirect
 WINBASEAPI BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA);
 WINBASEAPI BOOL WINAPI GetCurrentHwProfileW(LPHW_PROFILE_INFOW);
 WINBASEAPI HANDLE WINAPI GetCurrentProcess(void);
 WINBASEAPI DWORD WINAPI GetCurrentProcessId(void);
 WINBASEAPI HANDLE WINAPI GetCurrentThread(void);
-#ifdef _WIN32_WCE
+#if 0 /* defined _WIN32_WCE */
+/* FIXME: Possibly correct for WinCE, but not relevant for MinGW.
+ */
 extern DWORD GetCurrentThreadId(void);
 #else
 WINBASEAPI DWORD WINAPI GetCurrentThreadId(void);
 #endif
 #define GetCurrentTime GetTickCount
@@ -2040,11 +2056,13 @@ WINBASEAPI HANDLE WINAPI ReOpenFile(HAND
 WINBASEAPI BOOL WINAPI ReplaceFileA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPVOID,LPVOID);
 WINBASEAPI BOOL WINAPI ReplaceFileW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPVOID,LPVOID);
 #endif
 WINBASEAPI BOOL WINAPI ReportEventA(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCSTR*,PVOID);
 WINBASEAPI BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCWSTR*,PVOID);
-#ifdef _WIN32_WCE
+#if 0 /* define _WIN32_WCE */
+/* FIXME: Possibly correct for WinCE, but not relevant for MinGW.
+ */
 extern BOOL ResetEvent(HANDLE);
 #else
 WINBASEAPI BOOL WINAPI ResetEvent(HANDLE);
 #endif
 WINBASEAPI UINT WINAPI ResetWriteWatch(LPVOID,SIZE_T);
@@ -2077,11 +2095,13 @@ WINBASEAPI BOOL WINAPI SetDllDirectoryW(
 #endif
 WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE);
 WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR);
 WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);
 WINBASEAPI UINT WINAPI SetErrorMode(UINT);
-#ifdef _WIN32_WCE
+#if 0 /* defined _WIN32_WCE */
+/* FIXME: Possibly correct for WinCE, but not relevant for MinGW.
+ */
 extern BOOL SetEvent(HANDLE);
 #else
 WINBASEAPI BOOL WINAPI SetEvent(HANDLE);
 #endif
 WINBASEAPI VOID WINAPI SetFileApisToANSI(void);
diff --git a/wslapi/include/winuser.h b/wslapi/include/winuser.h
--- a/wslapi/include/winuser.h
+++ b/wslapi/include/winuser.h
@@ -4004,11 +4004,17 @@ WINUSERAPI BOOL WINAPI DestroyWindow (HW
 WINUSERAPI int WINAPI DialogBoxIndirectParamA (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 WINUSERAPI int WINAPI DialogBoxIndirectParamW (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 
 #define DialogBoxParam __AW_SUFFIXED__(DialogBoxParam)
 
-#ifdef _WIN32_WCE
+#if 0 /* defined _WIN32_WCE */
+/* FIXME: This looks wrong!  AFAIK, WinCE has only a UCS-2 API, and
+ * this function is simply called DialogBoxParam(); there are no such
+ * distinct implementations as DialogBoxParamA() or DialogBoxParamW().
+ * In any case, WinCE is not a supported target for MinGW, so this
+ * really should just go away.
+ */
 extern int DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
 extern int DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
 #else
 WINUSERAPI int WINAPI DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
 WINUSERAPI int WINAPI DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);