[ros-diffs] [reactos] 01/01: [USER32] Call CliImmInitializeHotKeys on LoadKeyboardLayoutW epilogue (#4604)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8ccc8516f19b50531675…

commit e8ccc8516f19b50531675793f5f47c11189fd845
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Aug 14 10:53:58 2022 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sun Aug 14 10:53:58 2022 +0900

    [USER32] Call CliImmInitializeHotKeys on LoadKeyboardLayoutW epilogue (#4604)
    
    Enable the IME hotkeys.
    - Call CliImmInitializeHotKeys.SETIMEHOTKEY_ADD on IntLoadKeyboardLayout epilogue.
    CORE-11700
---
 win32ss/user/user32/windows/input.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c
index dd396999e3b..8d4d3ad8732 100644
--- a/win32ss/user/user32/windows/input.c
+++ b/win32ss/user/user32/windows/input.c
@@ -656,6 +656,7 @@ IntLoadKeyboardLayout(
     WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard
Layouts\\";
     WCHAR wszLayoutId[10], wszNewKLID[10];
     HKEY hKey;
+    HKL hNewKL;
 
     /* LOWORD of dwhkl is Locale Identifier */
     dwhkl = LOWORD(wcstoul(pwszKLID, NULL, 16));
@@ -712,9 +713,11 @@ IntLoadKeyboardLayout(
 
     ZeroMemory(&ustrKbdName, sizeof(ustrKbdName));
     RtlInitUnicodeString(&ustrKLID, pwszKLID);
-    return NtUserLoadKeyboardLayoutEx(NULL, 0, &ustrKbdName,
-                                      NULL, &ustrKLID,
-                                      dwhkl, Flags);
+    hNewKL = NtUserLoadKeyboardLayoutEx(NULL, 0, &ustrKbdName,
+                                        NULL, &ustrKLID,
+                                        dwhkl, Flags);
+    CliImmInitializeHotKeys(SETIMEHOTKEY_ADD, hNewKL);
+    return hNewKL;
 }
 
 /*