From 817f89466d931bb585566f1104cfb8daed290534 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 29 May 2024 01:14:52 +0900 Subject: [PATCH] [BOOTDATA][IMM32][NTUSER] Follow-up to #6961 (#6962) JIRA issue: CORE-19320 - Delete "(brain-dead)". - Fix "despite of" as "despite". - Use "%S" instead of debugstr_w. --- boot/bootdata/hivesft.inf | 2 +- dll/win32/imm32/utils.c | 2 +- win32ss/user/ntuser/metric.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 5bdc0609c00..9aba4f94d8c 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -513,7 +513,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\HotFix",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IME Compatibility",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","IME File",2,"msctfime.ime" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,0 ; "LoadIMM" means Cicero despite of its name (brain-dead) +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,0 ; "LoadIMM" means Cicero despite its name HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadCTFIME",0x00010003,0 ; DOS Device ports diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index f4b22c0ae0f..c9c4effe783 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -774,7 +774,7 @@ static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) /* NOTE: The IME module must contain a version info of input method driver. */ if (pFixed->dwFileType != VFT_DRV || pFixed->dwFileSubtype != VFT2_DRV_INPUTMETHOD) { - ERR("DLL %s is not an IME\n", debugstr_w(pInfoEx->wszImeFile)); + ERR("DLL %S is not an IME\n", pInfoEx->wszImeFile); return FALSE; } diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index c48613889a7..e070bb0fa51 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -24,7 +24,7 @@ BOOL FASTCALL UserIsIMMEnabled(VOID) if (NLS_MB_CODE_PAGE_TAG) return TRUE; - /* "LoadIMM" means Cicero despite of its name (brain-dead) */ + /* "LoadIMM" means Cicero despite its name */ return !!RegGetSectionDWORD(L"IMM", L"LoadIMM", FALSE); }