[ros-diffs] [tkreuzer] 66889: [WIN32K] Make internal GDI headers C++ compatible, get rid of USER dependencies

Author: tkreuzer
Date: Wed Mar 25 22:32:22 2015
New Revision: 66889

URL: http://svn.reactos.org/svn/reactos?rev=66889&view=rev
Log:
[WIN32K]
Make internal GDI headers C++ compatible, get rid of USER dependencies

Modified:
    trunk/reactos/win32ss/gdi/eng/driverobj.h
    trunk/reactos/win32ss/gdi/eng/eng.h
    trunk/reactos/win32ss/gdi/eng/engobjects.h
    trunk/reactos/win32ss/gdi/eng/mapping.h
    trunk/reactos/win32ss/gdi/ntgdi/dc.h
    trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h
    trunk/reactos/win32ss/gdi/ntgdi/palette.h

Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/driverobj.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/driverobj.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -22,5 +22,5 @@
 PEDRIVEROBJ
 DRIVEROBJ_TryLockObject(HDRVOBJ hdo)
 {
-    return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE);
+    return (PEDRIVEROBJ)GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE);
 }

Modified: trunk/reactos/win32ss/gdi/eng/eng.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/eng.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/eng.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -32,8 +32,8 @@
 VOID
 FASTCALL
 IntEngWindowChanged(
-    _In_    PWND Window,
-    _In_    FLONG flChanged);
+    _In_ struct _WND *Window,
+    _In_ FLONG flChanged);
 
 ULONGLONG
 APIENTRY

Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/engobjects.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/engobjects.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -40,9 +40,14 @@
 ---------------------------------------------------------------------------*/
 
 /* EXtended CLip and Window Region Object */
+#ifdef __cplusplus
+typedef struct _XCLIPOBJ : _WNDOBJ
+{
+#else
 typedef struct _XCLIPOBJ
 {
   WNDOBJ;
+#endif
   PVOID   pClipRgn;    /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */
   RECTL   rclClipRgn;
   PVOID   pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */

Modified: trunk/reactos/win32ss/gdi/eng/mapping.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/mapping.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/mapping.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -16,9 +16,14 @@
     PVOID          pSection;
 } FILEVIEW, *PFILEVIEW;
 
+#ifdef __cplusplus
+typedef struct _FONTFILEVIEW : FILEVIEW
+{
+#else
 typedef struct _FONTFILEVIEW
 {
     FILEVIEW;
+#endif
     DWORD          reserved[2];
     PWSTR          pwszPath;
     SIZE_T         ulRegionSize;

Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dc.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dc.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -220,7 +220,7 @@
 {
     PDC pdc;
 
-    pdc = GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE);
+    pdc = (PDC)GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE);
     if (pdc)
     {
         ASSERT((GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE)
||

Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -125,6 +125,7 @@
 #define ID_Win32PreServiceHook 'WSH0'
 #define ID_Win32PostServiceHook 'WSH1'
 
+#ifndef __cplusplus
 FORCEINLINE void
 GdiDbgAssertNoLocks(char * pszFile, ULONG nLine)
 {
@@ -139,6 +140,7 @@
         ASSERT(FALSE);
     }
 }
+#endif // __cplusplus
 #endif
 
 

Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/palette.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/palette.h	[iso-8859-1] Wed Mar 25 22:32:22 2015
@@ -1,4 +1,8 @@
 #pragma once
+
+#ifdef _MSC_VER
+#pragma warning(disable:4200) // zero-sized array in struct/union
+#endif // _MSC_VER
 
 // Palette mode flags
 enum _PALFLAGS