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

If the meta/clip intersection (Rao) region doesn't exist, return 

either the meta or clip region if they do exist.
Remove the wine_todo's.
This commit is contained in:
Huw Davies 2005-10-11 19:55:01 +00:00 committed by Alexandre Julliard
parent c0c514b072
commit 22ab2046fb
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi/clipping.c
View File

@ -566,6 +566,8 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode)
break; break;
case 3: case 3:
rgn = dc->hMetaClipRgn; rgn = dc->hMetaClipRgn;
if(!rgn) rgn = dc->hClipRgn;
if(!rgn) rgn = dc->hMetaRgn;
break; break;
case SYSRGN: /* == 4 */ case SYSRGN: /* == 4 */
rgn = dc->hVisRgn; rgn = dc->hVisRgn;

14
dlls/gdi/tests/clipping.c
View File

@ -58,11 +58,8 @@ static void test_GetRandomRgn(void)
ret = GetRandomRgn(hdc, hrgn, 2); ret = GetRandomRgn(hdc, hrgn, 2);
ok(ret == 0, "GetRandomRgn rets %d\n", ret); ok(ret == 0, "GetRandomRgn rets %d\n", ret);
todo_wine ret = GetRandomRgn(hdc, hrgn, 3);
{ ok(ret != 0, "GetRandomRgn rets %d\n", ret);
ret = GetRandomRgn(hdc, hrgn, 3);
ok(ret != 0, "GetRandomRgn rets %d\n", ret);
}
GetRgnBox(hrgn, &ret_rc); GetRgnBox(hrgn, &ret_rc);
ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n", ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n",
ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom); ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom);
@ -78,11 +75,8 @@ static void test_GetRandomRgn(void)
ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n", ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n",
ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom); ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom);
todo_wine ret = GetRandomRgn(hdc, hrgn, 3);
{ ok(ret != 0, "GetRandomRgn rets %d\n", ret);
ret = GetRandomRgn(hdc, hrgn, 3);
ok(ret != 0, "GetRandomRgn rets %d\n", ret);
}
GetRgnBox(hrgn, &ret_rc); GetRgnBox(hrgn, &ret_rc);
ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n", ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %ld,%ld - %ld,%ld\n",
ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom); ret_rc.left, ret_rc.top, ret_rc.right, ret_rc.bottom);