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

gdi32: Check that ExtFloodFill()'s initial co-ordinates lie within the dib. 

It might seem more natural to move this check inside is_interior(), but
this would slow down the unclipped case.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-09-29 09:57:47 +01:00 committed by Alexandre Julliard
parent cece771b58
commit 04f8ecd956
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/dibdrv/graphics.c
View File

@ -1055,6 +1055,9 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type )
TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type );
if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left ||
y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE;
if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE;
if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;

3
dlls/gdi32/tests/dib.c
View File

@ -2792,6 +2792,9 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits)
ExtSelectClipRgn( hdc, NULL, RGN_COPY ); ExtSelectClipRgn( hdc, NULL, RGN_COPY );
ret = ExtFloodFill( hdc, -1, -1, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE );
ok (!ret, "got ret %d\n", ret);
SelectObject(hdc, orig_brush); SelectObject(hdc, orig_brush);
SelectObject(hdc, orig_pen); SelectObject(hdc, orig_pen);
DeleteObject(solid_brush); DeleteObject(solid_brush);