From 643de8b21b9e9322b3eb64b22a6555bb5f07a41b Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sun, 11 Nov 2007 05:17:16 +0000
Subject: [PATCH] We need a dpdev support for DX. All should go into ntgdidx.h.

svn path=/trunk/; revision=30350
---
 reactos/include/reactos/win32k/ntgdihdl.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h
index a5853d913b9..419c48f6f5a 100644
--- a/reactos/include/reactos/win32k/ntgdihdl.h
+++ b/reactos/include/reactos/win32k/ntgdihdl.h
@@ -500,9 +500,6 @@ typedef struct _DC
   INT         DC_Flags;
   PDC_ATTR    pDc_Attr;
   DC_ATTR     Dc_Attr;
-
-  struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl;
-
   HDC         hSelf;  // Used only for MemoryDC & SaveDC.
   HDC         hNext;
   HSURF       FillPatternSurfaces[HS_DDI_MAX];
@@ -510,7 +507,6 @@ typedef struct _DC
   PDEVINFO    DevInfo;
   HDEV        GDIDevice;
 
-  DRIVER_FUNCTIONS  DriverFunctions;
   UNICODE_STRING    DriverName;
   HANDLE      DeviceDriver;
 
@@ -528,6 +524,13 @@ typedef struct _DC
 
   HANDLE      hFile;
   LPENHMETAHEADER emh;
+  // This belongs in DHPDEV not in DC. 8^(
+  // So I'm putting it down here with the rest of misfits.
+  // DRIVER_FUNCTIONS does not belong in DC. It should go PVOID in dpdev.
+  DRIVER_FUNCTIONS  DriverFunctions;
+  struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl;
+  //
+
 } DC, *PDC;
 
 #endif