Alexandre Julliard : user32/tests: Fix test failures when the low-level hook cannot be set.
Alexandre Julliard
julliard at winehq.org
Fri Jul 22 10:15:58 CDT 2011
Module: wine
Branch: master
Commit: fb2df6752e1837380b52e16fb49ca55243132b80
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2df6752e1837380b52e16fb49ca55243132b80
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jul 22 12:00:58 2011 +0200
user32/tests: Fix test failures when the low-level hook cannot be set.
---
dlls/user32/tests/msg.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 5fbf440..afca225 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2025,7 +2025,8 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
while (expected->message && actual->message)
{
- if (expected->message == actual->message)
+ if (expected->message == actual->message &&
+ !((expected->flags ^ actual->flags) & (hook|winevent_hook|kbd_hook)))
{
if (expected->flags & wparam)
{
@@ -2130,7 +2131,8 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
/* silently drop hook messages if there is no support for them */
else if ((expected->flags & optional) ||
((expected->flags & hook) && !hCBT_hook) ||
- ((expected->flags & winevent_hook) && !hEvent_hook))
+ ((expected->flags & winevent_hook) && !hEvent_hook) ||
+ ((expected->flags & kbd_hook) && !hKBD_hook))
expected++;
else if (todo)
{
@@ -13213,7 +13215,7 @@ static void test_hotkey(void)
}
hKBD_hook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, GetModuleHandle(NULL), 0);
- ok(hKBD_hook != NULL, "failed to install hook, err %i\n", GetLastError());
+ if (!hKBD_hook) win_skip("WH_KEYBOARD_LL is not supported\n");
/* Same key combination, different id */
SetLastError(0xdeadbeef);
@@ -13409,7 +13411,7 @@ static void test_hotkey(void)
ret = UnregisterHotKey(NULL, 5);
ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError());
- UnhookWindowsHookEx(hKBD_hook);
+ if (hKBD_hook) UnhookWindowsHookEx(hKBD_hook);
hKBD_hook = NULL;
end:
More information about the wine-cvs
mailing list