From c0b4db14de2af1651cf67a067346c41842f62e4f Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sat, 24 Feb 2024 01:53:16 +0900 Subject: [PATCH] [BOOTDATA][NTUSER] Prepare for CTF IME Part 1 (#6524) Supporting TIPs... JIRA issue: CORE-19360 - Add "IME File" registry value as "msctfime.ime" at HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM. - Modify UserIsCiceroEnabled function for preparation of CTF IME. --- boot/bootdata/hivesft.inf | 1 + win32ss/user/ntuser/metric.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 2d4854ea0cd..ea41dfa1e2e 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -512,6 +512,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontMapper",,0x00000012 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,1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadCTFIME",0x00010003,0 diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index b5024013e10..0d516712912 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -29,7 +29,14 @@ BOOL FASTCALL UserIsIMMEnabled(VOID) BOOL FASTCALL UserIsCiceroEnabled(VOID) { +#if 1 return FALSE; /* FIXME: Cicero is not supported yet */ +#else + if (RegGetSectionDWORD(L"IMM", L"DontLoadCTFIME", FALSE)) + return FALSE; + + return UserIsIMMEnabled(); +#endif } BOOL