[WIN32K]

Make internal GDI headers C++ compatible, get rid of USER dependencies

svn path=/trunk/; revision=66889

reactos/win32ss/gdi/eng/driverobj.h

@@ -22,5 +22,5 @@ FORCEINLINE
 PEDRIVEROBJ
 DRIVEROBJ_TryLockObject(HDRVOBJ hdo)
 {
-    return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE);
+    return (PEDRIVEROBJ)GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE);
 }

reactos/win32ss/gdi/eng/eng.h

@@ -32,8 +32,8 @@ IntEngMaskBlt(
 VOID
 FASTCALL
 IntEngWindowChanged(
-    _In_    PWND Window,
-    _In_    FLONG flChanged);
+    _In_ struct _WND *Window,
+    _In_ FLONG flChanged);
 
 ULONGLONG
 APIENTRY

reactos/win32ss/gdi/eng/engobjects.h

@@ -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. */

reactos/win32ss/gdi/eng/mapping.h

@@ -16,9 +16,14 @@ typedef struct _FILEVIEW
     PVOID          pSection;
 } FILEVIEW, *PFILEVIEW;
 
+#ifdef __cplusplus
+typedef struct _FONTFILEVIEW : FILEVIEW
+{
+#else
 typedef struct _FONTFILEVIEW
 {
     FILEVIEW;
+#endif
     DWORD          reserved[2];
     PWSTR          pwszPath;
     SIZE_T         ulRegionSize;

reactos/win32ss/gdi/ntgdi/dc.h

@@ -220,7 +220,7 @@ DC_LockDc(HDC hdc)
 {
     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) ||

reactos/win32ss/gdi/ntgdi/gdidebug.h

@@ -125,6 +125,7 @@ GdiDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult);
 #define ID_Win32PreServiceHook 'WSH0'
 #define ID_Win32PostServiceHook 'WSH1'
 
+#ifndef __cplusplus
 FORCEINLINE void
 GdiDbgAssertNoLocks(char * pszFile, ULONG nLine)
 {
@@ -139,6 +140,7 @@ GdiDbgAssertNoLocks(char * pszFile, ULONG nLine)
         ASSERT(FALSE);
     }
 }
+#endif // __cplusplus
 #endif
 
 

reactos/win32ss/gdi/ntgdi/palette.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#ifdef _MSC_VER
+#pragma warning(disable:4200) // zero-sized array in struct/union
+#endif // _MSC_VER
+
 // Palette mode flags
 enum _PALFLAGS
 {