Alexandre Julliard : user32/tests: Skip some message tests if we fail to queue events.
Alexandre Julliard
julliard at winehq.org
Fri Feb 20 12:49:54 CST 2009
Module: wine
Branch: master
Commit: 07d9d1fc1f80641a9bce3139a15c1de5c1b5ea06
URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d9d1fc1f80641a9bce3139a15c1de5c1b5ea06
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 20 16:56:16 2009 +0100
user32/tests: Skip some message tests if we fail to queue events.
---
dlls/user32/tests/msg.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 147f5b7..c3ac46d 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -9403,8 +9403,13 @@ static void test_PeekMessage2(void)
wait_move_event(hwnd, 100-STEP, 100-STEP);
ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE);
- ok(ret, "no message available\n");
- if (ret) {
+ if (!ret)
+ {
+ skip( "queuing mouse events not supported\n" );
+ goto done;
+ }
+ else
+ {
trace("1st move event: %04x %x %d %d\n", msg.message, msg.time, msg.pt.x, msg.pt.y);
message = msg.message;
time1 = msg.time;
@@ -9453,6 +9458,7 @@ static void test_PeekMessage2(void)
ok(x3 != x2 && y3 != y2, "coords not changed: (%d %d) (%d %d)\n", x2, y2, x3, y3);
}
+done:
DestroyWindow(hwnd);
SetCursorPos(pos.x, pos.y);
flush_events();
@@ -11269,6 +11275,11 @@ static void test_menu_messages(void)
TranslateMessage(&msg);
DispatchMessage(&msg);
}
+ if (!sequence_cnt) /* we didn't get any message */
+ {
+ skip( "queuing key events not supported\n" );
+ goto done;
+ }
ok_sequence(wm_popup_menu_1, "popup menu command", FALSE);
/* Alt+F, Right, Enter */
@@ -11322,6 +11333,7 @@ static void test_menu_messages(void)
}
ok_sequence(wm_popup_menu_3, "submenu of a popup menu command", FALSE);
+done:
DestroyWindow(hwnd);
DestroyMenu(hmenu);
}
More information about the wine-cvs
mailing list