From 4a46348a9c570e6960e48bd6b3b028d2ffde4a41 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 Jan 2003 00:29:31 +0000 Subject: [PATCH] Changed MONITORINFOEXA,W definition to the one in MSDN which does not cause gcc 3.3 warnings. --- dlls/user/tests/generated.c | 8 -------- include/winuser.h | 28 ++++++++++------------------ 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/dlls/user/tests/generated.c b/dlls/user/tests/generated.c index 863c3354787..24898c4227c 100644 --- a/dlls/user/tests/generated.c +++ b/dlls/user/tests/generated.c @@ -1315,14 +1315,10 @@ static void test_pack_MONITORINFOEXA(void) { /* MONITORINFOEXA (pack 4) */ TEST_TYPE(MONITORINFOEXA, 72, 4); -#ifdef NONAMELESSSTRUCT - TEST_FIELD(MONITORINFOEXA, MONITORINFO, DUMMYSTRUCTNAME, 0, 40, 4); -#else TEST_FIELD(MONITORINFOEXA, DWORD, cbSize, 0, 4, 4); TEST_FIELD(MONITORINFOEXA, RECT, rcMonitor, 4, 16, 4); TEST_FIELD(MONITORINFOEXA, RECT, rcWork, 20, 16, 4); TEST_FIELD(MONITORINFOEXA, DWORD, dwFlags, 36, 4, 4); -#endif TEST_FIELD(MONITORINFOEXA, CHAR[CCHDEVICENAME], szDevice, 40, 32, 1); } @@ -1330,14 +1326,10 @@ static void test_pack_MONITORINFOEXW(void) { /* MONITORINFOEXW (pack 4) */ TEST_TYPE(MONITORINFOEXW, 104, 4); -#ifdef NONAMELESSSTRUCT - TEST_FIELD(MONITORINFOEXW, MONITORINFO, DUMMYSTRUCTNAME, 0, 40, 4); -#else TEST_FIELD(MONITORINFOEXW, DWORD, cbSize, 0, 4, 4); TEST_FIELD(MONITORINFOEXW, RECT, rcMonitor, 4, 16, 4); TEST_FIELD(MONITORINFOEXW, RECT, rcWork, 20, 16, 4); TEST_FIELD(MONITORINFOEXW, DWORD, dwFlags, 36, 4, 4); -#endif TEST_FIELD(MONITORINFOEXW, WCHAR[CCHDEVICENAME], szDevice, 40, 64, 2); } diff --git a/include/winuser.h b/include/winuser.h index 2caebb87147..909a46e7bf4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2385,31 +2385,23 @@ typedef struct tagMONITORINFO 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)