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

gdi32: IntersectClipRect should update actual clipping region for a EMF DC.

This commit is contained in:
Dmitry Timoshkov 2013-02-14 13:38:06 +08:00 committed by Alexandre Julliard
parent 756736ae42
commit 47b89a8fac
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/gdi32/enhmfdrv/dc.c
View File

@ -169,14 +169,18 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom)
{
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect );
EMRINTERSECTCLIPRECT emr;
BOOL ret;
emr.emr.iType = EMR_INTERSECTCLIPRECT;
emr.emr.nSize = sizeof(emr);
emr.rclClip.left = left;
emr.rclClip.top = top;
emr.rclClip.right = right;
emr.rclClip.bottom = bottom;
return EMFDRV_WriteRecord( dev, &emr.emr );
ret = EMFDRV_WriteRecord( dev, &emr.emr );
return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR;
}
INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )

2
dlls/gdi32/tests/metafile.c
View File

@ -2511,7 +2511,6 @@ static void test_emf_clipping(void)
rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
ret = IntersectClipRect(hdc, 0, 0, 100, 100);
todo_wine
ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret);
if (ret == COMPLEXREGION)
{
@ -2524,7 +2523,6 @@ todo_wine
SetRect(&rc_res, -1, -1, -1, -1);
ret = GetClipBox(hdc, &rc_res);
ok(ret == SIMPLEREGION, "got %d\n", ret);
todo_wine
ok(EqualRect(&rc_res, &rc),
"expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n",
rc.left, rc.top, rc.right, rc.bottom,