[ros-diffs] [jimtabor] 31513: Merge DD structure info into gdi structures.

Author: jimtabor
Date: Mon Dec 31 09:09:05 2007
New Revision: 31513

URL: http://svn.reactos.org/svn/reactos?rev=31513&view=rev
Log:
Merge DD structure info into gdi structures.

Modified:
    trunk/reactos/include/reactos/win32k/ntgdihdl.h
    trunk/reactos/subsystems/win32/win32k/include/gdiobj.h

Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Dec 31 09:09:05 2007
@@ -206,10 +206,11 @@
     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;
 

Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original)
+++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Mon Dec 31 09:09:05 2007
@@ -58,9 +58,9 @@
 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);