[WIN32SS] Use the DCFLAGS and DCTYPE flags defined in ntgdi/dc.h instead of the old ones in include/ntgdihdl.h

The names of these new flags match the documented ones at
https://reactos.org/wiki/Techwiki:Win32k/DC
https://books.google.hr/books?id=-O92IIF1Bj4C&pg=PA197&lpg=PA197
and the gdikdx debug extension.
This commit is contained in:
Hermès Bélusca-Maïto 2020-01-10 01:44:09 +01:00
parent 1c2b757a64
commit 5e93daa9ce
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
14 changed files with 54 additions and 76 deletions

View file

@ -17,7 +17,7 @@ IntGdiReleaseRaoRgn(PDC pDC)
{
INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr);
PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
pDC->fs |= DC_FLAG_DIRTY_RAO;
pDC->fs |= DC_DIRTY_RAO;
Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; // Need to validate Vis.
}
@ -75,7 +75,7 @@ GdiSelectVisRgn(
return;
}
dc->fs |= DC_FLAG_DIRTY_RAO;
dc->fs |= DC_DIRTY_RAO;
ASSERT(dc->prgnVis != NULL);
ASSERT(prgn != NULL);
@ -234,7 +234,7 @@ IntGdiExtSelectClipRect(
{
Ret = IntSelectClipRgn( dc, NULL, RGN_COPY);
if (dc->fs & DC_FLAG_DIRTY_RAO)
if (dc->fs & DC_DIRTY_RAO)
CLIPPING_UpdateGCRegion(dc);
if (Ret) // Copy? Return Vis complexity.
@ -260,7 +260,7 @@ IntGdiExtSelectClipRect(
Ret = IntSelectClipRgn( dc, prgn, fnMode);
if (dc->fs & DC_FLAG_DIRTY_RAO)
if (dc->fs & DC_DIRTY_RAO)
CLIPPING_UpdateGCRegion(dc);
if (Ret) // In this case NtGdiExtSelectClipRgn tests pass.
@ -295,7 +295,7 @@ IntGdiExtSelectClipRgn(
{
DPRINT("IntGdiExtSelectClipRgn A %d\n",Ret);
// Update the Rao, it must be this way for now.
if (dc->fs & DC_FLAG_DIRTY_RAO)
if (dc->fs & DC_DIRTY_RAO)
CLIPPING_UpdateGCRegion(dc);
Ret = REGION_Complexity( dc->prgnRao ? dc->prgnRao : dc->prgnVis );
@ -376,7 +376,7 @@ GdiGetClipBox(
}
/* Update RAO region if necessary */
if (pdc->fs & DC_FLAG_DIRTY_RAO)
if (pdc->fs & DC_DIRTY_RAO)
CLIPPING_UpdateGCRegion(pdc);
/* Check if we have a RAO region (intersection of API and VIS region) */
@ -577,7 +577,7 @@ NtGdiOffsetClipRgn(
}
/* Mark the RAO region as dirty */
pdc->fs |= DC_FLAG_DIRTY_RAO;
pdc->fs |= DC_DIRTY_RAO;
}
else
{
@ -656,7 +656,7 @@ NtGdiRectVisible(
return FALSE;
}
if (dc->fs & DC_FLAG_DIRTY_RAO)
if (dc->fs & DC_DIRTY_RAO)
CLIPPING_UpdateGCRegion(dc);
prgn = dc->prgnRao ? dc->prgnRao : dc->prgnVis;
@ -765,7 +765,7 @@ CLIPPING_UpdateGCRegion(PDC pDC)
REGION_bOffsetRgn(pDC->prgnVis, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y);
pDC->fs &= ~DC_FLAG_DIRTY_RAO;
pDC->fs &= ~DC_DIRTY_RAO;
UpdateVisRgn(pDC);
return;
}
@ -823,7 +823,7 @@ CLIPPING_UpdateGCRegion(PDC pDC)
&pDC->prgnRao->rdh.rcBound,
sizeof(RECTL));
pDC->fs &= ~DC_FLAG_DIRTY_RAO;
pDC->fs &= ~DC_DIRTY_RAO;
UpdateVisRgn(pDC);
// pDC->co should be used. Example, CLIPOBJ_cEnumStart uses XCLIPOBJ to build