Menu
▾
▴
[Cegcc-svn] SF.net SVN: cegcc: [1066] trunk/cegcc/src/w32api
|
From: <dan...@us...> - 2007-10-20 17:43:49
|
Revision: 1066
http://cegcc.svn.sourceforge.net/cegcc/?rev=1066&view=rev
Author: dannybackx
Date: 2007-10-20 10:43:44 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
2007-10-20 Jacek M. Holeczek <hol...@us...>
* include/winuser.h (ChangeDisplaySettings): Define differently for CE
than for other Windows versions.
* include/shellapi.h (ShellExecuteEx, ShellExecute): Define only those
functions that exist in the CE API.
* include/wingdi.h (struct _devicemodeW, DEVMODEW, LPDEVMODEW,
PDEVMODEW): Define this structure, the typedefs, and the constants
it requires differently for Windows CE than for other Windows
platforms.
Modified Paths:
--------------
trunk/cegcc/src/w32api/ChangeLog.ce
trunk/cegcc/src/w32api/include/shellapi.h
trunk/cegcc/src/w32api/include/wingdi.h
trunk/cegcc/src/w32api/include/winuser.h
Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce 2007-10-20 17:25:19 UTC (rev 1065)
+++ trunk/cegcc/src/w32api/ChangeLog.ce 2007-10-20 17:43:44 UTC (rev 1066)
@@ -1,3 +1,13 @@
+2007-10-20 Jacek M. Holeczek <hol...@us...>
+ * include/winuser.h (ChangeDisplaySettings): Define differently for CE
+ than for other Windows versions.
+ * include/shellapi.h (ShellExecuteEx, ShellExecute): Define only those
+ functions that exist in the CE API.
+ * include/wingdi.h (struct _devicemodeW, DEVMODEW, LPDEVMODEW,
+ PDEVMODEW): Define this structure, the typedefs, and the constants
+ it requires differently for Windows CE than for other Windows
+ platforms.
+
2007-10-20 Danny Backx <dan...@us...>
* include/winuser.h (IsDlgButtonChecked) : Change to a macro for
Modified: trunk/cegcc/src/w32api/include/shellapi.h
===================================================================
--- trunk/cegcc/src/w32api/include/shellapi.h 2007-10-20 17:25:19 UTC (rev 1065)
+++ trunk/cegcc/src/w32api/include/shellapi.h 2007-10-20 17:43:44 UTC (rev 1066)
@@ -297,14 +297,14 @@
BOOL WINAPI Shell_NotifyIconW(DWORD,PNOTIFYICONDATAW);
int WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
int WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
+#ifndef _WIN32_WCE
HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA);
-#ifndef _WIN32_WCE
BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW);
-#else
+#else /* _WIN32_WCE */
BOOL WINAPI ShellExecuteEx(LPSHELLEXECUTEINFOW);
-#endif
+#endif /* _WIN32_WCE */
int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA);
int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW);
void WINAPI SHFreeNameMappings(HANDLE);
@@ -341,10 +341,10 @@
#define FindExecutable FindExecutableW
#define Shell_NotifyIcon Shell_NotifyIconW
#define ShellAbout ShellAboutW
+#ifndef _WIN32_WCE
#define ShellExecute ShellExecuteW
-#ifndef _WIN32_WCE
#define ShellExecuteEx ShellExecuteExW
-#endif
+#endif /* _WIN32_WCE */
#define SHFileOperation SHFileOperationW
#ifndef _WIN32_WCE
#define SHGetFileInfo SHGetFileInfoW
Modified: trunk/cegcc/src/w32api/include/wingdi.h
===================================================================
--- trunk/cegcc/src/w32api/include/wingdi.h 2007-10-20 17:25:19 UTC (rev 1065)
+++ trunk/cegcc/src/w32api/include/wingdi.h 2007-10-20 17:43:44 UTC (rev 1066)
@@ -1182,10 +1182,20 @@
#define DM_PELSHEIGHT 0x00100000
#define DM_DISPLAYFLAGS 0x00200000
#define DM_DISPLAYFREQUENCY 0x00400000
+#ifndef _WIN32_WCE
#define DM_ICMMETHOD 0x00800000
#define DM_ICMINTENT 0x01000000
#define DM_MEDIATYPE 0x02000000
#define DM_DITHERTYPE 0x04000000
+#else /* _WIN32_WCE */
+#define DM_DISPLAYORIENTATION 0x00800000
+#define DM_DISPLAYQUERYORIENTATION 0x01000000
+#define DMDO_0 0
+#define DMDO_DEFAULT DMDO_0
+#define DMDO_90 1
+#define DMDO_180 2
+#define DMDO_270 4
+#endif /* _WIN32_WCE */
#if(WINVER >= 0x0500)
#define DM_PANNINGWIDTH 0x08000000
#define DM_PANNINGHEIGHT 0x10000000
@@ -1523,6 +1533,7 @@
#endif
#endif /* WINVER >= 0x0400 */
} DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
+#ifndef _WIN32_WCE
typedef struct _devicemodeW {
WCHAR dmDeviceName[CCHDEVICENAME];
WORD dmSpecVersion;
@@ -1574,6 +1585,37 @@
#endif
#endif /* WINVER >= 0x0400 */
} DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
+#else /* _WIN32_WCE */
+typedef struct _devicemodeW {
+ WCHAR dmDeviceName[CCHDEVICENAME];
+ WORD dmSpecVersion;
+ WORD dmDriverVersion;
+ WORD dmSize;
+ WORD dmDriverExtra;
+ DWORD dmFields;
+ short dmOrientation;
+ short dmPaperSize;
+ short dmPaperLength;
+ short dmPaperWidth;
+ short dmScale;
+ short dmCopies;
+ short dmDefaultSource;
+ short dmPrintQuality;
+ short dmColor;
+ short dmDuplex;
+ short dmYResolution;
+ short dmTTOption;
+ short dmCollate;
+ WCHAR dmFormName[CCHFORMNAME];
+ WORD dmLogPixels;
+ DWORD dmBitsPerPel;
+ DWORD dmPelsWidth;
+ DWORD dmPelsHeight;
+ DWORD dmDisplayFlags;
+ DWORD dmDisplayFrequency;
+ DWORD dmDisplayOrientation;
+} DEVMODEW,*PDEVMODEW,*NPDEVMODEW,*LPDEVMODEW;
+#endif /* _WIN32_WCE */
typedef struct tagDIBSECTION {
BITMAP dsBm;
BITMAPINFOHEADER dsBmih;
Modified: trunk/cegcc/src/w32api/include/winuser.h
===================================================================
--- trunk/cegcc/src/w32api/include/winuser.h 2007-10-20 17:25:19 UTC (rev 1065)
+++ trunk/cegcc/src/w32api/include/winuser.h 2007-10-20 17:43:44 UTC (rev 1066)
@@ -3391,11 +3391,15 @@
WINUSERAPI WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
WINUSERAPI BOOL WINAPI ChangeClipboardChain(HWND,HWND);
#ifndef NOGDI
+#ifndef _WIN32_WCE
WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
WINUSERAPI LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
WINUSERAPI LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-#endif
+#else /* _WIN32_WCE */
+WINUSERAPI LONG WINAPI ChangeDisplaySettingsEx(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
+#endif /* _WIN32_WCE */
+#endif /* NOGDI */
WINUSERAPI BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
WINUSERAPI BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
WINUSERAPI LPSTR WINAPI CharLowerA(LPSTR);
@@ -4254,14 +4258,14 @@
#ifndef NOGDI
typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
+#define CreateDesktop CreateDesktopW
+#ifndef _WIN32_WCE
#define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
-#define CreateDesktop CreateDesktopW
-#ifndef _WIN32_WCE
#define EnumDisplaySettings EnumDisplaySettingsW
#define EnumDisplaySettingsEx EnumDisplaySettingsExW
#define EnumDisplayDevices EnumDisplayDevicesW
-#endif
+#endif /* _WIN32_WCE */
#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.
|
