mirror of
https://github.com/reactos/reactos.git
synced 2024-08-08 12:18:13 +00:00
Removed w.flags from dc.h update all related.
svn path=/trunk/; revision=33656
This commit is contained in:
parent
f5aa4b5c0c
commit
540035b99a
|
@ -14,10 +14,6 @@
|
||||||
#define DCPATH_SAVE 0x0002
|
#define DCPATH_SAVE 0x0002
|
||||||
#define DCPATH_CLOCKWISE 0x0004
|
#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
|
// GDIDEVICE flags
|
||||||
#define PDEV_DISPLAY 0x00000001 // Display device
|
#define PDEV_DISPLAY 0x00000001 // Display device
|
||||||
#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor
|
#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor
|
||||||
|
@ -56,8 +52,6 @@ typedef struct tagGdiPath
|
||||||
|
|
||||||
typedef struct _WIN_DC_INFO
|
typedef struct _WIN_DC_INFO
|
||||||
{
|
{
|
||||||
int flags;
|
|
||||||
|
|
||||||
HRGN hClipRgn; /* Clip region (may be 0) */
|
HRGN hClipRgn; /* Clip region (may be 0) */
|
||||||
HRGN hrgnMeta; /* Meta region (may be 0) */
|
HRGN hrgnMeta; /* Meta region (may be 0) */
|
||||||
HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */
|
HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */
|
||||||
|
|
|
@ -76,7 +76,7 @@ IntGdiSelectVisRgn(HDC hdc, HRGN hrgn)
|
||||||
return ERROR;
|
return ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
dc->w.flags &= ~DC_DIRTY;
|
dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
|
||||||
|
|
||||||
if (dc->w.hVisRgn == NULL)
|
if (dc->w.hVisRgn == NULL)
|
||||||
{
|
{
|
||||||
|
@ -101,7 +101,7 @@ int STDCALL IntGdiExtSelectClipRgn(PDC dc,
|
||||||
int fnMode)
|
int fnMode)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
// dc->w.flags &= ~DC_DIRTY;
|
// dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
|
||||||
|
|
||||||
if (!hrgn)
|
if (!hrgn)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1019,7 +1019,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Free GDI resources allocated to this DC */
|
/* Free GDI resources allocated to this DC */
|
||||||
if (!(DCToDelete->w.flags & DC_SAVED))
|
if (!(DCToDelete->DcLevel.flPath & DCPATH_SAVE))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
NtGdiSelectPen (DCHandle, STOCK_BLACK_PEN);
|
NtGdiSelectPen (DCHandle, STOCK_BLACK_PEN);
|
||||||
|
@ -1332,7 +1332,7 @@ IntGdiCopyToSaveState(PDC dc, PDC newdc)
|
||||||
nDc_Attr = newdc->pDc_Attr;
|
nDc_Attr = newdc->pDc_Attr;
|
||||||
if(!nDc_Attr) nDc_Attr = &newdc->Dc_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->dwLayout = Dc_Attr->dwLayout;
|
||||||
nDc_Attr->hpen = Dc_Attr->hpen;
|
nDc_Attr->hpen = Dc_Attr->hpen;
|
||||||
nDc_Attr->hbrush = Dc_Attr->hbrush;
|
nDc_Attr->hbrush = Dc_Attr->hbrush;
|
||||||
|
@ -1405,7 +1405,7 @@ IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC)
|
||||||
sDc_Attr = dcs->pDc_Attr;
|
sDc_Attr = dcs->pDc_Attr;
|
||||||
if(!sDc_Attr) sDc_Attr = &dcs->Dc_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;
|
dc->w.hFirstBitmap = dcs->w.hFirstBitmap;
|
||||||
|
|
||||||
|
@ -1539,7 +1539,7 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
|
||||||
dcs = DC_LockDc ( hDCSave );
|
dcs = DC_LockDc ( hDCSave );
|
||||||
if ( dcs )
|
if ( dcs )
|
||||||
{
|
{
|
||||||
if ( dcs->w.flags & DC_SAVED )
|
if ( dcs->DcLevel.flPath & DCPATH_SAVE )
|
||||||
{
|
{
|
||||||
IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave);
|
IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave);
|
||||||
}
|
}
|
||||||
|
@ -2156,7 +2156,7 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags)
|
||||||
return 0;
|
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.
|
/* "Undocumented Windows" info is slightly confusing.
|
||||||
*/
|
*/
|
||||||
|
@ -2164,12 +2164,12 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags)
|
||||||
DPRINT("DC %p, Flags %04x\n", hDC, Flags);
|
DPRINT("DC %p, Flags %04x\n", hDC, Flags);
|
||||||
|
|
||||||
if (Flags & DCHF_INVALIDATEVISRGN)
|
if (Flags & DCHF_INVALIDATEVISRGN)
|
||||||
{
|
{ /* hVisRgn has to be updated */
|
||||||
dc->w.flags |= DC_DIRTY;
|
dc->DC_Flags |= DC_FLAG_DIRTY_RAO;
|
||||||
}
|
}
|
||||||
else if (Flags & DCHF_VALIDATEVISRGN || 0 == Flags)
|
else if (Flags & DCHF_VALIDATEVISRGN || 0 == Flags)
|
||||||
{
|
{
|
||||||
dc->w.flags &= ~DC_DIRTY;
|
dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
|
||||||
}
|
}
|
||||||
|
|
||||||
DC_UnlockDc(dc);
|
DC_UnlockDc(dc);
|
||||||
|
|
Loading…
Reference in a new issue