From 0c9e6b6cacdd925b2414826cad7afe7a473636c5 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Mon, 31 Dec 2007 06:09:05 +0000
Subject: [PATCH] Merge DD structure info into gdi structures.

svn path=/trunk/; revision=31513
---
 reactos/include/reactos/win32k/ntgdihdl.h        | 9 +++++----
 reactos/subsystems/win32/win32k/include/gdiobj.h | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h
index 08755d4dfb9..568d10f4ec7 100644
--- a/reactos/include/reactos/win32k/ntgdihdl.h
+++ b/reactos/include/reactos/win32k/ntgdihdl.h
@@ -206,10 +206,11 @@ typedef struct _GDI_TABLE_ENTRY
     SHORT nCount;     /* usage count of object handles */
     union{            // temp union structure.
     LONG  Type;       /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */
-    SHORT nUpper:16;
-    CHAR  ObjectType:8;
-    CHAR  Flags:8;
-    };
+    struct{
+    SHORT FullUnique;
+    CHAR  ObjectType;
+    CHAR  Flags;
+    };};
     PVOID UserData;   /* Points to the user mode structure, usually NULL though */
 } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;
 
diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h
index 5f8a8199aa2..5c073ddc718 100644
--- a/reactos/subsystems/win32/win32k/include/gdiobj.h
+++ b/reactos/subsystems/win32/win32k/include/gdiobj.h
@@ -58,9 +58,9 @@ typedef struct _GDIOBJHDR
 typedef struct _GDIOBJEMPTYHDR
 {
   HGDIOBJ     hHmgr;
-  PVOID       pvEntry;
+  ULONG       Count;
   ULONG       lucExcLock;
-  ULONG       Tid;
+  PW32THREAD  Tid;
 } GDIOBJEMPTYHDR, *PGDIOBJEMPTYHDR;
 
 BOOL    INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle);