marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Fix clipping to the DIB rectangle in GetPixel(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2017-12-22 16:29:03 +01:00
parent 3eea7ff3d2
commit 90273a6e81
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1108,6 +1108,7 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y )
dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev );
POINT pt;
RECT rect;
DWORD pixel;
TRACE( "(%p, %d, %d)\n", dev, x, y );
@ -1115,10 +1116,11 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y )
pt.x = x;
pt.y = y;
lp_to_dp( dc, &pt, 1 );
if (pt.x < 0 || pt.x >= pdev->dib.rect.right - pdev->dib.rect.left ||
pt.y < 0 || pt.y >= pdev->dib.rect.bottom - pdev->dib.rect.top)
return CLR_INVALID;
rect.left = pt.x;
rect.top = pt.y;
rect.right = rect.left + 1;
rect.bottom = rect.top + 1;
if (!clip_rect_to_dib( &pdev->dib, &rect )) return CLR_INVALID;
pixel = pdev->dib.funcs->get_pixel( &pdev->dib, pt.x, pt.y );
return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel );