Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed w.flags from dc.h update all related.

Browse source 
svn path=/trunk/; revision=33656
This commit is contained in:
James Tabor 2008-05-23 01:46:55 +00:00
parent f5aa4b5c0c
commit 540035b99a
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -14,10 +14,6 @@
#define DCPATH_SAVE 0x0002
#define DCPATH_CLOCKWISE 0x0004
/* DC flags */
#define DC_SAVED 0x0002 /* It is a saved DC */
#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */
// GDIDEVICE flags
#define PDEV_DISPLAY 0x00000001 // Display device
#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor
@ -56,8 +52,6 @@ typedef struct tagGdiPath
typedef struct _WIN_DC_INFO
{
int flags;
HRGN hClipRgn; /* Clip region (may be 0) */
HRGN hrgnMeta; /* Meta region (may be 0) */
HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */

6
reactos/subsystems/win32/win32k/objects/cliprgn.c
View file

@ -76,8 +76,8 @@ IntGdiSelectVisRgn(HDC hdc, HRGN hrgn)
return ERROR;
}
dc->w.flags &= ~DC_DIRTY;
dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
if (dc->w.hVisRgn == NULL)
{
dc->w.hVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
@ -101,7 +101,7 @@ int STDCALL IntGdiExtSelectClipRgn(PDC dc,
int fnMode)
{
int retval;
// dc->w.flags &= ~DC_DIRTY;
// dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
if (!hrgn)
{

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

@ -1019,7 +1019,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
}
/* Free GDI resources allocated to this DC */
if (!(DCToDelete->w.flags & DC_SAVED))
if (!(DCToDelete->DcLevel.flPath & DCPATH_SAVE))
{
/*
NtGdiSelectPen (DCHandle, STOCK_BLACK_PEN);
@ -1332,7 +1332,7 @@ IntGdiCopyToSaveState(PDC dc, PDC newdc)
nDc_Attr = newdc->pDc_Attr;
if(!nDc_Attr) nDc_Attr = &newdc->Dc_Attr;
newdc->w.flags = dc->w.flags | DC_SAVED;
newdc->DcLevel.flPath = dc->DcLevel.flPath | DCPATH_SAVE;
nDc_Attr->dwLayout = Dc_Attr->dwLayout;
nDc_Attr->hpen = Dc_Attr->hpen;
nDc_Attr->hbrush = Dc_Attr->hbrush;
@ -1405,7 +1405,7 @@ IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC)
sDc_Attr = dcs->pDc_Attr;
if(!sDc_Attr) sDc_Attr = &dcs->Dc_Attr;
dc->w.flags = dcs->w.flags & ~DC_SAVED;
dc->DcLevel.flPath = dcs->DcLevel.flPath & ~DCPATH_SAVE;
dc->w.hFirstBitmap = dcs->w.hFirstBitmap;
@ -1539,7 +1539,7 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
dcs = DC_LockDc ( hDCSave );
if ( dcs )
{
if ( dcs->w.flags & DC_SAVED )
if ( dcs->DcLevel.flPath & DCPATH_SAVE )
{
IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave);
}
@ -2156,7 +2156,7 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags)
return 0;
}
wRet = dc->w.flags & DC_DIRTY;
wRet = dc->DC_Flags & DC_FLAG_DIRTY_RAO; // Fixme wrong flag!
/* "Undocumented Windows" info is slightly confusing.
*/
@ -2164,12 +2164,12 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags)
DPRINT("DC %p, Flags %04x\n", hDC, Flags);
if (Flags & DCHF_INVALIDATEVISRGN)
{
dc->w.flags |= DC_DIRTY;
{ /* hVisRgn has to be updated */
dc->DC_Flags |= DC_FLAG_DIRTY_RAO;
}
else if (Flags & DCHF_VALIDATEVISRGN || 0 == Flags)
{
dc->w.flags &= ~DC_DIRTY;
dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
}
DC_UnlockDc(dc);