Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 22:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
Fix NtGdiExcludeClipRect. Should fix regressions from r64260.

svn path=/trunk/; revision=64359
This commit is contained in:
Timo Kreuzer 2014-09-27 22:59:13 +00:00
parent 36fed67fe3
commit 7ac429e063
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/win32ss/gdi/ntgdi/cliprgn.c
View file

@ -226,35 +226,28 @@ NtGdiExcludeClipRect(
iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip,
pdc->dclevel.prgnClip,
&rect);
/* Emulate Windows behavior */
if (iComplexity == SIMPLEREGION)
iComplexity = COMPLEXREGION;
}
else
{
/* Check if the rect intersects with the window rect */
if (RECTL_bIntersectRect(&rect, &rect, &pdc->erclWindow))
/* We don't have a clip region yet, create an empty region */
pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0);
if (pdc->dclevel.prgnClip == NULL)
{
/* It does. In this case create an empty region */
pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0);
iComplexity = NULLREGION;
iComplexity = ERROR;
}
else
{
/* Otherwise, emulate strange Windows behavior... */
pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 1, 1);
iComplexity = COMPLEXREGION;
}
/* Check if creating the region failed */
if (pdc->dclevel.prgnClip == NULL)
{
/* Return error code */
iComplexity = ERROR;
/* Subtract the rect from the VIS region */
iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip,
pdc->prgnVis,
&rect);
}
}
/* Emulate Windows behavior */
if (iComplexity == SIMPLEREGION)
iComplexity = COMPLEXREGION;
/* If we succeeded, mark the RAO region as dirty */
if (iComplexity != ERROR)
pdc->fs |= DC_FLAG_DIRTY_RAO;