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

user32: Also change rcUpdate when scrolling by more than the window size. 

Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Vincent Povirk 2016-05-19 15:17:20 -05:00 committed by Alexandre Julliard
parent b72c2e85b4
commit 1383012395
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/user32/painting.c
View File

@ -1501,6 +1501,13 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC
CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR );
if (rcUpdate)
{
RECT rcTemp;
GetRgnBox( hrgnTemp, &rcTemp );
UnionRect( rcUpdate, rcUpdate, &rcTemp );
}
if( !bOwnRgn)
CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR );
}

16
dlls/user32/tests/win.c
View File

@ -4841,11 +4841,25 @@ static void test_scrollvalidate( HWND parent)
rcu.left,rcu.top,rcu.right,rcu.bottom);
ReleaseDC( hwnd1, hdc);
/* test scrolling a window with an update region */
/* test scrolling a rect by more than its size */
DestroyWindow( hwnd2);
ValidateRect( hwnd1, NULL);
SetRect( &rc, 40,40, 50,50);
InvalidateRect( hwnd1, &rc, 1);
ScrollWindowEx( hwnd1, -20, 0, &rc, NULL, hrgn, &rcu,
SW_SCROLLCHILDREN | SW_INVALIDATE);
if (winetest_debug > 0) dump_region(hrgn);
SetRectRgn( exprgn, 20, 40, 30, 50);
SetRectRgn( tmprgn, 40, 40, 50, 50);
CombineRgn( exprgn, exprgn, tmprgn, RGN_OR);
ok( EqualRgn( exprgn, hrgn), "wrong update region\n");
ok( rcu.left == 20 && rcu.top == 40 && rcu.right == 50 && rcu.bottom == 50,
"unexpected update rect: %d,%d - %d,%d\n", rcu.left,rcu.top,rcu.right,rcu.bottom);
/* test scrolling a window with an update region */
ValidateRect( hwnd1, NULL);
SetRect( &rc, 40,40, 50,50);
InvalidateRect( hwnd1, &rc, 1);
GetClientRect( hwnd1, &rc);
cliprc=rc;
ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu,