2004-04-18 Allan Bazinet <bazineta@users.sourceforge.net>

* include/winuser.h (MONITORINFOEX[AW]): Change to be derived from
	MONITORINFO when compiling as C++.
This commit is contained in:
Luke Dunstan 2004-04-18 04:32:13 +00:00
parent ebd2f65c4e
commit 4d60e6d231
2 changed files with 16 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2004-04-18 Allan Bazinet <bazineta@users.sourceforge.net>
* include/winuser.h (MONITORINFOEX[AW]): Change to be derived from
MONITORINFO when compiling as C++.
2004-04-17 Luke Dunstan <infidel@users.sourceforge.net> 2004-04-17 Luke Dunstan <infidel@users.sourceforge.net>
* README.w32api: List separate copyright conditions for some headers. * README.w32api: List separate copyright conditions for some headers.

View File

@ -2950,6 +2950,16 @@ typedef struct tagMONITORINFO {
DWORD dwFlags; DWORD dwFlags;
} MONITORINFO,*LPMONITORINFO; } MONITORINFO,*LPMONITORINFO;
#define CCHDEVICENAME 32 #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 { typedef struct tagMONITORINFOEXA {
DWORD cbSize; DWORD cbSize;
RECT rcMonitor; RECT rcMonitor;
@ -2964,6 +2974,7 @@ typedef struct tagMONITORINFOEXW {
DWORD dwFlags; DWORD dwFlags;
WCHAR szDevice[CCHDEVICENAME]; WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW,*LPMONITORINFOEXW; } MONITORINFOEXW,*LPMONITORINFOEXW;
#endif /* __cplusplus */
typedef struct tagKBDLLHOOKSTRUCT { typedef struct tagKBDLLHOOKSTRUCT {
DWORD vkCode; DWORD vkCode;
DWORD scanCode; DWORD scanCode;