Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Simplify updating prgnVis in NtGdiSelectBitmap

svn path=/trunk/; revision=65911
This commit is contained in:
Timo Kreuzer 2014-12-30 19:38:37 +00:00
parent 3c30e5af66
commit 56aa42fe6e
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/win32ss/gdi/ntgdi/dcobjs.c
View file

@ -230,6 +230,7 @@ GdiSelectPalette(
return NULL;
}
/// FIXME: we shouldn't dereference pSurface when the PDEV is not locked
/* Is this a valid palette for this depth? */
if ((!pdc->dclevel.pSurface) ||
(BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8
@ -356,7 +357,6 @@ NtGdiSelectBitmap(
PDC pdc;
HBITMAP hbmpOld;
PSURFACE psurfNew, psurfOld;
PREGION VisRgn;
HDC hdcOld;
ASSERT_NOGDILOCKS();
@ -419,7 +419,7 @@ NtGdiSelectBitmap(
return NULL;
}
/* Check if the bitmap is compatile with the dc */
/* Check if the bitmap is compatible with the dc */
if (!DC_bIsBitmapCompatible(pdc, psurfNew))
{
/* Dereference the bitmap, unlock the DC and fail. */
@ -470,20 +470,15 @@ NtGdiSelectBitmap(
SURFACE_ShareUnlockSurface(psurfOld);
}
/* Mark the dc brushes invalid */
/* Mark the DC brushes invalid */
pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE;
/* FIXME: Improve by using a region without a handle and selecting it */
VisRgn = IntSysCreateRectpRgn( 0,
0,
pdc->dclevel.sizl.cx,
pdc->dclevel.sizl.cy);
if (VisRgn)
{
GdiSelectVisRgn(hdc, VisRgn);
REGION_Delete(VisRgn);
}
/* Update the system region */
REGION_SetRectRgn(pdc->prgnVis,
0,
0,
pdc->dclevel.sizl.cx,
pdc->dclevel.sizl.cy);
/* Unlock the DC */
DC_UnlockDc(pdc);