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

[<ped...@us...>]

Revision: 911
          http://svn.sourceforge.net/cegcc/?rev=911&view=rev
Author:   pedroalves
Date:     2007-03-26 15:29:14 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
As hinted here:
http://www.microsoft.com/msj/0598/wince.aspx
http://www.microsoft.com/msj/0598/memory.aspx
http://msdn.microsoft.com/msdnmag/issues/01/01/CETools/

Windows CE doesn't support the old global heap.  But I'm porting an
app that used to build with eVC, so MS must map the Global* functions
to Local* counterparts.  This patch makes us suposedly do the same.

	* include/winbase.h (GlobalAlloc, GlobalFree
	GlobalReAlloc, GlobalHandle, GlobalLock
	GlobalUnlock, GlobalSize, GlobalFlags): Map to
	LocalAlloc, LocalFree, LocalReAlloc,
	LocalHandle, LocalLock, LocalUnlock,
	LocalSize and LocalFlags respectivelly.

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

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2007-03-26 22:04:19 UTC (rev 910)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2007-03-26 22:29:14 UTC (rev 911)
@@ -1,6 +1,12 @@
 2007-03-26  Pedro Alves  <ped...@po...>
 
 	* include/winuser.h (WS_EX_CAPTIONOKBTN): Define.
+	* include/winbase.h (GlobalAlloc, GlobalFree
+	GlobalReAlloc, GlobalHandle, GlobalLock
+	GlobalUnlock, GlobalSize, GlobalFlags): Map to
+	LocalAlloc, LocalFree, LocalReAlloc,
+	LocalHandle, LocalLock, LocalUnlock,
+	LocalSize and LocalFlags respectivelly.
 
 2007-02-26  Pedro Alves  <ped...@po...>
 

Modified: trunk/cegcc/src/w32api/include/winbase.h
===================================================================
--- trunk/cegcc/src/w32api/include/winbase.h	2007-03-26 22:04:19 UTC (rev 910)
+++ trunk/cegcc/src/w32api/include/winbase.h	2007-03-26 22:29:14 UTC (rev 911)
@@ -1652,27 +1652,38 @@
 WINBASEAPI UINT WINAPI GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG);
 WINBASEAPI ATOM WINAPI GlobalAddAtomA(LPCSTR);
 WINBASEAPI ATOM WINAPI GlobalAddAtomW( LPCWSTR);
-WINBASEAPI HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
 WINBASEAPI SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */
 WINBASEAPI ATOM WINAPI GlobalDeleteAtom(ATOM);
 #define GlobalDiscard(hMem) GlobalReAlloc((hMem), 0, GMEM_MOVEABLE)
 WINBASEAPI ATOM WINAPI GlobalFindAtomA(LPCSTR);
 WINBASEAPI ATOM WINAPI GlobalFindAtomW(LPCWSTR);
 WINBASEAPI VOID WINAPI GlobalFix(HGLOBAL); /* Obsolete: Has no effect. */
-WINBASEAPI UINT WINAPI GlobalFlags(HGLOBAL); /* Obsolete: Has no effect. */
-WINBASEAPI HGLOBAL WINAPI GlobalFree(HGLOBAL);
 WINBASEAPI UINT WINAPI GlobalGetAtomNameA(ATOM,LPSTR,int);
 WINBASEAPI UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,int);
+#ifndef _WIN32_WCE
+WINBASEAPI HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
+WINBASEAPI HGLOBAL WINAPI GlobalFree(HGLOBAL);
+WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
 WINBASEAPI HGLOBAL WINAPI GlobalHandle(PCVOID);
 WINBASEAPI LPVOID WINAPI GlobalLock(HGLOBAL);
+WINBASEAPI BOOL WINAPI GlobalUnlock(HGLOBAL); 
+WINBASEAPI DWORD WINAPI GlobalSize(HGLOBAL);
+WINBASEAPI UINT WINAPI GlobalFlags(HGLOBAL); /* Obsolete: Has no effect. */
+#else
+# define GlobalAlloc(flags, cb) LocalAlloc(flags, cb)
+# define GlobalFree(h) LocalFree(h)
+# define GlobalReAlloc(h, cb, flags) LocalReAlloc(h, cb, flags)
+# define GlobalHandle(lp) LocalHandle(lp)
+# define GlobalLock(lp) LocalLock(lp)
+# define GlobalUnlock(lp) LocalUnlock(lp)
+# define GlobalSize(lp) LocalSize(lp)
+# define GlobalFlags(lp) LocalFlags(lp)
+#endif
 WINBASEAPI VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS);
 #if (_WIN32_WINNT >= 0x0500)
 WINBASEAPI BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX);
 #endif
-WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
-WINBASEAPI DWORD WINAPI GlobalSize(HGLOBAL);
 WINBASEAPI VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */
-WINBASEAPI BOOL WINAPI GlobalUnlock(HGLOBAL); 
 WINBASEAPI BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */
 WINBASEAPI PVOID WINAPI GlobalWire(HGLOBAL); /* Obsolete: Has no effect. */
 #define HasOverlappedIoCompleted(lpOverlapped)  ((lpOverlapped)->Internal != STATUS_PENDING)


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