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

user32/tests: Fix input test failures on NT4.

This commit is contained in:
Andrew Eikum 2009-08-25 16:25:41 -05:00 committed by Alexandre Julliard
parent 5b21d90f5f
commit 7fe9e693a7
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dlls/user32/tests/input.c
View File

@ -72,6 +72,7 @@ static struct {
LONG last_hook_syskey_down; LONG last_hook_syskey_down;
LONG last_hook_syskey_up; LONG last_hook_syskey_up;
BOOL expect_alt; BOOL expect_alt;
BOOL sendinput_broken;
} key_status; } key_status;
static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t);
@ -950,6 +951,7 @@ static void reset_key_status(void)
key_status.last_hook_syskey_down = -1; key_status.last_hook_syskey_down = -1;
key_status.last_hook_syskey_up = -1; key_status.last_hook_syskey_up = -1;
key_status.expect_alt = FALSE; key_status.expect_alt = FALSE;
key_status.sendinput_broken = FALSE;
} }
static void test_unicode_keys(HWND hwnd, HHOOK hook) static void test_unicode_keys(HWND hwnd, HHOOK hook)
@ -975,13 +977,15 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook)
} }
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
ok(key_status.last_key_down == VK_PACKET, if(!key_status.sendinput_broken){
"Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down); ok(key_status.last_key_down == VK_PACKET,
ok(key_status.last_char == 0x3c0, "Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down);
"Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char); ok(key_status.last_char == 0x3c0,
if(hook) "Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char);
ok(key_status.last_hook_down == 0x3c0, if(hook)
"Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down); ok(key_status.last_hook_down == 0x3c0,
"Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down);
}
inputs[1].u.ki.wVk = 0; inputs[1].u.ki.wVk = 0;
inputs[1].u.ki.wScan = 0x3c0; inputs[1].u.ki.wScan = 0x3c0;
@ -995,11 +999,13 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook)
} }
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
ok(key_status.last_key_up == VK_PACKET, if(!key_status.sendinput_broken){
"Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); ok(key_status.last_key_up == VK_PACKET,
if(hook) "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up);
ok(key_status.last_hook_up == 0x3c0, if(hook)
"Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up); ok(key_status.last_hook_up == 0x3c0,
"Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up);
}
/* holding alt, pressing & releasing a unicode character, releasing alt */ /* holding alt, pressing & releasing a unicode character, releasing alt */
inputs[0].u.ki.wVk = VK_LMENU; inputs[0].u.ki.wVk = VK_LMENU;
@ -1019,13 +1025,15 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook)
} }
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
ok(key_status.last_syskey_down == VK_PACKET, if(!key_status.sendinput_broken){
"Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down); ok(key_status.last_syskey_down == VK_PACKET,
ok(key_status.last_syschar == 0x3041, "Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down);
"Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar); ok(key_status.last_syschar == 0x3041,
if(hook) "Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar);
ok(key_status.last_hook_syskey_down == 0x3041, if(hook)
"Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down); ok(key_status.last_hook_syskey_down == 0x3041,
"Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down);
}
inputs[1].u.ki.wVk = 0; inputs[1].u.ki.wVk = 0;
inputs[1].u.ki.wScan = 0x3041; inputs[1].u.ki.wScan = 0x3041;
@ -1044,11 +1052,13 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook)
} }
DispatchMessageW(&msg); DispatchMessageW(&msg);
} }
ok(key_status.last_key_up == VK_PACKET, if(!key_status.sendinput_broken){
"Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); ok(key_status.last_key_up == VK_PACKET,
if(hook) "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up);
ok(key_status.last_hook_up == 0x3041, if(hook)
"Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); ok(key_status.last_hook_up == 0x3041,
"Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up);
}
} }
static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam,
@ -1081,8 +1091,16 @@ static LRESULT CALLBACK llkbd_unicode_hook(int nCode, WPARAM wParam, LPARAM lPar
{ {
if(nCode == HC_ACTION){ if(nCode == HC_ACTION){
LPKBDLLHOOKSTRUCT info = (LPKBDLLHOOKSTRUCT)lParam; LPKBDLLHOOKSTRUCT info = (LPKBDLLHOOKSTRUCT)lParam;
ok(info->vkCode == VK_PACKET || (key_status.expect_alt && info->vkCode == VK_LMENU), "vkCode should have been VK_PACKET[%04x], was: %04x\n", VK_PACKET, info->vkCode); if(!info->vkCode){
key_status.expect_alt = FALSE; key_status.sendinput_broken = TRUE;
win_skip("SendInput doesn't support unicode on this platform\n");
}else{
if(key_status.expect_alt){
ok(info->vkCode == VK_LMENU, "vkCode should have been VK_LMENU[0x%04x], was: 0x%x\n", VK_LMENU, info->vkCode);
key_status.expect_alt = FALSE;
}else
ok(info->vkCode == VK_PACKET, "vkCode should have been VK_PACKET[0x%04x], was: 0x%x\n", VK_PACKET, info->vkCode);
}
switch(wParam){ switch(wParam){
case WM_KEYDOWN: case WM_KEYDOWN:
key_status.last_hook_down = info->scanCode; key_status.last_hook_down = info->scanCode;