Skip to content

W
wine-winehq
Commit 4a46348a authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Changed MONITORINFOEXA,W definition to the one in MSDN which does not

cause gcc 3.3 warnings.
parent d5d22367
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 26 deletions
dlls/user/tests/generated.c
View file @ 4a46348a
...@@ -1315,14 +1315,10 @@ static void test_pack_MONITORINFOEXA(void) ...@@ -1315,14 +1315,10 @@ static void test_pack_MONITORINFOEXA(void)
{ {
/* MONITORINFOEXA (pack 4) */ /* MONITORINFOEXA (pack 4) */
TEST_TYPE(MONITORINFOEXA, 72, 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, DWORD, cbSize, 0, 4, 4);
TEST_FIELD(MONITORINFOEXA, RECT, rcMonitor, 4, 16, 4); TEST_FIELD(MONITORINFOEXA, RECT, rcMonitor, 4, 16, 4);
TEST_FIELD(MONITORINFOEXA, RECT, rcWork, 20, 16, 4); TEST_FIELD(MONITORINFOEXA, RECT, rcWork, 20, 16, 4);
TEST_FIELD(MONITORINFOEXA, DWORD, dwFlags, 36, 4, 4); TEST_FIELD(MONITORINFOEXA, DWORD, dwFlags, 36, 4, 4);
#endif
TEST_FIELD(MONITORINFOEXA, CHAR[CCHDEVICENAME], szDevice, 40, 32, 1); TEST_FIELD(MONITORINFOEXA, CHAR[CCHDEVICENAME], szDevice, 40, 32, 1);
} }
...@@ -1330,14 +1326,10 @@ static void test_pack_MONITORINFOEXW(void) ...@@ -1330,14 +1326,10 @@ static void test_pack_MONITORINFOEXW(void)
{ {
/* MONITORINFOEXW (pack 4) */ /* MONITORINFOEXW (pack 4) */
TEST_TYPE(MONITORINFOEXW, 104, 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, DWORD, cbSize, 0, 4, 4);
TEST_FIELD(MONITORINFOEXW, RECT, rcMonitor, 4, 16, 4); TEST_FIELD(MONITORINFOEXW, RECT, rcMonitor, 4, 16, 4);
TEST_FIELD(MONITORINFOEXW, RECT, rcWork, 20, 16, 4); TEST_FIELD(MONITORINFOEXW, RECT, rcWork, 20, 16, 4);
TEST_FIELD(MONITORINFOEXW, DWORD, dwFlags, 36, 4, 4); TEST_FIELD(MONITORINFOEXW, DWORD, dwFlags, 36, 4, 4);
#endif
TEST_FIELD(MONITORINFOEXW, WCHAR[CCHDEVICENAME], szDevice, 40, 64, 2); TEST_FIELD(MONITORINFOEXW, WCHAR[CCHDEVICENAME], szDevice, 40, 64, 2);
} }
......
include/winuser.h
View file @ 4a46348a
...@@ -2385,31 +2385,23 @@ typedef struct tagMONITORINFO ...@@ -2385,31 +2385,23 @@ typedef struct tagMONITORINFO
DWORD dwFlags; DWORD dwFlags;
} MONITORINFO, *LPMONITORINFO; } MONITORINFO, *LPMONITORINFO;
#ifdef __cplusplus
typedef struct tagMONITORINFOEXA : public tagMONITORINFO
{
CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXA, *LPMONITORINFOEXA;
#else
typedef struct tagMONITORINFOEXA typedef struct tagMONITORINFOEXA
{ { /* the 4 first entries are the same as MONITORINFO */
MONITORINFO DUMMYSTRUCTNAME; DWORD cbSize;
RECT rcMonitor;
RECT rcWork;
DWORD dwFlags;
CHAR szDevice[CCHDEVICENAME]; CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXA, *LPMONITORINFOEXA; } MONITORINFOEXA, *LPMONITORINFOEXA;
#endif
#ifdef __cplusplus
typedef struct tagMONITORINFOEXW : public tagMONITORINFO
{
WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW, *LPMONITORINFOEXW;
#else
typedef struct tagMONITORINFOEXW typedef struct tagMONITORINFOEXW
{ { /* the 4 first entries are the same as MONITORINFO */
MONITORINFO DUMMYSTRUCTNAME; DWORD cbSize;
RECT rcMonitor;
RECT rcWork;
DWORD dwFlags;
WCHAR szDevice[CCHDEVICENAME]; WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW, *LPMONITORINFOEXW; } MONITORINFOEXW, *LPMONITORINFOEXW;
#endif
DECL_WINELIB_TYPE_AW(MONITORINFOEX) DECL_WINELIB_TYPE_AW(MONITORINFOEX)
DECL_WINELIB_TYPE_AW(LPMONITORINFOEX) DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment