From 68722d64828a4dc9540108a9badae7e6345c3976 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Fri, 30 Nov 2007 11:46:48 +0000
Subject: [PATCH] revert r28932 - this may be needed for thread safety - but it
 isn't firefox safe

svn path=/trunk/; revision=30916
---
 reactos/subsystems/win32/win32k/include/bitmaps.h |  5 -----
 reactos/subsystems/win32/win32k/include/brush.h   |  5 -----
 reactos/subsystems/win32/win32k/include/gdiobj.h  | 13 -------------
 reactos/subsystems/win32/win32k/include/palette.h |  5 -----
 reactos/subsystems/win32/win32k/include/region.h  |  5 -----
 reactos/subsystems/win32/win32k/include/text.h    |  5 -----
 6 files changed, 38 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/include/bitmaps.h b/reactos/subsystems/win32/win32k/include/bitmaps.h
index a3185b6761c..e8e78b4a74d 100644
--- a/reactos/subsystems/win32/win32k/include/bitmaps.h
+++ b/reactos/subsystems/win32/win32k/include/bitmaps.h
@@ -5,11 +5,6 @@
 /* GDI logical bitmap object */
 typedef struct _BITMAPOBJ
 {
-//  HGDIOBJ     hHmgr;
-//  PVOID       pvEntry;
-//  ULONG       lucExcLock;
-//  ULONG       Tid;
-
   SURFOBJ     SurfObj;
   FLONG	      flHooks;
   FLONG       flFlags;
diff --git a/reactos/subsystems/win32/win32k/include/brush.h b/reactos/subsystems/win32/win32k/include/brush.h
index 015c614ebb3..8189307265c 100644
--- a/reactos/subsystems/win32/win32k/include/brush.h
+++ b/reactos/subsystems/win32/win32k/include/brush.h
@@ -23,11 +23,6 @@ typedef struct
 
 typedef struct
 {
-   HGDIOBJ     hHmgr;
-   PVOID       pvEntry;
-   ULONG       lucExcLock;
-   ULONG       Tid;
-
    ULONG ulStyle;
    HBITMAP hbmPattern;
    HANDLE hbmClient;
diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h
index 7d23e4d8e61..4fa067855da 100644
--- a/reactos/subsystems/win32/win32k/include/gdiobj.h
+++ b/reactos/subsystems/win32/win32k/include/gdiobj.h
@@ -43,19 +43,6 @@ typedef struct _GDIOBJHDR
 #endif
 } GDIOBJHDR, *PGDIOBJHDR;
 
-//
-// Every GDI Object must have this standard type of header.
-// It's for thread locking.
-// This header is standalone, used only in gdiobj.c.
-//
-typedef struct _GDIOBJEMPTYHDR
-{
-  HGDIOBJ     hHmgr;
-  PVOID       pvEntry;
-  ULONG       lucExcLock;
-  ULONG       Tid;
-} GDIOBJEMPTYHDR, *PGDIOBJEMPTYHDR;
-
 BOOL    INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle);
 void    INTERNAL_CALL GDIOBJ_SetOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle, PEPROCESS Owner);
 void    INTERNAL_CALL GDIOBJ_CopyOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ CopyFrom, HGDIOBJ CopyTo);
diff --git a/reactos/subsystems/win32/win32k/include/palette.h b/reactos/subsystems/win32/win32k/include/palette.h
index 9ccdc2d9c24..8430d648961 100644
--- a/reactos/subsystems/win32/win32k/include/palette.h
+++ b/reactos/subsystems/win32/win32k/include/palette.h
@@ -16,11 +16,6 @@ typedef struct {
 } ColorShifts;
 
 typedef struct _PALGDI {
-  HGDIOBJ     hHmgr;
-  PVOID       pvEntry;
-  ULONG       lucExcLock;
-  ULONG       Tid;
-
   PALOBJ PalObj;
   XLATEOBJ *logicalToSystem;
   HPALETTE Self;
diff --git a/reactos/subsystems/win32/win32k/include/region.h b/reactos/subsystems/win32/win32k/include/region.h
index 0386d3be618..09694e3a11c 100644
--- a/reactos/subsystems/win32/win32k/include/region.h
+++ b/reactos/subsystems/win32/win32k/include/region.h
@@ -6,11 +6,6 @@
 
 /* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */
 typedef struct _ROSRGNDATA {
-  HGDIOBJ     hHmgr;
-  PVOID       pvEntry;
-  ULONG       lucExcLock;
-  ULONG       Tid;
-
   RGNDATAHEADER rdh;
   PRECT         Buffer;
 } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA;
diff --git a/reactos/subsystems/win32/win32k/include/text.h b/reactos/subsystems/win32/win32k/include/text.h
index c8c8a49be19..a3f1e150101 100644
--- a/reactos/subsystems/win32/win32k/include/text.h
+++ b/reactos/subsystems/win32/win32k/include/text.h
@@ -6,11 +6,6 @@
 /* GDI logical font object */
 typedef struct
 {
-   HGDIOBJ     hHmgr;
-   PVOID       pvEntry;
-   ULONG       lucExcLock;
-   ULONG       Tid;
-
    ENUMLOGFONTEXDVW logfont;  //LOGFONTW   logfont;
    FONTOBJ    *Font;
    BOOLEAN Initialized; /* Don't reinitialize for each DC */