ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Return the region directly from PATH_PathToRegion.

Browse Source
This commit is contained in:
Alexandre Julliard 2011-11-22 11:31:27 +01:00
parent 7698b636e7
commit ac1643caec
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/gdi32/path.c
View File

@ -379,13 +379,9 @@ static BOOL PATH_FlattenPath(GdiPath *pPath)
/* PATH_PathToRegion /* PATH_PathToRegion
* *
* Creates a region from the specified path using the specified polygon * Creates a region from the specified path using the specified polygon
* filling mode. The path is left unchanged. A handle to the region that * filling mode. The path is left unchanged.
* was created is stored in *pHrgn. If successful, TRUE is returned; if an
* error occurs, SetLastError is called with the appropriate value and
* FALSE is returned.
*/ */
static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode)
HRGN *pHrgn)
{ {
int numStrokes, iStroke, i; int numStrokes, iStroke, i;
INT *pNumPointsInStroke; INT *pNumPointsInStroke;
@ -407,7 +403,7 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode,
if(!pNumPointsInStroke) if(!pNumPointsInStroke)
{ {
SetLastError(ERROR_NOT_ENOUGH_MEMORY); SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE; return 0;
} }
/* Second pass: remember number of points in each polygon */ /* Second pass: remember number of points in each polygon */
@ -428,18 +424,8 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode,
hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke, hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke,
numStrokes, nPolyFillMode); numStrokes, nPolyFillMode);
/* Free memory for number-of-points-in-stroke array */
HeapFree( GetProcessHeap(), 0, pNumPointsInStroke ); HeapFree( GetProcessHeap(), 0, pNumPointsInStroke );
return hrgn;
if(hrgn==NULL)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
/* Success! */
*pHrgn=hrgn;
return TRUE;
} }
/* PATH_ScaleNormalizedPoint /* PATH_ScaleNormalizedPoint
@ -689,10 +675,8 @@ HRGN WINAPI PathToRegion(HDC hdc)
else else
{ {
/* FIXME: Should we empty the path even if conversion failed? */ /* FIXME: Should we empty the path even if conversion failed? */
if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgnRval)) hrgnRval = PATH_PathToRegion(pPath, GetPolyFillMode(hdc));
PATH_EmptyPath(pPath); if (hrgnRval) PATH_EmptyPath(pPath);
else
hrgnRval=0;
} }
release_dc_ptr( dc ); release_dc_ptr( dc );
return hrgnRval; return hrgnRval;
@ -707,7 +691,7 @@ static BOOL PATH_FillPath( HDC hdc, GdiPath *pPath )
HRGN hrgn; HRGN hrgn;
/* Construct a region from the path and fill it */ /* Construct a region from the path and fill it */
if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgn)) if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc))))
{ {
/* Since PaintRgn interprets the region as being in logical coordinates /* Since PaintRgn interprets the region as being in logical coordinates
* but the points we store for the path are already in device * but the points we store for the path are already in device
@ -2164,7 +2148,7 @@ BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode )
SetLastError( ERROR_CAN_NOT_COMPLETE ); SetLastError( ERROR_CAN_NOT_COMPLETE );
return FALSE; return FALSE;
} }
if (!PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc), &hrgn )) return FALSE; if (!(hrgn = PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc)))) return FALSE;
ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR;
if (ret) PATH_EmptyPath( &dc->path ); if (ret) PATH_EmptyPath( &dc->path );
/* FIXME: Should this function delete the path even if it failed? */ /* FIXME: Should this function delete the path even if it failed? */