Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:16:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BOOTDATA][NTUSER] Add DontLoadCTFIME and use it (#8110)

Browse source 
Improve CTF IME customization.
Use the proper names for CTF IME.
JIRA issue: CORE-19268
- In the registry key "HKLM\SOFTWARE\Microsoft\
  Windows NT\CurrentVersion\IMM", add
  DontLoadCTFIME value and set it to 1.
- Delete LoadCTFIME value to avoid user
  confusing.
- Rename UserIsCiceroEnabled function
  as UserIsCTFIMEEnabled.
- Rename SRVINFO_CICERO_ENABLED
  flag as SRVINFO_CTFIME_ENABLED.
This commit is contained in:
Katayama Hirofumi MZ 2025-06-12 13:55:49 +09:00 • committed by GitHub
parent 474212939d
commit d809cd0f7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boot/bootdata/hivesft.inf
View file

@ -525,7 +525,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IME Compatibility",,0x0000001
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","IME File",2,"msctfime.ime" 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 its name 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 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","DontLoadCTFIME",0x00010003,1 ; Disable CTF IME
; DOS Device ports ; DOS Device ports
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports","COM1:",2,"9600,n,8,1" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports","COM1:",2,"9600,n,8,1"

4
win32ss/include/ntuser.h
View file

@ -948,7 +948,7 @@ typedef LONG_PTR
#define SRVINFO_DBCSENABLED 0x0002 #define SRVINFO_DBCSENABLED 0x0002
#define SRVINFO_IMM32 0x0004 #define SRVINFO_IMM32 0x0004
#define SRVINFO_APIHOOK 0x0010 #define SRVINFO_APIHOOK 0x0010
#define SRVINFO_CICERO_ENABLED 0x0020 #define SRVINFO_CTFIME_ENABLED 0x0020
#define SRVINFO_KBDPREF 0x0080 #define SRVINFO_KBDPREF 0x0080
#define NUM_SYSCOLORS 31 #define NUM_SYSCOLORS 31
@ -1210,7 +1210,7 @@ typedef struct tagCURSORDATA
#define COMPAT_FLAG_2_CICERO_DISABLED 2 #define COMPAT_FLAG_2_CICERO_DISABLED 2
#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) #define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32))
#define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CTFIME_ENABLED))
#define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) #define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)
#define IS_CICERO_COMPAT_DISABLED() \ #define IS_CICERO_COMPAT_DISABLED() \
(GetWin32ClientInfo()->dwCompatFlags2 & COMPAT_FLAG_2_CICERO_DISABLED) (GetWin32ClientInfo()->dwCompatFlags2 & COMPAT_FLAG_2_CICERO_DISABLED)

10
win32ss/user/ntuser/metric.c
View file

@ -28,16 +28,12 @@ BOOL FASTCALL UserIsIMMEnabled(VOID)
return !!RegGetSectionDWORD(L"IMM", L"LoadIMM", FALSE); return !!RegGetSectionDWORD(L"IMM", L"LoadIMM", FALSE);
} }
BOOL FASTCALL UserIsCiceroEnabled(VOID) BOOL FASTCALL UserIsCTFIMEEnabled(VOID)
{ {
#if 1
return FALSE; /* FIXME: Cicero is not supported yet */
#else
if (RegGetSectionDWORD(L"IMM", L"DontLoadCTFIME", FALSE)) if (RegGetSectionDWORD(L"IMM", L"DontLoadCTFIME", FALSE))
return FALSE; return FALSE;
return UserIsIMMEnabled(); return UserIsIMMEnabled();
#endif
} }
BOOL BOOL
@ -201,8 +197,8 @@ InitMetrics(VOID)
if (UserIsIMMEnabled()) if (UserIsIMMEnabled())
gpsi->dwSRVIFlags |= SRVINFO_IMM32; /* IME Support */ gpsi->dwSRVIFlags |= SRVINFO_IMM32; /* IME Support */
if (UserIsCiceroEnabled()) if (UserIsCTFIMEEnabled())
gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED; /* Cicero support */ gpsi->dwSRVIFlags |= SRVINFO_CTFIME_ENABLED; /* CTF IME support */
Setup = TRUE; Setup = TRUE;

2
win32ss/user/ntuser/userfuncs.h
View file

@ -85,7 +85,7 @@ BOOL NTAPI InitMetrics(VOID);
LONG NTAPI UserGetSystemMetrics(ULONG Index); LONG NTAPI UserGetSystemMetrics(ULONG Index);
BOOL FASTCALL UserIsDBCSEnabled(VOID); BOOL FASTCALL UserIsDBCSEnabled(VOID);
BOOL FASTCALL UserIsIMMEnabled(VOID); BOOL FASTCALL UserIsIMMEnabled(VOID);
BOOL FASTCALL UserIsCiceroEnabled(VOID); BOOL FASTCALL UserIsCTFIMEEnabled(VOID);
/*************** KEYBOARD.C ***************/ /*************** KEYBOARD.C ***************/