Menu
▾
▴
[Cegcc-svn] SF.net SVN: cegcc: [1064] trunk/cegcc/src/w32api
|
From: <ped...@us...> - 2007-10-16 21:22:44
|
Revision: 1064
http://cegcc.svn.sourceforge.net/cegcc/?rev=1064&view=rev
Author: pedroalves
Date: 2007-10-16 14:22:00 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
2007-10-16 Erik van Pienbroek <er...@va...>
* include/commdlg.h (ChooseColor): New declaration, and hide
macro.
(ChooseColorA, ChooseColorW): Hide.
* include/shellapi.h (SHLoadBIBitmap): Declare.
* include/winbase.h (_SYSTEM_POWER_STATUS, _SYSTEM_POWER_STATUS)
(LPSYSTEM_POWER_STATUS, GetSystemPowerStatus): Hide.
* include/winuser.h (EnumDisplaySettings, EnumDisplayDevices): New
declarations, and hide macros.
(EnumDisplaySettingsA, EnumDisplaySettingsW)
(EnumDisplaySettingsExA, EnumDisplaySettingsExW)
(EnumDisplayDevicesA, EnumDisplayDevicesW): Hide.
(TrackPopupMenu): Define in terms of TrackPopupMenuEx.
Modified Paths:
--------------
trunk/cegcc/src/w32api/ChangeLog.ce
trunk/cegcc/src/w32api/include/commdlg.h
trunk/cegcc/src/w32api/include/shellapi.h
trunk/cegcc/src/w32api/include/winbase.h
trunk/cegcc/src/w32api/include/winuser.h
Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce 2007-10-16 20:52:57 UTC (rev 1063)
+++ trunk/cegcc/src/w32api/ChangeLog.ce 2007-10-16 21:22:00 UTC (rev 1064)
@@ -1,3 +1,18 @@
+2007-10-16 Erik van Pienbroek <er...@va...>
+
+ * include/commdlg.h (ChooseColor): New declaration, and hide
+ macro.
+ (ChooseColorA, ChooseColorW): Hide.
+ * include/shellapi.h (SHLoadBIBitmap): Declare.
+ * include/winbase.h (_SYSTEM_POWER_STATUS, _SYSTEM_POWER_STATUS)
+ (LPSYSTEM_POWER_STATUS, GetSystemPowerStatus): Hide.
+ * include/winuser.h (EnumDisplaySettings, EnumDisplayDevices): New
+ declarations, and hide macros.
+ (EnumDisplaySettingsA, EnumDisplaySettingsW)
+ (EnumDisplaySettingsExA, EnumDisplaySettingsExW)
+ (EnumDisplayDevicesA, EnumDisplayDevicesW): Hide.
+ (TrackPopupMenu): Define in terms of TrackPopupMenuEx.
+
2007-09-19 Danny Backx <dan...@us...>
* include/service.h (ServiceAddPort): Fix type of szRegWritePath
Modified: trunk/cegcc/src/w32api/include/commdlg.h
===================================================================
--- trunk/cegcc/src/w32api/include/commdlg.h 2007-10-16 20:52:57 UTC (rev 1063)
+++ trunk/cegcc/src/w32api/include/commdlg.h 2007-10-16 21:22:00 UTC (rev 1064)
@@ -525,8 +525,12 @@
} PRINTDLGEXW, *LPPRINTDLGEXW;
#endif /* WINVER >= 0x0500 */
+#ifdef _WIN32_WCE
+BOOL WINAPI ChooseColor(LPCHOOSECOLORW);
+#else
BOOL WINAPI ChooseColorA(LPCHOOSECOLORA);
BOOL WINAPI ChooseColorW(LPCHOOSECOLORW);
+#endif
BOOL WINAPI ChooseFontA(LPCHOOSEFONTA);
BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
DWORD WINAPI CommDlgExtendedError(void);
@@ -568,7 +572,9 @@
typedef OFNOTIFYW OFNOTIFY,*LPOFNOTIFY;
typedef PAGESETUPDLGW PAGESETUPDLG,*LPPAGESETUPDLG;
typedef PRINTDLGW PRINTDLG,*LPPRINTDLG;
+#ifndef _WIN32_WCE
#define ChooseColor ChooseColorW
+#endif
#define ChooseFont ChooseFontW
#define FindText FindTextW
#define GetFileTitle GetFileTitleW
@@ -598,7 +604,9 @@
typedef OFNOTIFYA OFNOTIFY,*LPOFNOTIFY;
typedef PAGESETUPDLGA PAGESETUPDLG,*LPPAGESETUPDLG;
typedef PRINTDLGA PRINTDLG,*LPPRINTDLG;
+#ifndef _WIN32_WCE
#define ChooseColor ChooseColorA
+#endif
#define ChooseFont ChooseFontA
#define FindText FindTextA
#define GetFileTitle GetFileTitleA
Modified: trunk/cegcc/src/w32api/include/shellapi.h
===================================================================
--- trunk/cegcc/src/w32api/include/shellapi.h 2007-10-16 20:52:57 UTC (rev 1063)
+++ trunk/cegcc/src/w32api/include/shellapi.h 2007-10-16 21:22:00 UTC (rev 1064)
@@ -326,6 +326,7 @@
#ifdef _WIN32_WCE
BOOL WINAPI SHGetShortcutTarget(LPCTSTR,LPTSTR,int);
BOOL WINAPI SHCreateShortcut(LPTSTR,LPTSTR);
+HBITMAP WINAPI SHLoadDIBitmap(LPCTSTR);
#endif
#ifdef UNICODE
Modified: trunk/cegcc/src/w32api/include/winbase.h
===================================================================
--- trunk/cegcc/src/w32api/include/winbase.h 2007-10-16 20:52:57 UTC (rev 1063)
+++ trunk/cegcc/src/w32api/include/winbase.h 2007-10-16 21:22:00 UTC (rev 1064)
@@ -900,6 +900,7 @@
WORD wProcessorLevel;
WORD wProcessorRevision;
} SYSTEM_INFO,*LPSYSTEM_INFO;
+#ifndef _WIN32_WCE
typedef struct _SYSTEM_POWER_STATUS {
BYTE ACLineStatus;
BYTE BatteryFlag;
@@ -908,6 +909,7 @@
DWORD BatteryLifeTime;
DWORD BatteryFullLifeTime;
} SYSTEM_POWER_STATUS,*LPSYSTEM_POWER_STATUS;
+#endif
typedef struct _TIME_ZONE_INFORMATION {
LONG Bias;
WCHAR StandardName[32];
@@ -1589,8 +1591,9 @@
WINBASEAPI UINT WINAPI GetSystemDirectoryA(LPSTR,UINT);
WINBASEAPI UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT);
WINBASEAPI VOID WINAPI GetSystemInfo(LPSYSTEM_INFO);
+#ifndef _WIN32_WCE
WINBASEAPI BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
-#ifdef _WIN32_WCE
+#else
WINBASEAPI DWORD GetSystemPowerStatusEx2(PSYSTEM_POWER_STATUS_EX2,DWORD,BOOL);
WINBASEAPI BOOL GetSystemPowerStatusEx(PSYSTEM_POWER_STATUS_EX,BOOL);
#endif
Modified: trunk/cegcc/src/w32api/include/winuser.h
===================================================================
--- trunk/cegcc/src/w32api/include/winuser.h 2007-10-16 20:52:57 UTC (rev 1063)
+++ trunk/cegcc/src/w32api/include/winuser.h 2007-10-16 21:22:00 UTC (rev 1064)
@@ -3554,6 +3554,10 @@
WINUSERAPI BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM);
WINUSERAPI BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
#ifndef NOGDI
+#ifdef _WIN32_WCE
+WINUSERAPI BOOL WINAPI EnumDisplaySettings(LPCWSTR,DWORD,PDEVMODEW);
+WINUSERAPI BOOL WINAPI EnumDisplayDevices(LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD);
+#else
WINUSERAPI BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
WINUSERAPI BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
@@ -3563,6 +3567,7 @@
WINUSERAPI BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD);
WINUSERAPI BOOL WINAPI EnumDisplayDevicesW(LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD);
#endif
+#endif
WINUSERAPI int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
WINUSERAPI int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
WINUSERAPI int WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
@@ -4029,7 +4034,12 @@
WINUSERAPI int WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
WINUSERAPI int WINAPI ToUnicodeEx(UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL);
WINUSERAPI BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
+#ifdef _WIN32_WCE
+#define TrackPopupMenu(hmenu,uFlags,x,y,nReserved,hWnd,rect) \
+ TrackPopupMenuEx(hmenu,uFlags,x,y,hWnd,NULL)
+#else
WINUSERAPI BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
+#endif
WINUSERAPI BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);
WINUSERAPI int WINAPI TranslateAcceleratorA(HWND,HACCEL,LPMSG);
WINUSERAPI int WINAPI TranslateAcceleratorW(HWND,HACCEL,LPMSG);
@@ -4243,9 +4253,11 @@
#define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
#define CreateDesktop CreateDesktopW
+#ifndef _WIN32_WCE
#define EnumDisplaySettings EnumDisplaySettingsW
#define EnumDisplaySettingsEx EnumDisplaySettingsExW
#define EnumDisplayDevices EnumDisplayDevicesW
+#endif
#endif /* NOGDI */
#else /* UNICODE */
#define EDITWORDBREAKPROC EDITWORDBREAKPROCA
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
