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

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

Revision: 1259
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1259&view=rev
Author:   dannybackx
Date:     2009-04-28 14:28:49 +0000 (Tue, 28 Apr 2009)

Log Message:
-----------
GetMenu, and (Set,Get,Remove)Prop functions.

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

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2009-04-28 14:03:01 UTC (rev 1258)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2009-04-28 14:28:49 UTC (rev 1259)
@@ -1,3 +1,9 @@
+2009-04-28  Danny Backx  <dan...@us...>
+
+	* include/winuser.h(GetMenu) : Remove for CE.
+	* include/winuser.h(SetProp*,GetProp*,RemoveProp*) : Define only the
+	right ones for CE, see bug #2328033.
+
 2009-04-28  Ryan Raasch  <rya...@gm...>
 
 	* include/strmif.h (IEnumPins, IEnumMediaTypes) : Define.

Modified: trunk/cegcc/src/w32api/include/winuser.h
===================================================================
--- trunk/cegcc/src/w32api/include/winuser.h	2009-04-28 14:03:01 UTC (rev 1258)
+++ trunk/cegcc/src/w32api/include/winuser.h	2009-04-28 14:28:49 UTC (rev 1259)
@@ -3724,7 +3724,9 @@
 WINUSERAPI int WINAPI GetKeyNameTextW(LONG,LPWSTR,int);
 WINUSERAPI SHORT WINAPI GetKeyState(int);
 WINUSERAPI HWND WINAPI GetLastActivePopup(HWND);
+#ifndef _WIN32_WCE
 WINUSERAPI HMENU WINAPI GetMenu(HWND);
+#endif
 WINUSERAPI LONG WINAPI GetMenuCheckMarkDimensions(void);
 WINUSERAPI DWORD WINAPI GetMenuContextHelpId(HMENU);
 WINUSERAPI UINT WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
@@ -3996,8 +3998,12 @@
 WINUSERAPI BOOL WINAPI ReleaseCapture(void);
 WINUSERAPI int WINAPI ReleaseDC(HWND,HDC);
 WINUSERAPI BOOL WINAPI RemoveMenu(HMENU,UINT,UINT);
+#ifdef _WIN32_WCE
+WINUSERAPI HANDLE WINAPI RemoveProp(HWND,LPCWSTR);
+#else
 WINUSERAPI HANDLE WINAPI RemovePropA(HWND,LPCSTR);
 WINUSERAPI HANDLE WINAPI RemovePropW(HWND,LPCWSTR);
+#endif
 WINUSERAPI BOOL WINAPI ReplyMessage(LRESULT);
 WINUSERAPI BOOL WINAPI ScreenToClient(HWND,LPPOINT);
 WINUSERAPI BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT);
@@ -4056,8 +4062,12 @@
 WINUSERAPI BOOL WINAPI SetProcessDefaultLayout(DWORD);
 #endif /* (_WIN32_WINNT >= 0x0500) */
 WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA);
+#ifdef _WIN32_WCE
+WINUSERAPI BOOL WINAPI SetProp(HWND,LPCSTR,HANDLE);
+#else
 WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE);
 WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE);
+#endif
 WINUSERAPI BOOL WINAPI SetRect(LPRECT,int,int,int,int);
 WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT);
 WINUSERAPI int WINAPI SetScrollInfo(HWND,int,LPCSCROLLINFO,BOOL);
@@ -4309,7 +4319,9 @@
 #define RegisterClipboardFormat RegisterClipboardFormatW
 #define RegisterDeviceNotification RegisterDeviceNotificationW
 #define RegisterWindowMessage RegisterWindowMessageW
+#ifndef _WIN32_WCE
 #define RemoveProp RemovePropW
+#endif
 #define SendDlgItemMessage SendDlgItemMessageW
 #define SendMessage SendMessageW
 #define SendMessageCallback SendMessageCallbackW
@@ -4319,7 +4331,9 @@
 #define SetClassLongPtr SetClassLongPtrW
 #define SetDlgItemText SetDlgItemTextW
 #define SetMenuItemInfo SetMenuItemInfoW
+#ifndef _WIN32_WCE
 #define SetProp SetPropW
+#endif
 #define SetUserObjectInformation SetUserObjectInformationW
 #define SetWindowLong SetWindowLongW
 #define SetWindowLongPtr SetWindowLongPtrW


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