Merge DD structure info into gdi structures.

svn path=/trunk/; revision=31513

diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h
index 08755d4..568d10f 100644 (file)
--- 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 */\r
     union{            // temp union structure.\r
     LONG  Type;       /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */\r
-    SHORT nUpper:16;\r
-    CHAR  ObjectType:8;\r
-    CHAR  Flags:8;\r
-    };\r
+    struct{\r
+    SHORT FullUnique;\r
+    CHAR  ObjectType;\r
+    CHAR  Flags;\r
+    };};\r
     PVOID UserData;   /* Points to the user mode structure, usually NULL though */\r
 } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;\r
 \r

diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h
index 5f8a819..5c073dd 100644 (file)
--- 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);