Dmitry Timoshkov : user32: Make the excessive scroll test pass under Windows.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f7d85859611dfaab5a13e43ef13d5ed3be4f143
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7f7d85859611dfaab5a13e43ef...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Tue Mar  6 13:12:19 2007 +0800

user32: Make the excessive scroll test pass under Windows.

---

 dlls/user32/tests/win.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index c15e62f..c9d0b3b 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -2991,13 +2991,14 @@ static void test_scrollvalidate( HWND parent)
     CombineRgn( exprgn, exprgn, tmprgn, RGN_OR);
     ok( EqualRgn( exprgn, hrgn), "wrong update region\n");
 
+    /* clear an update region */
+    UpdateWindow( hwnd1 );
+
     SetRect( &rc, 0,40, 100,60);
     SetRect( &cliprc, 0,0, 100,100);
     ScrollWindowEx( hwnd1, 0, -25, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE);
-    SetRectRgn( tmprgn, 0,15,98,35);
-    CombineRgn( exprgn, exprgn, tmprgn, RGN_OR);
-    SetRectRgn( tmprgn, 0, 40, 98, 60);
-    CombineRgn( exprgn, exprgn, tmprgn, RGN_OR);
+    if (winetest_debug > 0) dump_region( hrgn );
+    SetRectRgn( exprgn, 0, 40, 98, 60 );
     ok( EqualRgn( exprgn, hrgn), "wrong update region in excessive scroll\n");
 
     /* now test ScrollWindowEx with a combination of