Alexandre Julliard : user32/tests: Skip shift+button test if we don' t receive the event.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 28582dbf6cddf5c215a7a019c086d1bcddfa4fcb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=28582dbf6cddf5c215a7a019c0...

Author: Alexandre Julliard 
Date:   Wed Mar 11 11:42:21 2009 +0100

user32/tests: Skip shift+button test if we don't receive the event.

---

dlls/user32/tests/msg.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index ed6a820..d1825d3 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -6850,12 +6850,17 @@ static void test_accelerators(void)
     GetCursorPos(&pt);
     if (pt.x == rc.left && pt.y == rc.top)
     {
+        int i;
         keybd_event(VK_SHIFT, 0, 0, 0);
         mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
         mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
         keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0);
         pump_msg_loop(hwnd, 0);
-        ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE);
+        for (i = 0; i < sequence_cnt; i++) if (sequence[i].message == WM_LBUTTONDOWN) break;
+        if (i < sequence_cnt)
+            ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE);
+        else
+            skip( "Shift+MouseButton event didn't get to the window\n" );
     }

done:
@@ -8222,12 +8227,9 @@ static const struct message ScrollWindowPaint1[] = {
     { WM_GETTEXTLENGTH, sent|optional },
     { WM_PAINT, sent|optional },
     { WM_NCPAINT, sent|beginpaint|optional },
-    { WM_GETTEXT, sent|optional },
-    { WM_GETTEXT, sent|optional },
-    { WM_GETTEXT, sent|optional },
-    { WM_GETTEXT, sent|defwinproc|optional },
-    { WM_GETTEXT, sent|defwinproc|optional },
-    { WM_ERASEBKGND, sent|optional },
+    { WM_GETTEXT, sent|beginpaint|optional },
+    { WM_GETTEXT, sent|beginpaint|optional },
+    { WM_ERASEBKGND, sent|beginpaint|optional },
     { 0 }
 };