[ros-diffs] [tkreuzer] 40504: Make the SURFACE structure more like the one from Windows

Author: tkreuzer
Date: Tue Apr 14 20:41:48 2009
New Revision: 40504

URL: http://svn.reactos.org/svn/reactos?rev=40504&view=rev
Log:
Make the SURFACE structure more like the one from Windows

Modified:
    trunk/reactos/subsystems/win32/win32k/include/surface.h

Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Tue Apr 14 20:41:48 2009
@@ -12,20 +12,33 @@
   SURFOBJ     SurfObj;
   FLONG	      flHooks;
   FLONG       flFlags;
-  SIZE        dimension;    /* For SetBitmapDimension(), do NOT use
+  struct _PALETTE  *ppal;
+
+  union
+  {
+    HANDLE    hSecureUMPD;  // if UMPD_SURFACE set
+    HANDLE    hMirrorParent;// if MIRROR_SURFACE set
+    HANDLE    hDDSurface;   // if DIRECTDRAW_SURFACE set
+  };
+
+  SIZEL       dimension;    /* For SetBitmapDimension(), do NOT use
                                to get width/height of bitmap, use
                                bitmap.bmWidth/bitmap.bmHeight for
                                that */
-  PFAST_MUTEX BitsLock;     /* You need to hold this lock before you touch
-                               the actual bits in the bitmap */
+  
+  HDC         hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP.
+  ULONG       cRef;         // 0x064
+  HPALETTE    hpalHint;

/* For device-independent bitmaps: */
   HANDLE      hDIBSection;
   HANDLE      hSecure;
   DWORD       dwOffset;

+  /* reactos specific */
+  PFAST_MUTEX BitsLock;     /* You need to hold this lock before you touch
+                               the actual bits in the bitmap */
   HPALETTE hDIBPalette;
-  HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP.
   DWORD dsBitfields[3]; // hack, should probably use palette instead
   DWORD biClrUsed;
   DWORD biClrImportant;