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

user32: By default, return all zeroes in the first half of the keyboard layout name.

This commit is contained in:
Hans Leidekker 2009-04-14 12:34:37 +02:00 committed by Alexandre Julliard
parent d3fc7dca99
commit ed70c76add
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1284,6 +1284,19 @@ static void test_get_async_key_state(void)
ok(0 == GetAsyncKeyState(-1000000), "GetAsyncKeyState did not return 0\n"); ok(0 == GetAsyncKeyState(-1000000), "GetAsyncKeyState did not return 0\n");
} }
static void test_keyboard_layout_name(void)
{
BOOL ret;
char klid[KL_NAMELENGTH];
if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return;
klid[0] = 0;
ret = GetKeyboardLayoutNameA(klid);
ok(ret, "GetKeyboardLayoutNameA failed %u\n", GetLastError());
ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid);
}
START_TEST(input) START_TEST(input)
{ {
init_function_pointers(); init_function_pointers();
@ -1300,6 +1313,7 @@ START_TEST(input)
test_key_map(); test_key_map();
test_ToUnicode(); test_ToUnicode();
test_get_async_key_state(); test_get_async_key_state();
test_keyboard_layout_name();
if(pGetMouseMovePointsEx) if(pGetMouseMovePointsEx)
test_GetMouseMovePointsEx(); test_GetMouseMovePointsEx();

2
dlls/winex11.drv/keyboard.c
View File

@ -1914,8 +1914,6 @@ BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name)
langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); langid = PRIMARYLANGID(LANGIDFROMLCID(layout));
if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN)
layout |= 0xe001 << 16; /* FIXME */ layout |= 0xe001 << 16; /* FIXME */
else
layout |= layout << 16;
sprintfW(name, formatW, layout); sprintfW(name, formatW, layout);
TRACE("returning %s\n", debugstr_w(name)); TRACE("returning %s\n", debugstr_w(name));