PATCH: MONITORINFOEX

[Marcus Meissner]

Hi,

Ciao, Marcus

Changelog:
	Changed MONITORINFOEXA,W definition to the one in MSDN which does
	not cause gcc 3.3 warnings.


Index: include/winuser.h
===================================================================
RCS file: /home/wine/wine/include/winuser.h,v
retrieving revision 1.157
diff -u -u -r1.157 winuser.h
--- include/winuser.h	3 Jan 2003 19:12:55 -0000	1.157
+++ include/winuser.h	16 Jan 2003 21:42:13 -0000
@@ -2385,31 +2385,23 @@
     DWORD dwFlags;
 } MONITORINFO, *LPMONITORINFO;
 
-#ifdef __cplusplus
-typedef struct tagMONITORINFOEXA : public tagMONITORINFO
-{
-  CHAR szDevice[CCHDEVICENAME];
-} MONITORINFOEXA, *LPMONITORINFOEXA;
-#else
 typedef struct tagMONITORINFOEXA
-{
-    MONITORINFO DUMMYSTRUCTNAME;
+{   /* the 4 first entries are the same as MONITORINFO */
+    DWORD	cbSize;	
+    RECT	rcMonitor;
+    RECT	rcWork;
+    DWORD	dwFlags;
     CHAR        szDevice[CCHDEVICENAME];
 } MONITORINFOEXA, *LPMONITORINFOEXA;
-#endif
 
-#ifdef __cplusplus
-typedef struct tagMONITORINFOEXW : public tagMONITORINFO
-{
-  WCHAR szDevice[CCHDEVICENAME];
-} MONITORINFOEXW, *LPMONITORINFOEXW;
-#else
 typedef struct tagMONITORINFOEXW
-{
-    MONITORINFO DUMMYSTRUCTNAME;
+{   /* the 4 first entries are the same as MONITORINFO */
+    DWORD	cbSize;
+    RECT	rcMonitor;
+    RECT	rcWork;
+    DWORD	dwFlags;
     WCHAR       szDevice[CCHDEVICENAME];
 } MONITORINFOEXW, *LPMONITORINFOEXW;
-#endif
 
 DECL_WINELIB_TYPE_AW(MONITORINFOEX)
 DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)