[PATCH 1/4] include: Use struct inheritance for MONITORINFOEX declaration in C++.

[Jacek Caban]

From: Jacek Caban

---
 include/winuser.h | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/include/winuser.h b/include/winuser.h
index bc65e8a19d0..f9e2d49b528 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -2104,24 +2104,42 @@ typedef struct tagMONITORINFO
     DWORD dwFlags;
 } MONITORINFO, *LPMONITORINFO;

-typedef struct tagMONITORINFOEXA
+#ifdef __cplusplus
+
+struct tagMONITORINFOEXA : public tagMONITORINFO
+{
+    CHAR szDevice[CCHDEVICENAME];
+};
+
+struct tagMONITORINFOEXW : public tagMONITORINFO
+{
+    WCHAR szDevice[CCHDEVICENAME];
+};
+
+#else
+
+struct tagMONITORINFOEXA
 {   /* the 4 first entries are the same as MONITORINFO */
     DWORD	cbSize;	
     RECT	rcMonitor;
     RECT	rcWork;
     DWORD	dwFlags;
     CHAR        szDevice[CCHDEVICENAME];
-} MONITORINFOEXA, *LPMONITORINFOEXA;
+};

-typedef struct tagMONITORINFOEXW
+struct tagMONITORINFOEXW
 {   /* the 4 first entries are the same as MONITORINFO */
     DWORD	cbSize;
     RECT	rcMonitor;
     RECT	rcWork;
     DWORD	dwFlags;
     WCHAR       szDevice[CCHDEVICENAME];
-} MONITORINFOEXW, *LPMONITORINFOEXW;
+};
+
+#endif

+typedef struct tagMONITORINFOEXA MONITORINFOEXA, *LPMONITORINFOEXA;
+typedef struct tagMONITORINFOEXW MONITORINFOEXW, *LPMONITORINFOEXW;
 DECL_WINELIB_TYPE_AW(MONITORINFOEX)
 DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)