From 4d60e6d23167f545d8245905397cf528f8f75cd1 Mon Sep 17 00:00:00 2001 From: Luke Dunstan Date: Sun, 18 Apr 2004 04:32:13 +0000 Subject: [PATCH] 2004-04-18 Allan Bazinet * include/winuser.h (MONITORINFOEX[AW]): Change to be derived from MONITORINFO when compiling as C++. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/winuser.h | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6e9e0ac9b..e2cde912e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2004-04-18 Allan Bazinet + + * include/winuser.h (MONITORINFOEX[AW]): Change to be derived from + MONITORINFO when compiling as C++. + 2004-04-17 Luke Dunstan * README.w32api: List separate copyright conditions for some headers. diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 1181c623c..186c5c052 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2950,6 +2950,16 @@ typedef struct tagMONITORINFO { DWORD dwFlags; } MONITORINFO,*LPMONITORINFO; #define CCHDEVICENAME 32 +#ifdef __cplusplus +typedef struct tagMONITORINFOEXA : public tagMONITORINFO +{ + CHAR szDevice[CCHDEVICENAME]; +} MONITORINFOEXA, *LPMONITORINFOEXA; +typedef struct tagMONITORINFOEXW : public tagMONITORINFO +{ + WCHAR szDevice[CCHDEVICENAME]; +} MONITORINFOEXW, *LPMONITORINFOEXW; +#else typedef struct tagMONITORINFOEXA { DWORD cbSize; RECT rcMonitor; @@ -2964,6 +2974,7 @@ typedef struct tagMONITORINFOEXW { DWORD dwFlags; WCHAR szDevice[CCHDEVICENAME]; } MONITORINFOEXW,*LPMONITORINFOEXW; +#endif /* __cplusplus */ typedef struct tagKBDLLHOOKSTRUCT { DWORD vkCode; DWORD scanCode;