system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 18:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdi32: Use a buffer on the stack if the number of points is small.

Browse source 
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-07-29 13:13:05 +01:00 committed by Alexandre Julliard
parent 2ea72e8717
commit 22202eae59
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dlls/gdi32/dibdrv/graphics.c
View file

@ -1239,7 +1239,8 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD
DC *dc = get_physdev_dc( dev );
DWORD total, i, pos;
BOOL ret = TRUE;
POINT *points;
POINT pt_buf[32];
POINT *points = pt_buf;
HRGN outline = 0, interior = 0;
for (i = total = 0; i < polygons; i++)
@ -1248,16 +1249,19 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD
total += counts[i];
}
points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) );
if (!points) return FALSE;
if (total > sizeof(pt_buf) / sizeof(pt_buf[0]))
{
points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) );
if (!points) return FALSE;
}
memcpy( points, pt, total * sizeof(*pt) );
lp_to_dp( dc, points, total );
if (pdev->brush.style != BS_NULL &&
!(interior = CreatePolyPolygonRgn( points, counts, polygons, dc->polyFillMode )))
{
HeapFree( GetProcessHeap(), 0, points );
return FALSE;
ret = FALSE;
goto done;
}
if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 );
@ -1289,7 +1293,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD
if (ret) ret = pen_region( pdev, outline );
DeleteObject( outline );
}
HeapFree( GetProcessHeap(), 0, points );
done:
if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points );
return ret;
}
@ -1301,7 +1307,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev );
DWORD total, pos, i;
POINT *points;
POINT pt_buf[32];
POINT *points = pt_buf;
BOOL ret = TRUE;
HRGN outline = 0;
@ -1311,15 +1318,18 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO
total += counts[i];
}
points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) );
if (!points) return FALSE;
if (total > sizeof(pt_buf) / sizeof(pt_buf[0]))
{
points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) );
if (!points) return FALSE;
}
memcpy( points, pt, total * sizeof(*pt) );
lp_to_dp( dc, points, total );
if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 )))
{
HeapFree( GetProcessHeap(), 0, points );
return FALSE;
ret = FALSE;
goto done;
}
for (i = pos = 0; i < polylines; i++)
@ -1336,7 +1346,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO
DeleteObject( outline );
}
HeapFree( GetProcessHeap(), 0, points );
done:
if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points );
return ret;
}