[ros-diffs] [sginsberg] 37689: - DXAPI: Fix incompatible header inclusion - DXG: Change the way PDC is defined -- treat the DC structure as opaque instead of including internal win32k headers. Also rework the way DD_BASEOBJECT is defined.

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Thu Nov 27 09:34:33 2008
New Revision: 37689

URL: http://svn.reactos.org/svn/reactos?rev=37689&view=rev
Log:
- DXAPI: Fix incompatible header inclusion
- DXG: Change the way PDC is defined -- treat the DC structure as opaque instead of including internal win32k headers. Also rework the way DD_BASEOBJECT is defined.

Modified:
    trunk/reactos/drivers/directx/dxapi/dxapi_driver.h
    trunk/reactos/drivers/directx/dxg/dxg_int.h
    trunk/reactos/include/reactos/drivers/directx/directxint.h

Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxapi_driver.h?rev=37689&r1=37688&r2=37689&view=diff
==============================================================================
--- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Thu Nov 27 09:34:33 2008
@@ -1,7 +1,4 @@
 
-
-
-/* DDK/NDK/SDK Headers */
 /* DDK/NDK/SDK Headers */
 #include <ddk/ntddk.h>
 #include <ddk/ntddmou.h>
@@ -14,10 +11,9 @@
 #include <winerror.h>
 #include <wingdi.h>
 #include <winddi.h>
-#include <winuser.h>
 #include <prntfont.h>
 #include <dde.h>
-#include <wincon.h>
+
 
 #include <ddk/ddkmapi.h>
 

Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_int.h?rev=37689&r1=37688&r2=37689&view=diff
==============================================================================
--- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Thu Nov 27 09:34:33 2008
@@ -17,22 +17,23 @@
 #include <winerror.h>
 #include <wingdi.h>
 #include <winddi.h>
-#include <winuser.h>
 #include <prntfont.h>
 #include <dde.h>
-#include <wincon.h>
 
-/* Public Win32K Headers */
-#include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
-#include <win32k/ntgdityp.h>
-#include <win32k/ntgdihdl.h>
-#include <win32.h>
-#include <gdiobj.h>
-#include <dc.h>
+/* DXG treats this as opaque */
+typedef PVOID PDC;
+typedef PVOID PW32THREAD;
+
+typedef struct _DD_BASEOBJECT
+{
+  HGDIOBJ     hHmgr;
+  ULONG       ulShareCount;
+  USHORT      cExclusiveLock;
+  USHORT      BaseFlags;
+  PW32THREAD  Tid;
+} DD_BASEOBJECT, *PDD_BASEOBJECT;
 
 #include <drivers/directx/directxint.h>
-
 #include <drivers/directx/dxg.h>
 #include <drivers/directx/dxeng.h>
 

Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/directx/directxint.h?rev=37689&r1=37688&r2=37689&view=diff
==============================================================================
--- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu Nov 27 09:34:33 2008
@@ -2,8 +2,10 @@
 #ifndef _DXINTERNEL_
 #define _DXINTERNEL_
 
+#ifdef __W32K_H
 #define PDD_BASEOBJECT POBJ
 #define DD_BASEOBJECT BASEOBJECT
+#endif
 
 /* _EDD_DIRECTDRAW_LOCAL is 0x54 bytes long on Windows XP */
 typedef struct _EDD_DIRECTDRAW_LOCAL