https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dff4579bd6f4f107ef1c12...
commit dff4579bd6f4f107ef1c121b841112bdbfa01f2b Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Wed Oct 19 12:15:11 2022 +0900 Commit: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com CommitDate: Wed Oct 19 12:15:11 2022 +0900
[NTUSER][USER32][INCLUDE] s/SETIMEHOTKEY_DELETEALL/SETIMEHOTKEY_INITIALIZE/
CORE-11700 --- sdk/include/reactos/undocuser.h | 2 +- win32ss/user/ntuser/ime.c | 2 +- win32ss/user/user32/misc/logon.c | 4 ++-- win32ss/user/user32/windows/input.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index f396c58a7ba..d742e3a541c 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -399,7 +399,7 @@ typedef enum tagSETIMEHOTKEY_ACTION { SETIMEHOTKEY_DELETE = 1, SETIMEHOTKEY_ADD, - SETIMEHOTKEY_DELETEALL + SETIMEHOTKEY_INITIALIZE } SETIMEHOTKEY_ACTION;
#ifdef __cplusplus diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 35d8b66bda5..7f252e36af9 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -403,7 +403,7 @@ IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DW IntAddImeHotKey(&gpImeHotKeyList, pNode); return TRUE;
- case SETIMEHOTKEY_DELETEALL: + case SETIMEHOTKEY_INITIALIZE: IntFreeImeHotKeys(); return TRUE;
diff --git a/win32ss/user/user32/misc/logon.c b/win32ss/user/user32/misc/logon.c index a763e24e370..69580735fb9 100644 --- a/win32ss/user/user32/misc/logon.c +++ b/win32ss/user/user32/misc/logon.c @@ -104,8 +104,8 @@ UpdatePerUserSystemParameters(DWORD dwReserved, // Update Imm support and load Imm32.dll. UpdatePerUserImmEnabling();
- /* Delete all the IME hotkeys */ - CliImmInitializeHotKeys(SETIMEHOTKEY_DELETEALL, NULL); + /* Initialize the IME hotkeys */ + CliImmInitializeHotKeys(SETIMEHOTKEY_INITIALIZE, NULL);
/* Load Preload keyboard layouts */ IntLoadPreloadKeyboardLayouts(); diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index a15e9b57810..220dd4c3cfe 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -428,11 +428,11 @@ VOID APIENTRY CliImmInitializeHotKeys(DWORD dwAction, HKL hKL) BYTE bFlags = 0; BOOL bCheck;
- NtUserSetImeHotKey(0, 0, 0, NULL, SETIMEHOTKEY_DELETEALL); + NtUserSetImeHotKey(0, 0, 0, NULL, SETIMEHOTKEY_INITIALIZE);
bCheck = CliGetImeHotKeysFromRegistry();
- if (dwAction == SETIMEHOTKEY_DELETEALL) + if (dwAction == SETIMEHOTKEY_INITIALIZE) { LangID = LANGIDFROMLCID(GetUserDefaultLCID()); IntSetFeKeyboardFlags(LangID, &bFlags);