From 4bc394cbbfec1242dabf0b66d69ba964677d5b0e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 14 Apr 2009 16:41:48 +0000 Subject: [PATCH] Make the SURFACE structure more like the one from Windows svn path=/trunk/; revision=40504 --- .../subsystems/win32/win32k/include/surface.h | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/reactos/subsystems/win32/win32k/include/surface.h b/reactos/subsystems/win32/win32k/include/surface.h index 8c0ded668aa..f9a407aec1c 100644 --- a/reactos/subsystems/win32/win32k/include/surface.h +++ b/reactos/subsystems/win32/win32k/include/surface.h @@ -12,20 +12,33 @@ typedef struct _SURFACE 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;