From 8edc22a2ca81af088843af3aad5ffe8be3dbf134 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 28 Aug 2022 16:17:58 +0900 Subject: [PATCH] [USER32] Follow-up of 2ba41ad Be careful about every case. CORE-18338 --- win32ss/user/user32/windows/input.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 97f84bb0d59..64fa97deffd 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -704,12 +704,17 @@ IntLoadKeyboardLayout( dwhkl |= (0xf000 | wcstol(wszLayoutId, NULL, 16)) << 16; } - /* Check "IME File" value */ - dwSize = sizeof(szImeFileName); - if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, - &dwSize) != ERROR_SUCCESS) + if (bIsIME) { - dwhkl = LOWORD(dwhkl); + /* Check "IME File" value */ + dwSize = sizeof(szImeFileName); + if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName, + &dwSize) != ERROR_SUCCESS) + { + FIXME("Check IME file existence in system32\n") + bIsIME = FALSE; + dwhkl = LOWORD(dwhkl); + } } /* Close the key now */