[Cegcc-devel] w32api: Fix GetCharWidth32 definition

[Nuno L. <nt...@gm...>]

The GetCharWidth32 hasn't two variations on WinCE as it has on Windows
(even if they are the same).

This was discovered by simply noticing the import libraries already
declare it as they should, only the declaration is wrong.

This patch fixes this:


--- w32api/include/wingdi.h     2007-01-26 23:03:05.000000000 +0000
+++ wingdi.h     2007-01-27 19:47:35.000000000 +0000
@@ -2802,12 +2802,16 @@
 WINGDIAPI BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
 WINGDIAPI DWORD WINAPI
GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD);
 WINGDIAPI DWORD WINAPI
GetCharacterPlacementW(HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD);
+#ifndef _WIN32_WCE
 WINGDIAPI BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
 WINGDIAPI BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
 WINGDIAPI BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
 WINGDIAPI BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
 WINGDIAPI BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
 WINGDIAPI BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
+#else
+WINGDIAPI BOOL WINAPI GetCharWidth32(HDC,UINT,UINT,LPINT);
+#endif
 WINGDIAPI int WINAPI GetClipBox(HDC,LPRECT);
 WINGDIAPI int WINAPI GetClipRgn(HDC,HRGN);
 WINGDIAPI BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT);
@@ -3092,7 +3096,9 @@
 #define GetCharABCWidthsFloat GetCharABCWidthsFloatW
 #define GetCharABCWidths GetCharABCWidthsW
 #define GetCharacterPlacement GetCharacterPlacementW
+#ifndef _WIN32_WCE
 #define GetCharWidth32 GetCharWidth32W
+#endif
 #define GetCharWidthFloat GetCharWidthFloatW
 #define GetCharWidth GetCharWidthW
 #define GetEnhMetaFile GetEnhMetaFileW


Regards,
~Nuno Lucas