[tkreuzer] 64249: [WIN32K] - Modify REGION_CropAndOffsetRegion to return the region complexity - Improve NtGdiIntersectClipRect to only allocate a new region, if we don't have one yet, otherwise cr...
23 Sep
2014
23 Sep
'14
8:21 p.m.
Author: tkreuzer
Date: Tue Sep 23 20:21:13 2014
New Revision: 64249
URL: http://svn.reactos.org/svn/reactos?rev=64249&view=rev
Log:
[WIN32K]
- Modify REGION_CropAndOffsetRegion to return the region complexity
- Improve NtGdiIntersectClipRect to only allocate a new region, if we don't have one
yet, otherwise crop it using REGION_CropAndOffsetRegion
Modified:
trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c
trunk/reactos/win32ss/gdi/ntgdi/region.c
trunk/reactos/win32ss/gdi/ntgdi/region.h
Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Tue Sep 23 20:21:13 2014
@@ -241,54 +241,71 @@
return Result;
}
-int APIENTRY NtGdiIntersectClipRect(HDC hDC,
- int LeftRect,
- int TopRect,
- int RightRect,
- int BottomRect)
-{
- INT Result;
- RECTL Rect;
- PREGION pNewRgn;
- PDC dc = DC_LockDc(hDC);
+INT
+APIENTRY
+NtGdiIntersectClipRect(
+ _In_ HDC hdc,
+ _In_ INT xLeft,
+ _In_ INT yTop,
+ _In_ INT xRight,
+ _In_ INT yBottom)
+{
+ INT iComplexity;
+ RECTL rect;
+ PREGION prgnNew;
+ PDC pdc;
DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n",
- hDC, LeftRect, TopRect, RightRect, BottomRect);
-
- if (!dc)
+ hdc, xLeft, yTop, xRight, yBottom);
+
+ /* Lock the DC */
+ pdc = DC_LockDc(hdc);
+ if (!pdc)
{
EngSetLastError(ERROR_INVALID_HANDLE);
return ERROR;
}
- Rect.left = LeftRect;
- Rect.top = TopRect;
- Rect.right = RightRect;
- Rect.bottom = BottomRect;
-
- IntLPtoDP(dc, (LPPOINT)&Rect, 2);
-
- pNewRgn = IntSysCreateRectpRgnIndirect(&Rect);
- if (!pNewRgn)
- {
- Result = ERROR;
- }
- else if (!dc->dclevel.prgnClip)
- {
- dc->dclevel.prgnClip = pNewRgn;
- Result = SIMPLEREGION;
- }
- else
- {
- Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip,
pNewRgn, RGN_AND);
- REGION_Delete(pNewRgn);
- }
- if (Result != ERROR)
- dc->fs |= DC_FLAG_DIRTY_RAO;
-
- DC_UnlockDc(dc);
-
- return Result;
+ /* Convert coordinates to device space */
+ rect.left = xLeft;
+ rect.top = yTop;
+ rect.right = xRight;
+ rect.bottom = yBottom;
+ IntLPtoDP(pdc, (LPPOINT)&rect, 2);
+
+ /* Check if we already have a clip region */
+ if (pdc->dclevel.prgnClip != NULL)
+ {
+ /* We have a region, crop it */
+ iComplexity = REGION_CropAndOffsetRegion(pdc->dclevel.prgnClip,
+ pdc->dclevel.prgnClip,
+ &rect,
+ NULL);
+ }
+ else
+ {
+ /* We don't have a region yet, allocate a new one */
+ prgnNew = IntSysCreateRectpRgnIndirect(&rect);
+ if (prgnNew == NULL)
+ {
+ iComplexity = ERROR;
+ }
+ else
+ {
+ /* Set the new region */
+ pdc->dclevel.prgnClip = prgnNew;
+ iComplexity = SIMPLEREGION;
+ }
+ }
+
+ /* If we succeeded, mark the RAO region as dirty */
+ if (iComplexity != ERROR)
+ pdc->fs |= DC_FLAG_DIRTY_RAO;
+
+ /* Unlock the DC */
+ DC_UnlockDc(pdc);
+
+ return iComplexity;
}
int APIENTRY NtGdiOffsetClipRgn(HDC hDC,
Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Tue Sep 23 20:21:13 2014
@@ -489,12 +489,12 @@
INT
FASTCALL
-REGION_Complexity( PROSRGNDATA obj )
-{
- if (!obj) return NULLREGION;
- switch(obj->rdh.nCount)
- {
- DPRINT("Region Complexity -> %lu",obj->rdh.nCount);
+REGION_Complexity(PREGION prgn)
+{
+ if (!prgn) return NULLREGION;
+ switch(prgn->rdh.nCount)
+ {
+ DPRINT("Region Complexity -> %lu", prgn->rdh.nCount);
case 0: return NULLREGION;
case 1: return SIMPLEREGION;
default: return COMPLEXREGION;
@@ -581,13 +581,13 @@
/***********************************************************************
* REGION_CropAndOffsetRegion
*/
-BOOL FASTCALL
+INT
+FASTCALL
REGION_CropAndOffsetRegion(
- PROSRGNDATA rgnDst,
- PROSRGNDATA rgnSrc,
+ PREGION rgnDst,
+ PREGION rgnSrc,
const RECTL *rect,
- const POINTL *offset
-)
+ const POINTL *offset) // FIXME: we should probably remove offset from here
{
POINT pt = {0,0};
const POINT *off = offset;
@@ -602,13 +602,13 @@
if (off->x || off->y)
xrect = rgnDst->Buffer;
else
- return TRUE;
+ return REGION_Complexity(rgnDst);
}
else
{
xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount *
sizeof(RECT), TAG_REGION);
if(!xrect)
- return FALSE;
+ return ERROR;
if (rgnDst->Buffer && rgnDst->Buffer !=
&rgnDst->rdh.rcBound)
ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // Free the old buffer.
Will be assigned to xrect below.
}
@@ -669,7 +669,7 @@
PRECTL temp;
temp = ExAllocatePoolWithTag(PagedPool, i * sizeof(RECT), TAG_REGION);
if (!temp)
- return FALSE;
+ return ERROR;
if (rgnDst->Buffer && rgnDst->Buffer !=
&rgnDst->rdh.rcBound)
ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // free the old buffer
@@ -727,7 +727,7 @@
rgnDst->rdh.iType = RDH_RECTANGLES;
}
- return TRUE;
+ return REGION_Complexity(rgnDst);
empty:
if (!rgnDst->Buffer)
@@ -739,10 +739,10 @@
rgnDst->rdh.nRgnSize = RGN_DEFAULT_RECTS * sizeof(RECT);
}
else
- return FALSE;
+ return ERROR;
}
EMPTY_REGION(rgnDst);
- return TRUE;
+ return NULLREGION;
}
Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Tue Sep 23 20:21:13 2014
@@ -28,7 +28,7 @@
INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect);
BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc);
BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT);
-BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const
RECTL *rect, const POINT *off);
+INT FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const
RECTL *rect, const POINT *off);
VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT
RightRect, INT BottomRect);
VOID NTAPI REGION_vCleanup(PVOID ObjectBody);
3650
days inactive
3650
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org