Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add member items for meta clipping region and bounding rectangle support.

Browse source 
svn path=/trunk/; revision=31696
This commit is contained in:
James Tabor 2008-01-10 07:21:02 +00:00
parent 8592433357
commit 340f80454a
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/include/reactos/win32k/ntgdihdl.h
View file

@ -339,15 +339,18 @@ typedef struct tagGdiPath
typedef struct _WIN_DC_INFO typedef struct _WIN_DC_INFO
{ {
int flags; int flags;
HRGN hClipRgn; /* Clip region (may be 0) */
HRGN hVisRgn; /* Visible region (must never be 0) */ HRGN hClipRgn; /* Clip region (may be 0) */
HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HRGN hrgnMeta; /* Meta region (may be 0) */
HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */
HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */
HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */
HBITMAP hBitmap; HBITMAP hBitmap;
HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */
/* #if 0 */ /* #if 0 */
HANDLE hDevice;
HPALETTE hPalette; HPALETTE hPalette;
GdiPath path; GdiPath path;
@ -381,12 +384,15 @@ typedef struct _DC
FLONG flGraphics; FLONG flGraphics;
FLONG flGraphics2; FLONG flGraphics2;
PDC_ATTR pDc_Attr; PDC_ATTR pDc_Attr;
WIN_DC_INFO w;
DC_ATTR Dc_Attr; DC_ATTR Dc_Attr;
HDC hNext; HDC hNext;
HDC hPrev; HDC hPrev;
RECTL erclClip;
RECTL erclWindow; RECTL erclWindow;
RECTL erclBounds; RECTL erclBounds;
HRGN hprgnAPI;
HRGN hprgnVis;
CLIPOBJ *CombinedClip; CLIPOBJ *CombinedClip;
XLATEOBJ *XlateBrush; XLATEOBJ *XlateBrush;
@ -398,7 +404,6 @@ typedef struct _DC
HPALETTE PalIndexed; HPALETTE PalIndexed;
UNICODE_STRING DriverName; UNICODE_STRING DriverName;
WIN_DC_INFO w;
HANDLE hFile; HANDLE hFile;
LPENHMETAHEADER emh; LPENHMETAHEADER emh;

7
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -1213,9 +1213,6 @@ IntGdiCopyToSaveState(PDC dc, PDC newdc)
nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; nDc_Attr->hlfntNew = Dc_Attr->hlfntNew;
newdc->w.hBitmap = dc->w.hBitmap; newdc->w.hBitmap = dc->w.hBitmap;
newdc->w.hFirstBitmap = dc->w.hFirstBitmap; newdc->w.hFirstBitmap = dc->w.hFirstBitmap;
#if 0
newdc->w.hDevice = dc->w.hDevice;
#endif
newdc->PalIndexed = dc->PalIndexed; newdc->PalIndexed = dc->PalIndexed;
newdc->w.hPalette = dc->w.hPalette; newdc->w.hPalette = dc->w.hPalette;
newdc->w.totalExtent = dc->w.totalExtent; newdc->w.totalExtent = dc->w.totalExtent;
@ -1287,10 +1284,6 @@ IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC)
dc->w.hFirstBitmap = dcs->w.hFirstBitmap; dc->w.hFirstBitmap = dcs->w.hFirstBitmap;
#if 0
dc->w.hDevice = dcs->w.hDevice;
#endif
Dc_Attr->dwLayout = sDc_Attr->dwLayout; Dc_Attr->dwLayout = sDc_Attr->dwLayout;
dc->w.totalExtent = dcs->w.totalExtent; dc->w.totalExtent = dcs->w.totalExtent;
Dc_Attr->jROP2 = sDc_Attr->jROP2; Dc_Attr->jROP2 = sDc_Attr->jROP2;