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

gdi32: Fix negative width/height handling in stretch bitblt family. 

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Akihiro Sagawa 2018-10-13 22:31:00 +09:00 committed by Alexandre Julliard
parent 71c9a8f3ca
commit 566b92320c
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/gdi32/bitblt.c
View File

@ -57,12 +57,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *
{ {
/* map source rectangle into destination coordinates */ /* map source rectangle into destination coordinates */
rect = src->visrect; rect = src->visrect;
offset_rect( &rect, -min( src->x, src->x + src->width + 1), offset_rect( &rect,
-min( src->y, src->y + src->height + 1) ); -src->x - (src->width < 0 ? 1 : 0),
rect.left = dst->x + rect.left * dst->width / abs(src->width); -src->y - (src->height < 0 ? 1 : 0));
rect.top = dst->y + rect.top * dst->height / abs(src->height); rect.left = dst->x + rect.left * dst->width / src->width;
rect.right = dst->x + rect.right * dst->width / abs(src->width); rect.top = dst->y + rect.top * dst->height / src->height;
rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); rect.right = dst->x + rect.right * dst->width / src->width;
rect.bottom = dst->y + rect.bottom * dst->height / src->height;
order_rect( &rect ); order_rect( &rect );
/* avoid rounding errors */ /* avoid rounding errors */
@ -74,12 +75,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *
/* map destination rectangle back to source coordinates */ /* map destination rectangle back to source coordinates */
rect = dst->visrect; rect = dst->visrect;
offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), offset_rect( &rect,
-min( dst->y, dst->y + dst->height + 1) ); -dst->x - (dst->width < 0 ? 1 : 0),
rect.left = src->x + rect.left * src->width / abs(dst->width); -dst->y - (dst->height < 0 ? 1 : 0));
rect.top = src->y + rect.top * src->height / abs(dst->height); rect.left = src->x + rect.left * src->width / dst->width;
rect.right = src->x + rect.right * src->width / abs(dst->width); rect.top = src->y + rect.top * src->height / dst->height;
rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); rect.right = src->x + rect.right * src->width / dst->width;
rect.bottom = src->y + rect.bottom * src->height / dst->height;
order_rect( &rect ); order_rect( &rect );
/* avoid rounding errors */ /* avoid rounding errors */

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

@ -3256,7 +3256,7 @@ static void test_StretchBlt(void)
memset( expected, 0, get_dib_image_size( &biDst ) ); memset( expected, 0, get_dib_image_size( &biDst ) );
expected[17] = 0x76543210, expected[18] = 0xfedcba98; expected[17] = 0x76543210, expected[18] = 0xfedcba98;
expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00;
todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer,
2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__);
/* the source rectangle doesn't fit in the device area */ /* the source rectangle doesn't fit in the device area */
@ -3701,7 +3701,6 @@ static void test_GdiAlphaBlend(void)
SetViewportExtEx(hdcDst, -1, -1, NULL); SetViewportExtEx(hdcDst, -1, -1, NULL);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend);
todo_wine
ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() );
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend); ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend);