Menu
▾
▴
[Cegcc-svn] SF.net SVN: cegcc: [1159] trunk/cegcc/src/w32api
|
From: <dan...@us...> - 2008-04-27 09:47:49
|
Revision: 1159
http://cegcc.svn.sourceforge.net/cegcc/?rev=1159&view=rev
Author: dannybackx
Date: 2008-04-27 02:39:53 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
Changes to help compile Roadmap.
* include/commctrl.h (CommandBar_AddButtons): Change from a
function definition into a macro.
* include/prsht.h (PSH_MAXIMIZE): Define.
* include/winioctl.h (FILE_DEVICE_HAL, FILE_DEVICE_SERVICE,
IOCTL_SERVICE_START, IOCTL_SERVICE_STOP, IOCTL_SERVICE_STATUS,
IOCTL_SERVICE_CONNECTION): Define.
Modified Paths:
--------------
trunk/cegcc/src/w32api/ChangeLog.ce
trunk/cegcc/src/w32api/include/commctrl.h
trunk/cegcc/src/w32api/include/prsht.h
trunk/cegcc/src/w32api/include/winioctl.h
Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce 2008-04-13 13:31:27 UTC (rev 1158)
+++ trunk/cegcc/src/w32api/ChangeLog.ce 2008-04-27 09:39:53 UTC (rev 1159)
@@ -1,12 +1,21 @@
2008-04-13 Danny Backx <dan...@us...>
+ * include/commctrl.h (CommandBar_AddButtons): Change from a
+ function definition into a macro.
+ * include/prsht.h (PSH_MAXIMIZE): Define.
+ * include/winioctl.h (FILE_DEVICE_HAL, FILE_DEVICE_SERVICE,
+ IOCTL_SERVICE_START, IOCTL_SERVICE_STOP, IOCTL_SERVICE_STATUS,
+ IOCTL_SERVICE_CONNECTION): Define.
+
+2008-04-13 Danny Backx <dan...@us...>
+
* include/winuser.h (SystemIdleTimerReset): Define.
2008-04-13 Danny Backx <dan...@us...>
* include/notify.h: Add.
* include/aygshell.h (SHSetAppKeyWndAssoc): Define.
- * include/commctrl (CommandBar_AddButtons): Define.
+ * include/commctrl.h (CommandBar_AddButtons): Define.
2008-04-13 Danny Backx <dan...@us...>
Modified: trunk/cegcc/src/w32api/include/commctrl.h
===================================================================
--- trunk/cegcc/src/w32api/include/commctrl.h 2008-04-13 13:31:27 UTC (rev 1158)
+++ trunk/cegcc/src/w32api/include/commctrl.h 2008-04-27 09:39:53 UTC (rev 1159)
@@ -3750,9 +3750,13 @@
COMMCTRLAPI HMENU WINAPI CommandBar_GetMenu(HWND,WORD);
COMMCTRLAPI BOOL WINAPI CommandBar_AddAdornments(HWND,DWORD,DWORD);
COMMCTRLAPI int WINAPI CommandBar_Height(HWND);
-BOOL CommandBar_AddButtons(HWND hwndCB, UINT uNumButtons, LPTBBUTTON lpButtons);
-#define CommandBar_InsertButton(hwnd,i,lptbbutton) ((BOOL)SendMessage((hwnd),TB_INSERTBUTTON,(i),(lptbbutton)))
+#define CommandBar_AddButtons(h, cb, lp) \
+ SendMessage((h), TB_ADDBUTTONS, (WPARAM)(cb), (LPARAM)(lp))
+
+
+#define CommandBar_InsertButton(hwnd,i,lptbbutton) \
+ ((BOOL)SendMessage((hwnd),TB_INSERTBUTTON,(i),(lptbbutton)))
#define CommandBar_Destroy(hwnd) ((void)DestroyWindow(hwnd))
#endif /* _WIN32_WCE */
Modified: trunk/cegcc/src/w32api/include/prsht.h
===================================================================
--- trunk/cegcc/src/w32api/include/prsht.h 2008-04-13 13:31:27 UTC (rev 1158)
+++ trunk/cegcc/src/w32api/include/prsht.h 2008-04-27 09:39:53 UTC (rev 1159)
@@ -26,32 +26,36 @@
#endif
#define PSPCB_RELEASE 1
#define PSPCB_CREATE 2
-#define PSH_DEFAULT 0
-#define PSH_PROPTITLE 1
-#define PSH_USEHICON 2
-#define PSH_USEICONID 4
-#define PSH_PROPSHEETPAGE 8
-#define PSH_WIZARDHASFINISH 16
-#define PSH_WIZARD 32
-#define PSH_USEPSTARTPAGE 64
-#define PSH_NOAPPLYNOW 128
-#define PSH_USECALLBACK 256
-#define PSH_HASHELP 512
-#define PSH_MODELESS 1024
-#define PSH_RTLREADING 2048
-#define PSH_WIZARDCONTEXTHELP 4096
+
+#define PSH_DEFAULT 0x0000
+#define PSH_PROPTITLE 0x0001
+#define PSH_USEHICON 0x0002
+#define PSH_USEICONID 0x0004
+#define PSH_PROPSHEETPAGE 0x0008
+#define PSH_WIZARDHASFINISH 0x0010
+#define PSH_WIZARD 0x0020
+#define PSH_USEPSTARTPAGE 0x0040
+#define PSH_NOAPPLYNOW 0x0080
+#define PSH_USECALLBACK 0x0100
+#define PSH_HASHELP 0x0200
+#define PSH_MODELESS 0x0400
+#define PSH_RTLREADING 0x0800
+#define PSH_WIZARDCONTEXTHELP 0x1000
+#ifdef _WIN32_IE
+#define PSH_MAXIMIZE 0x2000 /* ?? */
+#endif
#if (_WIN32_IE >= 0x0400)
-#define PSH_WATERMARK 32768
-#define PSH_USEHBMWATERMARK 65536
-#define PSH_USEHPLWATERMARK 131072
-#define PSH_STRETCHWATERMARK 262144
-#define PSH_HEADER 524288
-#define PSH_USEHBMHEADER 1048576
-#define PSH_USEPAGELANG 2097152
+#define PSH_WATERMARK 0x4000
+#define PSH_USEHBMWATERMARK 0x010000
+#define PSH_USEHPLWATERMARK 0x020000
+#define PSH_STRETCHWATERMARK 0x040000
+#define PSH_HEADER 0x080000
+#define PSH_USEHBMHEADER 0x100000
+#define PSH_USEPAGELANG 0x200000
#if (_WIN32_IE < 0x0500)
-#define PSH_WIZARD97 0x00002000
+#define PSH_WIZARD97 0x00002000
#else
-#define PSH_WIZARD97 0x01000000
+#define PSH_WIZARD97 0x01000000
#endif
#endif /* _WIN32_IE >= 0x0400 */
#if (_WIN32_IE >= 0x0500)
Modified: trunk/cegcc/src/w32api/include/winioctl.h
===================================================================
--- trunk/cegcc/src/w32api/include/winioctl.h 2008-04-13 13:31:27 UTC (rev 1158)
+++ trunk/cegcc/src/w32api/include/winioctl.h 2008-04-27 09:39:53 UTC (rev 1159)
@@ -548,6 +548,21 @@
((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\
((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\
((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED))
+
+#if defined(_WIN32_WCE)
+#define FILE_DEVICE_HAL 0x0101
+#define FILE_DEVICE_SERVICE 0x0104
+
+#define IOCTL_SERVICE_START \
+ CTL_CODE(FILE_DEVICE_SERVICE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_SERVICE_STOP \
+ CTL_CODE(FILE_DEVICE_SERVICE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_SERVICE_STATUS \
+ CTL_CODE(FILE_DEVICE_SERVICE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_SERVICE_CONNECTION \
+ CTL_CODE(FILE_DEVICE_SERVICE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#endif /* _WIN32_WCE */
+
#ifdef __cplusplus
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
