mingw-wsl-patches

Fork

# HG changeset patch
# Parent 8439ebf4865a87d28548305b4cd00ede427d6dd1

diff --git a/wslapi/include/wingdi.h b/wslapi/include/wingdi.h
--- a/wslapi/include/wingdi.h
+++ b/wslapi/include/wingdi.h
@@ -3375,13 +3375,32 @@ WINGDIAPI BOOL WINAPI GetTextExtentPoint
 WINGDIAPI BOOL WINAPI GetTextExtentExPointI
 (HDC, LPWORD, int, int, LPINT, LPINT, LPSIZE);
 
 #endif	/* WINNT >= Win2K */
 
+#ifdef _WIN32_WCE
+/* FIXME: This looks completely wrong!  MSDN's WinCE-5.0 documentation
+ * at https://msdn.microsoft.com/en-us/library/ms901137.aspx offers no
+ * evidence for existence of either of these functions...
+ */
+extern BOOL GetTextExtentPoint32A (HDC, LPCSTR, int, LPSIZE);
+extern BOOL GetTextExtentPoint32W (HDC, LPCWSTR, int, LPSIZE);
+/*
+ * FIXME: Rather, if we are to keep this support, we should declare...
+ */
+extern BOOL GetTextExtentPoint32 (HDC, LPCTSTR, int, LPSIZE);
+extern BOOL GetTextExtentPoint (HDC, LPCTSTR, int, LPSIZE);
+/*
+ * ...(which appear to behave identically); each exposes ONLY a UTF-16
+ * (is it universally UTF-16LE?) string handling API, (as seems to be
+ * the norm throughout WinCE).
+ */
+#else
 #define GetTextExtentPoint32  __AW_SUFFIXED__(GetTextExtentPoint32)
 WINGDIAPI BOOL WINAPI GetTextExtentPoint32A (HDC, LPCSTR, int, LPSIZE);
 WINGDIAPI BOOL WINAPI GetTextExtentPoint32W (HDC, LPCWSTR, int, LPSIZE);
+#endif
 
 #define GetTextFace  __AW_SUFFIXED__(GetTextFace)
 WINGDIAPI int WINAPI GetTextFaceA (HDC, int, LPSTR);
 WINGDIAPI int WINAPI GetTextFaceW (HDC, int, LPWSTR);
 
diff --git a/wslapi/include/winuser.h b/wslapi/include/winuser.h
--- a/wslapi/include/winuser.h
+++ b/wslapi/include/winuser.h
@@ -3991,13 +3991,30 @@ WINUSERAPI BOOL WINAPI DestroyWindow (HW
 
 #define DialogBoxIndirectParam __AW_SUFFIXED__(DialogBoxIndirectParam)
 WINUSERAPI int WINAPI DialogBoxIndirectParamA (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 WINUSERAPI int WINAPI DialogBoxIndirectParamW (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 
+#ifdef _WIN32_WCE
+/* FIXME: This looks completely wrong!  MSDN's WinCE-5.0 documentation
+ * at https://msdn.microsoft.com/en-us/library/aa452950.aspx offers no
+ * evidence for existence of either of these functions...
+ */
+extern int DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
+extern int DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
+/*
+ * FIXME: Rather, if we are to keep this support, we should declare...
+ */
+extern int DialogBoxParam (HINSTANCE, LPCTSTR, HWND, DLGPROC, PARAM);
+/*
+ * ...which exposes ONLY a UTF-16 (is it universally UTF-16LE?) string
+ * handling API, (as seems to be the norm throughout WinCE).
+ */
+#else	/* !_WIN32_WCE */
 #define DialogBoxParam __AW_SUFFIXED__(DialogBoxParam)
 WINUSERAPI int WINAPI DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
 WINUSERAPI int WINAPI DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
+#endif	/* !_WIN32_WCE */
 
 #define DispatchMessage __AW_SUFFIXED__(DispatchMessage)
 WINUSERAPI LONG WINAPI DispatchMessageA (const MSG *);
 WINUSERAPI LONG WINAPI DispatchMessageW (const MSG *);