[Cegcc-svn] SF.net SVN: cegcc: [870] trunk/cegcc/src/w32api

[<dan...@us...>]

Revision: 870
          http://svn.sourceforge.net/cegcc/?rev=870&view=rev
Author:   dannybackx
Date:     2007-01-31 13:02:32 -0800 (Wed, 31 Jan 2007)

Log Message:
-----------
Submitted by Nuno Lucas.

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

> This confuses me. Should we define MessageBoxW in the lib with the W,
> but GetCharWidth32 without the W ? What do other Windows architectures
> implement ?

I believe this was actually an error by Microsoft on the Windows API,
which they maintained for the sake of compatibility. But with Windows
CE they didn't need to maintain that error and just had one
GetCharWidth32() export.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/wingdi.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2007-01-31 19:50:37 UTC (rev 869)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2007-01-31 21:02:32 UTC (rev 870)
@@ -2,8 +2,9 @@
 
 	* include/winuser.h : Define MsgWaitForMultipleObjects as a macro that
 	calls MsgWaitForMultipleObjectsEx as described on MSDN.
+	* include/wingdi.h : Define only the right function GetCharWidth32
+	for Windows CE, not its similarly named friends.
 
-
 2006-12-18  Pedro Alves  <ped...@po...>
 
 	* include/winnt.h (_M_ARM, ARM): Remove.

Modified: trunk/cegcc/src/w32api/include/wingdi.h
===================================================================
--- trunk/cegcc/src/w32api/include/wingdi.h	2007-01-31 19:50:37 UTC (rev 869)
+++ trunk/cegcc/src/w32api/include/wingdi.h	2007-01-31 21:02:32 UTC (rev 870)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.