[tkreuzer] 65726: [WIN32K] - Rename IntSetPolyPolygonRgn to REGION_SetPolyPolygonRgn - Implement GreCreatePolyPolygonRgn wrapper around it - Fix iMode usage in NtGdiPolyPolyDraw - Improve some vari...
Author: tkreuzer Date: Thu Dec 18 08:11:56 2014 New Revision: 65726
URL: http://svn.reactos.org/svn/reactos?rev=65726&view=rev Log: [WIN32K] - Rename IntSetPolyPolygonRgn to REGION_SetPolyPolygonRgn - Implement GreCreatePolyPolygonRgn wrapper around it - Fix iMode usage in NtGdiPolyPolyDraw - Improve some variable naming
Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h
Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap.... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Thu Dec 18 08:11:56 2014 @@ -458,26 +458,13 @@ /* Special handling for GdiPolyPolyRgn */ if (iFunc == GdiPolyPolyRgn) { - PREGION Rgn; - HRGN hRgn; - - Rgn = REGION_AllocUserRgnWithHandle(0); - if (!Rgn) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - ExFreePoolWithTag(pTemp, TAG_SHAPE); - return 0; - } - hRgn = Rgn->BaseObject.hHmgr; - if (!IntSetPolyPolygonRgn(SafePoints, SafeCounts, Count, hDC ? 1 : 2, Rgn)) - { - /* EngSetLastError ? */ - GreDeleteObject(hRgn); - hRgn = NULL; - } - RGNOBJAPI_Unlock(Rgn); + INT iMode = (INT)(UINT_PTR)hDC; + HRGN hrgn; + + hrgn = GreCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, iMode); + ExFreePoolWithTag(pTemp, TAG_SHAPE); - return (ULONG_PTR)hRgn; + return (ULONG_PTR)hrgn; }
dc = DC_LockDc(hDC);
Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?re... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Thu Dec 18 08:11:56 2014 @@ -1280,11 +1280,11 @@ }
/* Fill the region with the strokes */ - Ret = IntSetPolyPolygonRgn(pPath->pPoints, - pNumPointsInStroke, - numStrokes, - nPolyFillMode, - Rgn); + Ret = REGION_SetPolyPolygonRgn(Rgn, + pPath->pPoints, + pNumPointsInStroke, + numStrokes, + nPolyFillMode);
/* Free memory for number-of-points-in-stroke array */ ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH);
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] Thu Dec 18 08:11:56 2014 @@ -597,7 +597,7 @@
// FIXME: This function needs review and testing /*********************************************************************** - * REGION_CropAndOffsetRegion + * REGION_CropRegion */ INT FASTCALL @@ -3020,7 +3020,7 @@ }
/*********************************************************************** - * REGION_CreateEDGE_TABLE + * REGION_CreateETandAET * * This routine creates the edge table for * scan converting polygons. @@ -3061,7 +3061,7 @@ INT iSLLBlock = 0; INT dy;
- /* Initialize the Active Edge Table */ + /* Initialize the Active Edge Table */ AET->next = (EDGE_TABLE_ENTRY *)NULL; AET->back = (EDGE_TABLE_ENTRY *)NULL; AET->nextWETE = (EDGE_TABLE_ENTRY *)NULL; @@ -3132,12 +3132,12 @@
BOOL FASTCALL -IntSetPolyPolygonRgn( - POINT *Pts, - PULONG Count, - INT nbpolygons, - INT mode, - PREGION Rgn) +REGION_SetPolyPolygonRgn( + _Inout_ PREGION prgn, + _In_ const POINT *ppt, + _In_ const ULONG *pcPoints, + _In_ ULONG cPolygons, + _In_ INT iMode) { EDGE_TABLE_ENTRY *pAET; /* Active Edge Table */ INT y; /* Current scanline */ @@ -3153,33 +3153,35 @@ INT fixWAET = FALSE; POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */ POINTBLOCK *tmpPtBlock; - INT numFullPtBlocks = 0; - INT poly, total; - - if (mode == 0 || mode > 2) return 0; + UINT numFullPtBlocks = 0; + UINT poly, total; + + /* Check if iMode is valid */ + if ((iMode != ALTERNATE) && (iMode != WINDING)) + return FALSE;
/* Special case a rectangle */ - if (((nbpolygons == 1) && ((*Count == 4) || - ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && - (((Pts[0].y == Pts[1].y) && - (Pts[1].x == Pts[2].x) && - (Pts[2].y == Pts[3].y) && - (Pts[3].x == Pts[0].x)) || - ((Pts[0].x == Pts[1].x) && - (Pts[1].y == Pts[2].y) && - (Pts[2].x == Pts[3].x) && - (Pts[3].y == Pts[0].y)))) - { - REGION_SetRectRgn(Rgn, - min(Pts[0].x, Pts[2].x), - min(Pts[0].y, Pts[2].y), - max(Pts[0].x, Pts[2].x), - max(Pts[0].y, Pts[2].y)); + if (((cPolygons == 1) && ((pcPoints[0] == 4) || + ((pcPoints[0] == 5) && (ppt[4].x == ppt[0].x) && (ppt[4].y == ppt[0].y)))) && + (((ppt[0].y == ppt[1].y) && + (ppt[1].x == ppt[2].x) && + (ppt[2].y == ppt[3].y) && + (ppt[3].x == ppt[0].x)) || + ((ppt[0].x == ppt[1].x) && + (ppt[1].y == ppt[2].y) && + (ppt[2].x == ppt[3].x) && + (ppt[3].y == ppt[0].y)))) + { + REGION_SetRectRgn(prgn, + min(ppt[0].x, ppt[2].x), + min(ppt[0].y, ppt[2].y), + max(ppt[0].x, ppt[2].x), + max(ppt[0].y, ppt[2].y)); return TRUE; }
- for (poly = total = 0; poly < nbpolygons; poly++) - total += Count[poly]; + for (poly = total = 0; poly < cPolygons; poly++) + total += pcPoints[poly];
pETEs = ExAllocatePoolWithTag(PagedPool, sizeof(EDGE_TABLE_ENTRY) * total, @@ -3190,11 +3192,11 @@ }
pts = FirstPtBlock.pts; - REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock); + REGION_CreateETandAET(pcPoints, cPolygons, ppt, &ET, &AET, pETEs, &SLLBlock); pSLL = ET.scanlines.next; curPtBlock = &FirstPtBlock;
- if (mode != WINDING) + if (iMode != WINDING) { /* For each scanline */ for (y = ET.ymin; y < ET.ymax; y++) @@ -3305,7 +3307,7 @@ }
REGION_FreeStorage(SLLBlock.next); - REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, Rgn); + REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, prgn);
for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { @@ -3316,6 +3318,42 @@
ExFreePoolWithTag(pETEs, TAG_REGION); return TRUE; +} + +HRGN +NTAPI +GreCreatePolyPolygonRgn( + _In_ const POINT *ppt, + _In_ const ULONG *pcPoints, + _In_ ULONG cPolygons, + _In_ INT iMode) +{ + PREGION prgn; + HRGN hrgn; + + /* Allocate a new region */ + prgn = REGION_AllocUserRgnWithHandle(0); + if (prgn == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + /* Call the internal function and check for success */ + if (REGION_SetPolyPolygonRgn(prgn, ppt, pcPoints, cPolygons, iMode)) + { + /* Success, get the handle and unlock the region */ + hrgn = prgn->BaseObject.hHmgr; + RGNOBJAPI_Unlock(prgn); + } + else + { + /* Failure, delete the region */ + REGION_Delete(prgn); + hrgn = NULL; + } + + return hrgn; }
BOOL
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] Thu Dec 18 08:11:56 2014 @@ -42,7 +42,24 @@
INT APIENTRY IntGdiGetRgnBox(HRGN, RECTL*); BOOL FASTCALL IntGdiPaintRgn(PDC, PREGION ); -BOOL FASTCALL IntSetPolyPolygonRgn(PPOINT, PULONG, INT, INT, PREGION); + +BOOL +FASTCALL +REGION_SetPolyPolygonRgn( + _Inout_ PREGION prgn, + _In_ const POINT *ppt, + _In_ const ULONG *pcPoints, + _In_ ULONG cPolygons, + _In_ INT iMode); + +HRGN +NTAPI +GreCreatePolyPolygonRgn( + _In_ const POINT *ppt, + _In_ const ULONG *pcPoints, + _In_ ULONG cPolygons, + _In_ INT iMode); + INT FASTCALL IntGdiOffsetRgn(PREGION,INT,INT); BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL);
-
tkreuzer＠svn.reactos.org