From f08fcecb8240ccb80102a41872bf58880f47fbc3 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Wed, 5 Nov 2008 00:38:52 +0000 Subject: [PATCH] - Add and update Gdi entry flags. svn path=/trunk/; revision=37195 --- reactos/include/reactos/win32k/ntgdihdl.h | 4 +++- reactos/subsystems/win32/win32k/objects/region.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h index 65362c21918..4e6005cff43 100644 --- a/reactos/include/reactos/win32k/ntgdihdl.h +++ b/reactos/include/reactos/win32k/ntgdihdl.h @@ -42,7 +42,9 @@ #define GDI_ENTRY_UPPER_SHIFT 16 /* GDI Entry Flags */ -#define GDI_ENTRY_FLAG_NEED_UPDATE 4 +#define GDI_ENTRY_UNDELETABLE 1 +#define GDI_ENTRY_DELETING 2 +#define GDI_ENTRY_VALIDATE_VIS 4 /*! \defgroup GDI object types * diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c index a890bc999c6..43ffefc54c4 100644 --- a/reactos/subsystems/win32/win32k/objects/region.c +++ b/reactos/subsystems/win32/win32k/objects/region.c @@ -2092,7 +2092,7 @@ IntGdiReleaseRaoRgn(PDC pDC) INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); } @@ -2103,7 +2103,7 @@ IntGdiReleaseVisRgn(PDC pDC) INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); REGION_Delete(pDC->prgnVis); pDC->prgnVis = prgnDefault; @@ -2117,7 +2117,7 @@ IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) PDC_ATTR pDc_Attr; RECTL rcl; - if (Entry->Flags & GDI_ENTRY_FLAG_NEED_UPDATE) + if (Entry->Flags & GDI_ENTRY_VALIDATE_VIS) { pDc_Attr = pDC->pDc_Attr; if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; @@ -2141,7 +2141,7 @@ IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) pDc_Attr->VisRectRegion.Rect = rcl; - Entry->Flags &= ~GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags &= ~GDI_ENTRY_VALIDATE_VIS; } }