Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Fix 2 compiler warnings for the rls-cfg 'unused variable' (#6539)
by Joachim Henze 26 Feb '24

26 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a08b83a90ba494dfe62b8… commit a08b83a90ba494dfe62b8bf618e548c4926666ea Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Feb 26 13:42:13 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 26 13:42:13 2024 +0100 [SHELL32] Fix 2 compiler warnings for the rls-cfg 'unused variable' (#6539) I noticed it on releases/0.4.10 with the RosBEWin2.1.6 GCC4.7.2 *rls* configuration: C:/0410rls/reactos/dll/win32/shell32/dialogs/filetypes.cpp: In function 'BOOL FileTypesDlg_InsertToLV(HWND, LPCWSTR, INT, LPCWSTR)': C:/0410rls/reactos/dll/win32/shell32/dialogs/filetypes.cpp:663:9: warning: variable 'iLargeImage' set but not used [-Wunused-but-set-variable] C:/0410rls/reactos/dll/win32/shell32/dialogs/filetypes.cpp: In function 'BOOL EditTypeDlg_UpdateEntryIcon(HWND, PEDITTYPE_DIALOG, LPCWSTR, INT)': C:/0410rls/reactos/dll/win32/shell32/dialogs/filetypes.cpp:1040:9: warning: unused variable 'iLargeImage' [-Wunused-variable] But I do assume, that MSVC compilers would also complain about that in *rls* cfg. Please notice that before 0.4.10-dev-202-g 698cbc6184722f29389ccd75ca96d88d6cd4b010 which did splitup and restructure the code this function was placed within the file folder_options.cpp and was named InsertFileType(HWND hDlgCtrl, WCHAR * szName, PINT iItem, WCHAR * szFile) and not yet within file_types.cpp with the new name FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFile) Back then it did not have the iLargeImage variable yet, and it also didn't warn upon rls-cfg-compilation. Therefore 0.4.10-dev-202-g 698cbc6184722f29389ccd75ca96d88d6cd4b010 from (#582) is indeed the *guilty revision* (2018-06-06). It was done in the very first commit of that PR https://github.com/reactos/reactos/pull/582/commits/2fe0eab7216425f6b963e55… It's bad practice to move and refactor/extend code in functionality within the very same commit, as it makes reviewing the changes much harder. That assert never fired for the last 6 years, therefore it would have been okay also to strip it together with the variable, but using DBG_UNREFERENCED_LOCAL_VARIABLE(iLargeImage); allows to keep the assert for master. --- dll/win32/shell32/dialogs/filetypes.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index ad394c8b1d3..2c245d717ba 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -666,6 +666,7 @@ FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFil iLargeImage = ImageList_AddIcon(himlLarge, Entry->hIconLarge); iSmallImage = ImageList_AddIcon(himlSmall, Entry->hIconSmall); ASSERT(iLargeImage == iSmallImage); + DBG_UNREFERENCED_LOCAL_VARIABLE(iLargeImage); } // Do not add excluded entries @@ -1041,6 +1042,7 @@ EditTypeDlg_UpdateEntryIcon(HWND hwndDlg, PEDITTYPE_DIALOG pEditType, INT iLargeImage = ImageList_AddIcon(himlLarge, pEntry->hIconLarge); INT iSmallImage = ImageList_AddIcon(himlSmall, pEntry->hIconSmall); ASSERT(iLargeImage == iSmallImage); + DBG_UNREFERENCED_LOCAL_VARIABLE(iLargeImage); INT iItem = ListView_GetNextItem(hListView, -1, LVNI_SELECTED); if (iItem != -1)

1 0

[reactos] 01/01: [SETUP:REACTOS] Set the default language and keyboard layout at startup
by Hermès Bélusca-Maïto 26 Feb '24

26 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed7dc311034a00dfefb9b… commit ed7dc311034a00dfefb9bd271cdf0dd7b1c01def Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 23 17:23:07 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 12:45:43 2024 +0100 [SETUP:REACTOS] Set the default language and keyboard layout at startup Retrieve the current ambient language and keyboard layout, that has been chosen in the "General language and keyboard layout selection" dialog when starting the LiveCD. A more robust solution will be developed later. --- base/setup/reactos/reactos.c | 100 +++++++++++++++++++++++++++---------------- base/setup/reactos/reactos.h | 4 -- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 55b18a227ea..2448f418888 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -25,6 +25,7 @@ */ #include "reactos.h" +#include <winnls.h> // For GetUserDefaultLCID() #define NTOS_MODE_USER #include <ndk/obfuncs.h> @@ -1401,11 +1402,16 @@ RestartDlgProc( BOOL LoadSetupData( IN OUT PSETUPDATA pSetupData) { - BOOL ret = TRUE; - // INFCONTEXT InfContext; - // TCHAR tmp[10]; - // DWORD LineLength; - // LONG Count; + pSetupData->PartitionList = CreatePartitionList(); + if (!pSetupData->PartitionList) + { + DPRINT1("Could not enumerate available disks; failing installation\n"); + return FALSE; + } + + pSetupData->NtOsInstallsList = CreateNTOSInstallationsList(pSetupData->PartitionList); + if (!pSetupData->NtOsInstallsList) + DPRINT1("Failed to get a list of NTOS installations; continue installation...\n"); /* Load the hardware, language and keyboard layout lists */ @@ -1415,54 +1421,73 @@ BOOL LoadSetupData( pSetupData->USetupData.LanguageList = CreateLanguageList(pSetupData->USetupData.SetupInf, pSetupData->DefaultLanguage); - pSetupData->PartitionList = CreatePartitionList(); + /* If not unattended, overwrite language and locale with + * the current ones of the running ReactOS instance */ + if (!IsUnattendedSetup) + { + LCID LocaleID = GetUserDefaultLCID(); - pSetupData->NtOsInstallsList = CreateNTOSInstallationsList(pSetupData->PartitionList); - if (!pSetupData->NtOsInstallsList) - DPRINT1("Failed to get a list of NTOS installations; continue installation...\n"); + StringCchPrintfW(pSetupData->DefaultLanguage, + _countof(pSetupData->DefaultLanguage), + L"%08lx", LocaleID); + StringCchPrintfW(pSetupData->USetupData.LocaleID, + _countof(pSetupData->USetupData.LocaleID), + L"%08lx", LocaleID); + } /* new part */ pSetupData->SelectedLanguageId = pSetupData->DefaultLanguage; - wcscpy(pSetupData->DefaultLanguage, pSetupData->USetupData.LocaleID); + wcscpy(pSetupData->DefaultLanguage, pSetupData->USetupData.LocaleID); // FIXME: In principle, only when unattended. pSetupData->USetupData.LanguageId = (LANGID)(wcstol(pSetupData->SelectedLanguageId, NULL, 16) & 0xFFFF); - pSetupData->USetupData.LayoutList = CreateKeyboardLayoutList(pSetupData->USetupData.SetupInf, pSetupData->SelectedLanguageId, pSetupData->DefaultKBLayout); + pSetupData->USetupData.LayoutList = CreateKeyboardLayoutList(pSetupData->USetupData.SetupInf, + pSetupData->SelectedLanguageId, + pSetupData->DefaultKBLayout); -#if 0 - // get default for keyboard and language - pSetupData->DefaultKBLayout = -1; - pSetupData->DefaultLang = -1; + /* If not unattended, overwrite keyboard layout with + * the current one of the running ReactOS instance */ + if (!IsUnattendedSetup) + { + C_ASSERT(_countof(pSetupData->DefaultKBLayout) >= KL_NAMELENGTH); + /* If the call fails, keep the default already stored in the buffer */ + GetKeyboardLayoutNameW(pSetupData->DefaultKBLayout); + } - // TODO: get defaults from underlaying running system - if (SetupFindFirstLine(pSetupData->USetupData.SetupInf, _T("NLS"), _T("DefaultLayout"), &InfContext)) + /* Change the default entries in the language and keyboard layout lists */ { - SetupGetStringField(&InfContext, 1, tmp, ARRAYSIZE(tmp), &LineLength); - for (Count = 0; Count < pSetupData->KbLayoutCount; Count++) + PGENERIC_LIST LanguageList = pSetupData->USetupData.LanguageList; + PGENERIC_LIST LayoutList = pSetupData->USetupData.LayoutList; + PGENERIC_LIST_ENTRY ListEntry; + + /* Search for default language */ + for (ListEntry = GetFirstListEntry(LanguageList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) + { + PCWSTR LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(pSetupData->DefaultLanguage, LocaleId)) { - if (_tcscmp(tmp, pSetupData->pKbLayouts[Count].LayoutId) == 0) - { - pSetupData->DefaultKBLayout = Count; - break; - } + DPRINT("found %S in LanguageList\n", LocaleId); + SetCurrentListEntry(LanguageList, ListEntry); + break; } } - if (SetupFindFirstLine(pSetupData->USetupData.SetupInf, _T("NLS"), _T("DefaultLanguage"), &InfContext)) + /* Search for default layout */ + for (ListEntry = GetFirstListEntry(LayoutList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) { - SetupGetStringField(&InfContext, 1, tmp, ARRAYSIZE(tmp), &LineLength); - for (Count = 0; Count < pSetupData->LangCount; Count++) + PCWSTR pszLayoutId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(pSetupData->DefaultKBLayout, pszLayoutId)) { - if (_tcscmp(tmp, pSetupData->pLanguages[Count].LangId) == 0) - { - pSetupData->DefaultLang = Count; - break; - } + DPRINT("Found %S in LayoutList\n", pszLayoutId); + SetCurrentListEntry(LayoutList, ListEntry); + break; } } -#endif + } - return ret; + return TRUE; } VOID @@ -1875,15 +1900,16 @@ _tWinMain(HINSTANCE hInst, goto Quit; } + /* Retrieve any supplemental options from the unattend file */ + CheckUnattendedSetup(&SetupData.USetupData); + SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) + /* Load extra setup data (HW lists etc...) */ if (!LoadSetupData(&SetupData)) goto Quit; hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL); - CheckUnattendedSetup(&SetupData.USetupData); - SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) - /* Cache commonly-used strings */ LoadStringW(hInst, IDS_ABORTSETUP, SetupData.szAbortMessage, ARRAYSIZE(SetupData.szAbortMessage)); LoadStringW(hInst, IDS_ABORTSETUP2, SetupData.szAbortTitle, ARRAYSIZE(SetupData.szAbortTitle)); diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 23e23afa132..071d642d713 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -136,10 +136,6 @@ typedef struct _SETUPDATA /* Settings */ LONG DestPartSize; // if partition doesn't exist, size of partition - LONG FSType; // file system type on partition - LONG FormatPart; // type of format the partition - - LONG SelectedLangId; // selected language (table index) /* txtsetup.sif data */ // LONG DefaultLang; // default language (table index)

1 0

[reactos] 01/01: [BOOTDATA][NTUSER] Prepare for CTF IME Part 1 (#6524)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0b4db14de2af1651cf67… commit c0b4db14de2af1651cf67a067346c41842f62e4f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 24 01:53:16 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 24 01:53:16 2024 +0900 [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

1 0

[reactos] 01/01: [WIN32SS] Fix const-ness of registry helper functions (#6525)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3768f0893dd69e5a43bcb… commit 3768f0893dd69e5a43bcb4fdead7b1d90785c4d2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 23 21:26:12 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 23 21:26:12 2024 +0900 [WIN32SS] Fix const-ness of registry helper functions (#6525) Improve code quality. JIRA issue: CORE-19360 - Fix const-ness of the arguments of win32k registry helper functions. - Compact UserIsIMMEnabled function. --- win32ss/gdi/ntgdi/misc.h | 8 ++++---- win32ss/user/ntuser/metric.c | 4 +--- win32ss/user/ntuser/misc/registry.c | 9 ++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 6b0e2f022b0..da0b043a1f5 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -46,19 +46,19 @@ RegQueryValue( VOID NTAPI -RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData); +RegWriteSZ(HKEY hkey, PCWSTR pwszValue, PWSTR pwszData); VOID NTAPI -RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData); +RegWriteDWORD(HKEY hkey, PCWSTR pwszValue, DWORD dwData); BOOL NTAPI -RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData); +RegReadDWORD(HKEY hkey, PCWSTR pwszValue, PDWORD pdwData); DWORD NTAPI -RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault); +RegGetSectionDWORD(LPCWSTR pszSection, PCWSTR pszValue, DWORD dwDefault); VOID FASTCALL diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index a72e1856edf..b5024013e10 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -21,12 +21,10 @@ BOOL FASTCALL UserIsDBCSEnabled(VOID) BOOL FASTCALL UserIsIMMEnabled(VOID) { - static WCHAR s_szLoadIMM[] = L"LoadIMM"; - if (NLS_MB_CODE_PAGE_TAG) return TRUE; - return !!RegGetSectionDWORD(L"IMM", s_szLoadIMM, TRUE); + return !!RegGetSectionDWORD(L"IMM", L"LoadIMM", FALSE); } BOOL FASTCALL UserIsCiceroEnabled(VOID) diff --git a/win32ss/user/ntuser/misc/registry.c b/win32ss/user/ntuser/misc/registry.c index 2d7ca4a3d0b..8a1cf574981 100644 --- a/win32ss/user/ntuser/misc/registry.c +++ b/win32ss/user/ntuser/misc/registry.c @@ -120,12 +120,11 @@ RegQueryValue( ExFreePoolWithTag(pInfo, TAG_TEMP); return Status; - } VOID NTAPI -RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData) +RegWriteSZ(HKEY hkey, PCWSTR pwszValue, PWSTR pwszData) { UNICODE_STRING ustrValue; UNICODE_STRING ustrData; @@ -137,7 +136,7 @@ RegWriteSZ(HKEY hkey, PWSTR pwszValue, PWSTR pwszData) VOID NTAPI -RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData) +RegWriteDWORD(HKEY hkey, PCWSTR pwszValue, DWORD dwData) { UNICODE_STRING ustrValue; @@ -147,7 +146,7 @@ RegWriteDWORD(HKEY hkey, PWSTR pwszValue, DWORD dwData) BOOL NTAPI -RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData) +RegReadDWORD(HKEY hkey, PCWSTR pwszValue, PDWORD pdwData) { NTSTATUS Status; ULONG cbSize = sizeof(DWORD); @@ -170,7 +169,7 @@ RegOpenSectionKey( DWORD NTAPI -RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault) +RegGetSectionDWORD(LPCWSTR pszSection, PCWSTR pszValue, DWORD dwDefault) { HKEY hKey; DWORD dwValue;

1 0

[reactos] 01/01: [MSCTFIME] Finish msctfime.cpp (#6523)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=febb589e00375868302fe… commit febb589e00375868302fe8d5abb3e801bc6af5b5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 23 19:58:21 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 23 19:58:21 2024 +0900 [MSCTFIME] Finish msctfime.cpp (#6523) Supporting TIPs... JIRA issue: CORE-19360 - Add some CicBridge methods (stub). - Implement ImeProcessKey, ImeToAsciiEx, ImeSetCompositionString, CtfImeEscapeEx, and CtfImeIsIME functions. --- dll/ime/msctfime/bridge.cpp | 62 ++++++++++ dll/ime/msctfime/bridge.h | 38 +++++++ dll/ime/msctfime/inputcontext.cpp | 71 ------------ dll/ime/msctfime/inputcontext.h | 7 -- dll/ime/msctfime/misc.cpp | 28 ++++- dll/ime/msctfime/misc.h | 5 +- dll/ime/msctfime/msctfime.cpp | 233 ++++++++++++++++++++++++++++++++------ dll/ime/msctfime/msctfime.h | 10 +- dll/ime/msctfime/profile.cpp | 7 ++ dll/ime/msctfime/profile.h | 2 + 10 files changed, 344 insertions(+), 119 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index cd966083264..9fdc8c4cc39 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -689,3 +689,65 @@ HRESULT CicBridge::Notify( { return E_NOTIMPL; // FIXME } + +/// @unimplemented +BOOL CicBridge::ProcessKey( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + WPARAM wParam, + LPARAM lParam, + CONST LPBYTE lpbKeyState, + INT *pnUnknown60) +{ + return FALSE; // FIXME +} + +/// @unimplemented +HRESULT +CicBridge::ToAsciiEx( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + UINT uVirtKey, + UINT uScanCode, + CONST LPBYTE lpbKeyState, + LPTRANSMSGLIST lpTransBuf, + UINT fuState, + HIMC hIMC, + UINT *pResult) +{ + return E_NOTIMPL; // FIXME +} + +/// @unimplemented +BOOL +CicBridge::SetCompositionString( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + DWORD dwIndex, + LPCVOID lpComp, + DWORD dwCompLen, + LPCVOID lpRead, + DWORD dwReadLen) +{ + return FALSE; // FIXME +} + +/// @unimplemented +LRESULT +CicBridge::EscapeKorean(TLS *pTLS, HIMC hIMC, UINT uSubFunc, LPVOID lpData) +{ + return 0; // FIXME +} + +/// @implemented +BOOL CicBridge::IsOwnDim(ITfDocumentMgr *pDocMgr) +{ + DWORD dwDimFlags = 0; + HRESULT hr = ::GetCompartmentDWORD(pDocMgr, GUID_COMPARTMENT_CTFIME_DIMFLAGS, + &dwDimFlags, FALSE); + if (FAILED(hr)) + return FALSE; + return !!(dwDimFlags & 0x1); +} diff --git a/dll/ime/msctfime/bridge.h b/dll/ime/msctfime/bridge.h index fa3919f6953..6e0853ccb7e 100644 --- a/dll/ime/msctfime/bridge.h +++ b/dll/ime/msctfime/bridge.h @@ -94,4 +94,42 @@ public: DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue); + + BOOL ProcessKey( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + WPARAM wParam, + LPARAM lParam, + CONST LPBYTE lpbKeyState, + INT *pnUnknown60); + + HRESULT ToAsciiEx( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + UINT uVirtKey, + UINT uScanCode, + CONST LPBYTE lpbKeyState, + LPTRANSMSGLIST lpTransBuf, + UINT fuState, + HIMC hIMC, + UINT *pResult); + + BOOL SetCompositionString( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + DWORD dwIndex, + LPCVOID lpComp, + DWORD dwCompLen, + LPCVOID lpRead, + DWORD dwReadLen); + + LRESULT EscapeKorean( + TLS *pTLS, + HIMC hIMC, + UINT uSubFunc, + LPVOID lpData); + + static BOOL IsOwnDim(ITfDocumentMgr *pDocMgr); }; diff --git a/dll/ime/msctfime/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index a208fe8885a..86ffb1f5627 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -308,74 +308,3 @@ HRESULT CicInputContext::EndReconvertString(CicIMCLock& imcLock) { return E_NOTIMPL; } - -/// Retrieves the IME information. -/// @implemented -HRESULT -Inquire( - _Out_ LPIMEINFO lpIMEInfo, - _Out_ LPWSTR lpszWndClass, - _In_ DWORD dwSystemInfoFlags, - _In_ HKL hKL) -{ - if (!lpIMEInfo) - return E_OUTOFMEMORY; - - StringCchCopyW(lpszWndClass, 64, L"MSCTFIME UI"); - lpIMEInfo->dwPrivateDataSize = 0; - - switch (LOWORD(hKL)) // Language ID - { - case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese - { - lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI | - IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY | - IME_PROP_KBD_CHAR_FIRST; - lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA | - IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = IME_SMODE_CONVERSATION | IME_SMODE_PLAURALCLAUSE; - lpIMEInfo->fdwSelectCaps = SELECT_CAP_SENTENCE | SELECT_CAP_CONVERSION; - lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD | - SCS_CAP_COMPSTR; - lpIMEInfo->fdwUICaps = UI_CAP_ROT90; - break; - } - case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean - { - lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI | - IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY | - IME_PROP_KBD_CHAR_FIRST; - lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = 0; - lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_COMPSTR; - lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; - lpIMEInfo->fdwUICaps = UI_CAP_ROT90; - break; - } - case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Simplified Chinese - case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Traditional Chinese - { - lpIMEInfo->fdwProperty = IME_PROP_SPECIAL_UI | IME_PROP_AT_CARET | - IME_PROP_NEED_ALTKEY | IME_PROP_KBD_CHAR_FIRST; - lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = SELECT_CAP_CONVERSION; - lpIMEInfo->fdwSelectCaps = 0; - lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD | - SCS_CAP_COMPSTR; - lpIMEInfo->fdwUICaps = UI_CAP_ROT90; - break; - } - default: // Otherwise - { - lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = 0; - lpIMEInfo->fdwSentenceCaps = 0; - lpIMEInfo->fdwSCSCaps = 0; - lpIMEInfo->fdwUICaps = 0; - lpIMEInfo->fdwSelectCaps = 0; - break; - } - } - - return S_OK; -} diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index 695aa5a158c..7ae33906fd5 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -13,13 +13,6 @@ class CInputContextOwnerCallBack; class CInputContextOwner; -HRESULT -Inquire( - _Out_ LPIMEINFO lpIMEInfo, - _Out_ LPWSTR lpszWndClass, - _In_ DWORD dwSystemInfoFlags, - _In_ HKL hKL); - /*********************************************************************** * CicInputContext * diff --git a/dll/ime/msctfime/misc.cpp b/dll/ime/msctfime/misc.cpp index 5b899c2ccfc..5e8ae5003f6 100644 --- a/dll/ime/msctfime/misc.cpp +++ b/dll/ime/msctfime/misc.cpp @@ -11,7 +11,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); /// East-Asian language? /// @implemented -BOOL IsEALang(LANGID LangID) +BOOL IsEALang(_In_opt_ LANGID LangID) { if (LangID == 0) { @@ -99,6 +99,32 @@ HIMC GetActiveContext(VOID) return ::ImmGetContext(hwndFocus); } +// MSIMTF.dll!MsimtfIsGuidMapEnable +typedef BOOL (WINAPI *FN_MsimtfIsGuidMapEnable)(HIMC hIMC, LPBOOL pbValue); +HINSTANCE g_hMSIMTF = NULL; + +/// @implemented +BOOL MsimtfIsGuidMapEnable(_In_ HIMC hIMC, _Out_opt_ LPBOOL pbValue) +{ + static FN_MsimtfIsGuidMapEnable s_fn = NULL; + if (!cicGetFN(g_hMSIMTF, s_fn, L"msimtf.dll", "MsimtfIsGuidMapEnable")) + return FALSE; + return s_fn(hIMC, pbValue); +} + +/// @implemented +BOOL IsVKDBEKey(_In_ UINT uVirtKey) +{ + switch (uVirtKey) + { + case VK_KANJI: + case VK_CONVERT: + return TRUE; + default: + return (VK_OEM_ATTN <= uVirtKey && uVirtKey <= VK_PA1); + } +} + /// @implemented ITfCategoryMgr *GetUIMCat(PCIC_LIBTHREAD pLibThread) { diff --git a/dll/ime/msctfime/misc.h b/dll/ime/msctfime/misc.h index d5d17f15f53..1e7ba0d716b 100644 --- a/dll/ime/msctfime/misc.h +++ b/dll/ime/msctfime/misc.h @@ -8,10 +8,13 @@ #pragma once BOOLEAN DllShutdownInProgress(VOID); -BOOL IsEALang(LANGID LangID); +BOOL IsEALang(_In_opt_ LANGID LangID); BOOL IsInteractiveUserLogon(VOID); BYTE GetCharsetFromLangId(_In_ DWORD dwValue); HIMC GetActiveContext(VOID); +BOOL MsimtfIsGuidMapEnable(_In_ HIMC hIMC, _Out_opt_ LPBOOL pbValue); +BOOL IsVKDBEKey(_In_ UINT uVirtKey); + ITfCategoryMgr *GetUIMCat(PCIC_LIBTHREAD pLibThread); HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index cd4b4af212c..60176204374 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -24,7 +24,7 @@ EXTERN_C void __cxa_pure_virtual(void) /// Selects or unselects the input context. /// @implemented -HRESULT +static HRESULT InternalSelectEx( _In_ HIMC hIMC, _In_ BOOL fSelect, @@ -77,7 +77,7 @@ InternalSelectEx( // Get logical font LOGFONTW lf; HDC hDC = ::GetDC(imcLock.get().hWnd); - HGDIOBJ hFont = GetCurrentObject(hDC, OBJ_FONT); + HGDIOBJ hFont = ::GetCurrentObject(hDC, OBJ_FONT); ::GetObjectW(hFont, sizeof(LOGFONTW), &lf); ::ReleaseDC(imcLock.get().hWnd, hDC); @@ -91,6 +91,77 @@ InternalSelectEx( return imcLock.m_hr; } +/// Retrieves the IME information. +/// @implemented +HRESULT +Inquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags, + _In_ HKL hKL) +{ + if (!lpIMEInfo) + return E_OUTOFMEMORY; + + StringCchCopyW(lpszWndClass, 64, L"MSCTFIME UI"); + lpIMEInfo->dwPrivateDataSize = 0; + + switch (LOWORD(hKL)) // Language ID + { + case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese + { + lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI | + IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY | + IME_PROP_KBD_CHAR_FIRST; + lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA | + IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = IME_SMODE_CONVERSATION | IME_SMODE_PLAURALCLAUSE; + lpIMEInfo->fdwSelectCaps = SELECT_CAP_SENTENCE | SELECT_CAP_CONVERSION; + lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD | + SCS_CAP_COMPSTR; + lpIMEInfo->fdwUICaps = UI_CAP_ROT90; + break; + } + case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean + { + lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI | + IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY | + IME_PROP_KBD_CHAR_FIRST; + lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = 0; + lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_COMPSTR; + lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; + lpIMEInfo->fdwUICaps = UI_CAP_ROT90; + break; + } + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Simplified Chinese + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Traditional Chinese + { + lpIMEInfo->fdwProperty = IME_PROP_SPECIAL_UI | IME_PROP_AT_CARET | + IME_PROP_NEED_ALTKEY | IME_PROP_KBD_CHAR_FIRST; + lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = SELECT_CAP_CONVERSION; + lpIMEInfo->fdwSelectCaps = 0; + lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD | + SCS_CAP_COMPSTR; + lpIMEInfo->fdwUICaps = UI_CAP_ROT90; + break; + } + default: // Otherwise + { + lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; + lpIMEInfo->fdwConversionCaps = 0; + lpIMEInfo->fdwSentenceCaps = 0; + lpIMEInfo->fdwSCSCaps = 0; + lpIMEInfo->fdwUICaps = 0; + lpIMEInfo->fdwSelectCaps = 0; + break; + } + } + + return S_OK; +} + /*********************************************************************** * ImeInquire (MSCTFIME.@) * @@ -229,13 +300,13 @@ ImeConfigure( if (!pTLS || !pTLS->m_pBridge || !pTLS->m_pThreadMgr) return FALSE; - CicBridge *pBridge = pTLS->m_pBridge; - ITfThreadMgr *pThreadMgr = pTLS->m_pThreadMgr; + auto pBridge = pTLS->m_pBridge; + auto pThreadMgr = pTLS->m_pThreadMgr; - if (dwMode & 1) + if (dwMode & 0x1) return (pBridge->ConfigureGeneral(pTLS, pThreadMgr, hKL, hWnd) == S_OK); - if (dwMode & 2) + if (dwMode & 0x2) return (pBridge->ConfigureRegisterWord(pTLS, pThreadMgr, hKL, hWnd, lpData) == S_OK); return FALSE; @@ -288,15 +359,55 @@ ImeEscape( return 0; } +/*********************************************************************** + * ImeProcessKey (MSCTFIME.@) + * + * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeProcessKey.html + */ EXTERN_C BOOL WINAPI ImeProcessKey( _In_ HIMC hIMC, - _In_ UINT uVirKey, + _In_ UINT uVirtKey, _In_ LPARAM lParam, _In_ CONST LPBYTE lpbKeyState) { - FIXME("stub:(%p, %u, %p, lpbKeyState)\n", hIMC, uVirKey, lParam, lpbKeyState); - return FALSE; + TRACE("(%p, %u, %p, lpbKeyState)\n", hIMC, uVirtKey, lParam, lpbKeyState); + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return FALSE; + + auto pBridge = pTLS->m_pBridge; + auto pThreadMgr = pTLS->m_pThreadMgr; + if (!pBridge || !pThreadMgr) + return FALSE; + + if (pTLS->m_dwFlags1 & 0x1) + { + ITfDocumentMgr *pDocMgr = NULL; + pThreadMgr->GetFocus(&pDocMgr); + if (pDocMgr && !CicBridge::IsOwnDim(pDocMgr)) + { + pDocMgr->Release(); + return FALSE; + } + + if (pDocMgr) + pDocMgr->Release(); + } + + LANGID LangID = LOWORD(::GetKeyboardLayout(0)); + if (((pTLS->m_dwFlags2 & 1) && MsimtfIsGuidMapEnable(hIMC, NULL)) || + ((lParam & (KF_ALTDOWN << 16)) && + (LangID == MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT)) && + IsVKDBEKey(uVirtKey))) + { + return FALSE; + } + + INT nUnknown60 = 0; + return pBridge->ProcessKey(pTLS, pThreadMgr, hIMC, uVirtKey, lParam, lpbKeyState, &nUnknown60); } /*********************************************************************** @@ -335,18 +446,37 @@ ImeSetActiveContext( return FALSE; } +/*********************************************************************** + * ImeToAsciiEx (MSCTFIME.@) + * + * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeToAsciiEx.html + */ EXTERN_C UINT WINAPI ImeToAsciiEx( - _In_ UINT uVirKey, + _In_ UINT uVirtKey, _In_ UINT uScanCode, _In_ CONST LPBYTE lpbKeyState, _Out_ LPTRANSMSGLIST lpTransMsgList, _In_ UINT fuState, _In_ HIMC hIMC) { - FIXME("stub:(%u, %u, %p, %p, %u, %p)\n", uVirKey, uScanCode, lpbKeyState, lpTransMsgList, + TRACE("(%u, %u, %p, %p, %u, %p)\n", uVirtKey, uScanCode, lpbKeyState, lpTransMsgList, fuState, hIMC); - return 0; + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return 0; + + auto pBridge = pTLS->m_pBridge; + auto pThreadMgr = pTLS->m_pThreadMgr; + if (!pBridge || !pThreadMgr) + return 0; + + UINT ret = 0; + HRESULT hr = pBridge->ToAsciiEx(pTLS, pThreadMgr, uVirtKey, uScanCode, lpbKeyState, + lpTransMsgList, fuState, hIMC, &ret); + return ((hr == S_OK) ? ret : 0); } /*********************************************************************** @@ -377,6 +507,12 @@ NotifyIME( return (hr == S_OK); } +/*********************************************************************** + * ImeSetCompositionString (MSCTFIME.@) + * + * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeSetCompositionStr… + */ EXTERN_C BOOL WINAPI ImeSetCompositionString( _In_ HIMC hIMC, @@ -386,23 +522,20 @@ ImeSetCompositionString( _In_opt_ LPCVOID lpRead, _In_ DWORD dwReadLen) { - FIXME("stub:(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen, + TRACE("(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - return FALSE; -} -EXTERN_C DWORD WINAPI -ImeGetImeMenuItems( - _In_ HIMC hIMC, - _In_ DWORD dwFlags, - _In_ DWORD dwType, - _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, - _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, - _In_ DWORD dwSize) -{ - FIXME("stub:(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", hIMC, dwFlags, dwType, lpImeParentMenu, - lpImeMenu, dwSize); - return 0; + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return FALSE; + + auto pBridge = pTLS->m_pBridge; + auto pThreadMgr = pTLS->m_pThreadMgr; + if (!pBridge || !pThreadMgr) + return FALSE; + + return pBridge->SetCompositionString(pTLS, pThreadMgr, hIMC, dwIndex, + lpComp, dwCompLen, lpRead, dwReadLen); } /*********************************************************************** @@ -459,6 +592,11 @@ CtfImeSelectEx( return pTLS->m_pBridge->SelectEx(pTLS, pTLS->m_pThreadMgr, hIMC, fSelect, hKL); } +/*********************************************************************** + * CtfImeEscapeEx (MSCTFIME.@) + * + * @implemented + */ EXTERN_C LRESULT WINAPI CtfImeEscapeEx( _In_ HIMC hIMC, @@ -466,8 +604,16 @@ CtfImeEscapeEx( _Inout_opt_ LPVOID lpData, _In_ HKL hKL) { - FIXME("stub:(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL); - return 0; + TRACE("(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL); + + if (LOWORD(hKL) != MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT)) + return 0; + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pBridge) + return 0; + + return pTLS->m_pBridge->EscapeKorean(pTLS, hIMC, uSubFunc, lpData); } /*********************************************************************** @@ -555,7 +701,6 @@ CtfImeCreateThreadMgr(VOID) return hr; } - /*********************************************************************** * CtfImeDestroyThreadMgr (MSCTFIME.@) * @@ -709,23 +854,37 @@ CtfImeDispatchDefImeMessage( if (!IsMsImeMessage(uMsg)) return 0; - HKL hKL = GetKeyboardLayout(0); + HKL hKL = ::GetKeyboardLayout(0); if (IS_IME_HKL(hKL)) return 0; - HWND hImeWnd = (HWND)SendMessageW(hWnd, WM_IME_NOTIFY, 0x17, 0); + HWND hImeWnd = (HWND)::SendMessageW(hWnd, WM_IME_NOTIFY, 0x17, 0); if (!IsWindow(hImeWnd)) return 0; - return SendMessageW(hImeWnd, uMsg, wParam, lParam); + return ::SendMessageW(hImeWnd, uMsg, wParam, lParam); } +/*********************************************************************** + * CtfImeIsIME (MSCTFIME.@) + * + * @implemented + */ EXTERN_C BOOL WINAPI CtfImeIsIME( _In_ HKL hKL) { - FIXME("stub:(%p)\n", hKL); - return FALSE; + TRACE("(%p)\n", hKL); + + if (IS_IME_HKL(hKL)) + return TRUE; + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pProfile) + return FALSE; + + // The return value of CicProfile::IsIME is brain-damaged + return !pTLS->m_pProfile->IsIME(hKL); } /*********************************************************************** @@ -766,7 +925,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) { g_hInst = hinstDLL; - InitializeCriticalSectionAndSpinCount(&g_csLock, 0); + ::InitializeCriticalSectionAndSpinCount(&g_csLock, 0); if (!TLS::Initialize()) return FALSE; @@ -793,7 +952,7 @@ VOID ProcessDetach(HINSTANCE hinstDLL) TFUninitLib(); } - DeleteCriticalSection(&g_csLock); + ::DeleteCriticalSection(&g_csLock); TLS::InternalDestroyTLS(); TLS::Uninitialize(); cicDoneUIFLib(); diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 48b184940df..60440f5a92e 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -35,11 +35,19 @@ #include <wine/debug.h> +extern HINSTANCE g_hInst; extern CRITICAL_SECTION g_csLock; typedef CicArray<GUID> CDispAttrPropCache; extern CDispAttrPropCache *g_pPropCache; +HRESULT +Inquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags, + _In_ HKL hKL); + DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); DEFINE_GUID(GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0x85A688F7, 0x6DC8, 0x4F17, 0xA8, 0x3A, 0xB1, 0x1C, 0x09, 0xCD, 0xD7, 0xBF); DEFINE_GUID(GUID_MODEBIAS_FILENAME, 0xD7F707FE, 0x44C6, 0x4FCA, 0x8E, 0x76, 0x86, 0xAB, 0x50, 0xC7, 0x93, 0x1B); @@ -58,5 +66,3 @@ DEFINE_GUID(GUID_PROP_MODEBIAS, 0x372E0716, 0x974F, 0x40AC, #include "sinks.h" #include "tls.h" #include "ui.h" - -extern HINSTANCE g_hInst; diff --git a/dll/ime/msctfime/profile.cpp b/dll/ime/msctfime/profile.cpp index 9ec7cd12ff3..d8a512987e9 100644 --- a/dll/ime/msctfime/profile.cpp +++ b/dll/ime/msctfime/profile.cpp @@ -171,3 +171,10 @@ CicProfile::GetActiveLanguageProfile( { return E_NOTIMPL; } + +/// The return value of CicProfile::IsIME is brain-damaged. +/// @unimplemented +BOOL CicProfile::IsIME(HKL hKL) +{ + return TRUE; +} diff --git a/dll/ime/msctfime/profile.h b/dll/ime/msctfime/profile.h index 2943750ad46..88c277c4b4d 100644 --- a/dll/ime/msctfime/profile.h +++ b/dll/ime/msctfime/profile.h @@ -48,4 +48,6 @@ public: HRESULT GetCodePageA(_Out_ UINT *puCodePage); HRESULT InitProfileInstance(_Inout_ TLS *pTLS); + + BOOL IsIME(HKL hKL); };

1 0

[reactos] 01/01: [MSCTFIME] Implement CtfImeSetActiveContextAlways (#6522)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=980ebf0694960551201fd… commit 980ebf0694960551201fdd132e0ec2475a9433fd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 23 17:43:13 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 23 17:43:13 2024 +0900 [MSCTFIME] Implement CtfImeSetActiveContextAlways (#6522) Supporting TIPs... JIRA issue: CORE-19360 - Move code of functions.cpp into misc.cpp and delete functions.cpp. - Add implementation to CicBridge::GetDocumentManager, CicBridge::CreateInputContext, and CicBridge::SetActiveContextAlways methods. - Implement NotifyIME, CtfImeSetActiveContextAlways, and CtfImeCreateInputContext functions. --- dll/ime/msctfime/CMakeLists.txt | 4 - dll/ime/msctfime/bridge.cpp | 153 ++++++++++---- dll/ime/msctfime/bridge.h | 21 +- dll/ime/msctfime/functions.cpp | 261 ------------------------ dll/ime/msctfime/functions.h | 63 ------ dll/ime/msctfime/misc.cpp | 438 ++++++++++++++++++++++++++++++++++++++-- dll/ime/msctfime/misc.h | 68 ++++++- dll/ime/msctfime/msctfime.cpp | 211 ++++++------------- dll/ime/msctfime/msctfime.h | 16 +- dll/ime/msctfime/tls.cpp | 32 +++ dll/ime/msctfime/tls.h | 44 +--- dll/ime/msctfime/ui.cpp | 2 +- dll/ime/msctfime/ui.h | 2 - 13 files changed, 725 insertions(+), 590 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 0e5acc805b0..717e879e119 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -1,12 +1,8 @@ -include_directories( - ${REACTOS_SOURCE_DIR}/win32ss/include) - spec2def(msctfime.ime msctfime.spec) list(APPEND SOURCE bridge.cpp - functions.cpp inputcontext.cpp misc.cpp msctfime.cpp diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index 50ac6622614..cd966083264 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Bridge + * PURPOSE: The bridge of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -65,22 +65,19 @@ CicBridge::~CicBridge() UnInitIMMX(pTLS); } -void CicBridge::GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext) +/// @implemented +ITfDocumentMgr* +CicBridge::GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext) { CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (pCicIC) - { - m_pDocMgr = pCicIC->m_pDocumentMgr; - m_pDocMgr->AddRef(); - } - else - { - m_pDocMgr->Release(); - m_pDocMgr = NULL; - } + if (!pCicIC) + return NULL; + + pCicIC->m_pDocumentMgr->AddRef(); + return pCicIC->m_pDocumentMgr; } -/// @unimplemented +/// @implemented HRESULT CicBridge::CreateInputContext( _Inout_ TLS *pTLS, @@ -100,45 +97,49 @@ CicBridge::CreateInputContext( CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + return S_OK; + + pCicIC = new(cicNoThrow) CicInputContext(m_cliendId, &m_LibThread, hIMC); if (!pCicIC) { - pCicIC = new(cicNoThrow) CicInputContext(m_cliendId, &m_LibThread, hIMC); - if (!pCicIC) - { - imeContext.unlock(); - imcLock.unlock(); - DestroyInputContext(pTLS, hIMC); - return E_OUTOFMEMORY; - } - - if (!pTLS->m_pThreadMgr) - { - pCicIC->Release(); - imeContext.unlock(); - imcLock.unlock(); - DestroyInputContext(pTLS, hIMC); - return E_NOINTERFACE; - } + imeContext.unlock(); + imcLock.unlock(); + DestroyInputContext(pTLS, hIMC); + return E_OUTOFMEMORY; + } - imeContext.get().m_pCicIC = pCicIC; + if (!pTLS->m_pThreadMgr) + { + pCicIC->Release(); + imeContext.unlock(); + imcLock.unlock(); + DestroyInputContext(pTLS, hIMC); + return E_NOINTERFACE; } + imeContext.get().m_pCicIC = pCicIC; + HRESULT hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); if (FAILED(hr)) { pCicIC->Release(); imeContext.get().m_pCicIC = NULL; + return hr; } - else + + HWND hWnd = imcLock.get().hWnd; + if (hWnd && hWnd == ::GetFocus()) { - if (imcLock.get().hWnd && imcLock.get().hWnd == ::GetFocus()) + ITfDocumentMgr *pDocMgr = GetDocumentManager(imeContext); + if (pDocMgr) { - GetDocumentManager(imeContext); - //FIXME + SetAssociate(pTLS, hWnd, hIMC, pTLS->m_pThreadMgr, pDocMgr); + pDocMgr->Release(); } } - return E_NOTIMPL; + return hr; } /// @implemented @@ -608,3 +609,83 @@ CicBridge::ConfigureRegisterWord( pFunction->Release(); return hr; } + +/// @unimplemented +void CicBridge::SetAssociate( + TLS *pTLS, + HWND hWnd, + HIMC hIMC, + ITfThreadMgr_P *pThreadMgr, + ITfDocumentMgr *pDocMgr) +{ + //FIXME +} + +HRESULT +CicBridge::SetActiveContextAlways(TLS *pTLS, HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) +{ + auto pThreadMgr = pTLS->m_pThreadMgr; + if (!pThreadMgr) + return E_OUTOFMEMORY; + + if (fActive) + { + if (!hIMC) + { + SetAssociate(pTLS, hWnd, hIMC, pThreadMgr, m_pDocMgr); + return S_OK; + } + + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + if (hIMC == ::ImmGetContext(hWnd)) + { + ITfDocumentMgr *pDocMgr = GetDocumentManager(imeContext); + if (pDocMgr) + { + SetAssociate(pTLS, imcLock.get().hWnd, hIMC, pThreadMgr, pDocMgr); + pDocMgr->Release(); + } + } + + return S_OK; + } + + if (hIMC && !IsEALang(LOWORD(hKL))) + { + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC->m_dwUnknown6_5[2] && !pCicIC->m_dwUnknown6_5[3]) + ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + } + + if (!hIMC || (::GetFocus() != hWnd) || (hIMC != ::ImmGetContext(hWnd))) + SetAssociate(pTLS, hWnd, hIMC, pThreadMgr, m_pDocMgr); + + return S_OK; +} + +/// @unimplemented +HRESULT CicBridge::Notify( + TLS *pTLS, + ITfThreadMgr *pThreadMgr, + HIMC hIMC, + DWORD dwAction, + DWORD dwIndex, + DWORD_PTR dwValue) +{ + return E_NOTIMPL; // FIXME +} diff --git a/dll/ime/msctfime/bridge.h b/dll/ime/msctfime/bridge.h index c8b8441203d..fa3919f6953 100644 --- a/dll/ime/msctfime/bridge.h +++ b/dll/ime/msctfime/bridge.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS msctfime.ime * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Bridge + * PURPOSE: The bridge of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -64,7 +64,7 @@ public: CicInputContext *pCicIC); void PostTransMsg(_In_ HWND hWnd, _In_ INT cTransMsgs, _In_ const TRANSMSG *pTransMsgs); - void GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext); + ITfDocumentMgr* GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext); HRESULT ConfigureGeneral(_Inout_ TLS* pTLS, @@ -77,4 +77,21 @@ public: _In_ HKL hKL, _In_ HWND hWnd, _Inout_opt_ LPVOID lpData); + + HRESULT SetActiveContextAlways(TLS *pTLS, HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL); + + void SetAssociate( + TLS *pTLS, + HWND hWnd, + HIMC hIMC, + ITfThreadMgr_P *pThreadMgr, + ITfDocumentMgr *pDocMgr); + + HRESULT Notify( + TLS *pTLS, + ITfThreadMgr *pThreadMgr, + HIMC hIMC, + DWORD dwAction, + DWORD dwIndex, + DWORD_PTR dwValue); }; diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp deleted file mode 100644 index e3133022023..00000000000 --- a/dll/ime/msctfime/functions.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/* - * PROJECT: ReactOS msctfime.ime - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: The functionalities of msctfime.ime - * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - */ - -#include "msctfime.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msctfime); - -/// @implemented -CFunctionProviderBase::CFunctionProviderBase(_In_ TfClientId clientId) -{ - m_clientId = clientId; - m_guid = GUID_NULL; - m_bstr = NULL; - m_cRefs = 1; -} - -/// @implemented -CFunctionProviderBase::~CFunctionProviderBase() -{ - if (!DllShutdownInProgress()) - ::SysFreeString(m_bstr); -} - -/// @implemented -BOOL -CFunctionProviderBase::Init( - _In_ REFGUID rguid, - _In_ LPCWSTR psz) -{ - m_bstr = ::SysAllocString(psz); - m_guid = rguid; - return (m_bstr != NULL); -} - -/// @implemented -STDMETHODIMP -CFunctionProviderBase::QueryInterface( - _In_ REFIID riid, - _Out_ LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfFunctionProvider)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CFunctionProviderBase::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CFunctionProviderBase::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -STDMETHODIMP CFunctionProviderBase::GetType(_Out_ GUID *guid) -{ - *guid = m_guid; - return S_OK; -} - -/// @implemented -STDMETHODIMP CFunctionProviderBase::GetDescription(_Out_ BSTR *desc) -{ - *desc = ::SysAllocString(m_bstr); - return (*desc ? S_OK : E_OUTOFMEMORY); -} - -/***********************************************************************/ - -/// @implemented -CFunctionProvider::CFunctionProvider(_In_ TfClientId clientId) : CFunctionProviderBase(clientId) -{ - Init(CLSID_CAImmLayer, L"MSCTFIME::Function Provider"); -} - -/// @implemented -STDMETHODIMP -CFunctionProvider::GetFunction( - _In_ REFGUID guid, - _In_ REFIID riid, - _Out_ IUnknown **func) -{ - *func = NULL; - - if (IsEqualGUID(guid, GUID_NULL) && - IsEqualIID(riid, IID_IAImmFnDocFeed)) - { - *func = new(cicNoThrow) CFnDocFeed(); - if (*func) - return S_OK; - } - - return E_NOINTERFACE; -} - -/***********************************************************************/ - -CFnDocFeed::CFnDocFeed() -{ - m_cRefs = 1; -} - -CFnDocFeed::~CFnDocFeed() -{ -} - -/// @implemented -STDMETHODIMP CFnDocFeed::QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IAImmFnDocFeed)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CFnDocFeed::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CFnDocFeed::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -STDMETHODIMP CFnDocFeed::DocFeed() -{ - TLS *pTLS = TLS::GetTLS(); - if (!pTLS) - return E_OUTOFMEMORY; - - HIMC hIMC = GetActiveContext(); - CicIMCLock imcLock(hIMC); - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (FAILED(imeContext.m_hr)) - return imeContext.m_hr; - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (!pCicIC) - return E_FAIL; - - UINT uCodePage = CP_ACP; - pTLS->m_pProfile->GetCodePageA(&uCodePage); - pCicIC->SetupDocFeedString(imcLock, uCodePage); - return S_OK; -} - -/// @implemented -STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() -{ - if (!TLS::GetTLS()) - return E_OUTOFMEMORY; - - HIMC hIMC = GetActiveContext(); - CicIMCLock imcLock(hIMC); - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (FAILED(imeContext.m_hr)) - return imeContext.m_hr; - - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (!pCicIC) - return E_FAIL; - - pCicIC->EscbClearDocFeedBuffer(imcLock, TRUE); - return S_OK; -} - -/// @unimplemented -STDMETHODIMP CFnDocFeed::StartReconvert() -{ - TLS *pTLS = TLS::GetTLS(); - if (!pTLS) - return E_OUTOFMEMORY; - auto *pThreadMgr = pTLS->m_pThreadMgr; - if (!pThreadMgr) - return E_OUTOFMEMORY; - - HIMC hIMC = GetActiveContext(); - CicIMCLock imcLock(hIMC); - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (FAILED(imeContext.m_hr)) - return imeContext.m_hr; - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (!pCicIC) - return E_FAIL; - - UINT uCodePage = CP_ACP; - pTLS->m_pProfile->GetCodePageA(&uCodePage); - - pCicIC->m_bReconverting = TRUE; - pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, 0); - pCicIC->EndReconvertString(imcLock); - pCicIC->m_bReconverting = FALSE; - return S_OK; -} - -/// @implemented -STDMETHODIMP CFnDocFeed::StartUndoCompositionString() -{ - TLS *pTLS = TLS::GetTLS(); - if (!pTLS) - return E_OUTOFMEMORY; - auto *pThreadMgr = pTLS->m_pThreadMgr; - if (!pThreadMgr) - return E_OUTOFMEMORY; - - HIMC hIMC = GetActiveContext(); - CicIMCLock imcLock(hIMC); - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (FAILED(imeContext.m_hr)) - return imeContext.m_hr; - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (!pCicIC) - return E_FAIL; - - UINT uCodePage = CP_ACP; - pTLS->m_pProfile->GetCodePageA(&uCodePage); - - pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, TRUE); - pCicIC->EndReconvertString(imcLock); - return S_OK; -} diff --git a/dll/ime/msctfime/functions.h b/dll/ime/msctfime/functions.h deleted file mode 100644 index d0b7d8c2ebe..00000000000 --- a/dll/ime/msctfime/functions.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * PROJECT: ReactOS msctfime.ime - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: The functionalities of msctfime.ime - * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - */ - -class CFunctionProviderBase : public ITfFunctionProvider -{ -protected: - TfClientId m_clientId; - GUID m_guid; - BSTR m_bstr; - LONG m_cRefs; - -public: - CFunctionProviderBase(_In_ TfClientId clientId); - virtual ~CFunctionProviderBase(); - - // IUnknown interface - STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfFunctionProvider interface - STDMETHODIMP GetType(_Out_ GUID *guid) override; - STDMETHODIMP GetDescription(_Out_ BSTR *desc) override; - //STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) = 0; - - BOOL Init(_In_ REFGUID rguid, _In_ LPCWSTR psz); -}; - -/***********************************************************************/ - -class CFunctionProvider : public CFunctionProviderBase -{ -public: - CFunctionProvider(_In_ TfClientId clientId); - - STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) override; -}; - -/***********************************************************************/ - -class CFnDocFeed : public IAImmFnDocFeed -{ - LONG m_cRefs; - -public: - CFnDocFeed(); - virtual ~CFnDocFeed(); - - // IUnknown interface - STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // IAImmFnDocFeed interface - STDMETHODIMP DocFeed() override; - STDMETHODIMP ClearDocFeedBuffer() override; - STDMETHODIMP StartReconvert() override; - STDMETHODIMP StartUndoCompositionString() override; -}; diff --git a/dll/ime/msctfime/misc.cpp b/dll/ime/msctfime/misc.cpp index 7cf38ad15b2..5b899c2ccfc 100644 --- a/dll/ime/msctfime/misc.cpp +++ b/dll/ime/msctfime/misc.cpp @@ -9,6 +9,185 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); +/// East-Asian language? +/// @implemented +BOOL IsEALang(LANGID LangID) +{ + if (LangID == 0) + { + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pProfile) + return FALSE; + + pTLS->m_pProfile->GetLangId(&LangID); + } + + switch (PRIMARYLANGID(LangID)) + { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + return TRUE; + + default: + return FALSE; + } +} + +typedef BOOLEAN (WINAPI *FN_DllShutdownInProgress)(VOID); + +/// This function calls ntdll!RtlDllShutdownInProgress. +/// It can detect the system is shutting down or not. +/// @implemented +BOOLEAN DllShutdownInProgress(VOID) +{ + HMODULE hNTDLL; + static FN_DllShutdownInProgress s_fnDllShutdownInProgress = NULL; + + if (s_fnDllShutdownInProgress) + return s_fnDllShutdownInProgress(); + + hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); + s_fnDllShutdownInProgress = + (FN_DllShutdownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress"); + if (!s_fnDllShutdownInProgress) + return FALSE; + + return s_fnDllShutdownInProgress(); +} + +/// This function checks if the current user logon session is interactive. +/// @implemented +BOOL IsInteractiveUserLogon(VOID) +{ + BOOL bOK, IsMember = FALSE; + PSID pSid; + SID_IDENTIFIER_AUTHORITY IdentAuth = { SECURITY_NT_AUTHORITY }; + + if (!AllocateAndInitializeSid(&IdentAuth, 1, SECURITY_INTERACTIVE_RID, + 0, 0, 0, 0, 0, 0, 0, &pSid)) + { + ERR("Error: %ld\n", GetLastError()); + return FALSE; + } + + bOK = CheckTokenMembership(NULL, pSid, &IsMember); + + if (pSid) + FreeSid(pSid); + + return bOK && IsMember; +} + +/// Gets the charset from a language ID. +/// @implemented +BYTE GetCharsetFromLangId(_In_ DWORD dwValue) +{ + CHARSETINFO info; + if (!::TranslateCharsetInfo((DWORD*)(DWORD_PTR)dwValue, &info, TCI_SRCLOCALE)) + return 0; + return info.ciCharset; +} + +/// Get the active input context. +/// @implemented +HIMC GetActiveContext(VOID) +{ + HWND hwndFocus = ::GetFocus(); + if (!hwndFocus) + hwndFocus = ::GetActiveWindow(); + return ::ImmGetContext(hwndFocus); +} + +/// @implemented +ITfCategoryMgr *GetUIMCat(PCIC_LIBTHREAD pLibThread) +{ + if (!pLibThread) + return NULL; + + if (pLibThread->m_pCategoryMgr) + return pLibThread->m_pCategoryMgr; + + if (FAILED(cicCoCreateInstance(CLSID_TF_CategoryMgr, NULL, CLSCTX_INPROC_SERVER, + IID_ITfCategoryMgr, (void **)&pLibThread->m_pCategoryMgr))) + { + return NULL; + } + return pLibThread->m_pCategoryMgr; +} + +/// @implemented +static HRESULT +LibEnumItemsInCategory(PCIC_LIBTHREAD pLibThread, REFGUID rguid, IEnumGUID **ppEnum) +{ + ITfCategoryMgr *pCat = GetUIMCat(pLibThread); + if (!pCat) + return E_FAIL; + return pCat->EnumItemsInCategory(rguid, ppEnum); +} + +/// @implemented +HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) +{ + if (!pLibThread) + return E_FAIL; + + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } + + if (FAILED(cicCoCreateInstance(CLSID_TF_DisplayAttributeMgr, NULL, CLSCTX_INPROC_SERVER, + IID_ITfDisplayAttributeMgr, + (void **)&pLibThread->m_pDisplayAttrMgr))) + { + return E_FAIL; + } + + IEnumGUID *pEnumGuid; + LibEnumItemsInCategory(pLibThread, GUID_TFCAT_DISPLAYATTRIBUTEPROPERTY, &pEnumGuid); + + HRESULT hr = E_OUTOFMEMORY; + + ::EnterCriticalSection(&g_csLock); + if (pEnumGuid && !g_pPropCache) + { + g_pPropCache = new(cicNoThrow) CDispAttrPropCache(); + if (g_pPropCache) + { + g_pPropCache->Add(GUID_PROP_ATTRIBUTE); + GUID guid; + while (pEnumGuid->Next(1, &guid, NULL) == S_OK) + { + if (!IsEqualGUID(guid, GUID_PROP_ATTRIBUTE)) + g_pPropCache->Add(guid); + } + hr = S_OK; + } + } + ::LeaveCriticalSection(&g_csLock); + + return hr; +} + +/// @implemented +HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) +{ + if (!pLibThread) + return E_FAIL; + + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } + + return S_OK; +} + +/***********************************************************************/ + /// @implemented HRESULT GetCompartment( @@ -179,11 +358,13 @@ static const MODEBIAS g_ModeBiasMap[] = { GUID_MODEBIAS_NONE, 0x00000000 }, }; +/// @implemented void CModeBias::SetModeBias(REFGUID rguid) { m_guid = rguid; } +/// @implemented GUID CModeBias::ConvertModeBias(LONG bias) { const GUID *pguid = &GUID_NULL; @@ -199,6 +380,7 @@ GUID CModeBias::ConvertModeBias(LONG bias) return *pguid; } +/// @implemented LONG CModeBias::ConvertModeBias(REFGUID guid) { for (auto& item : g_ModeBiasMap) @@ -211,25 +393,253 @@ LONG CModeBias::ConvertModeBias(REFGUID guid) /***********************************************************************/ -/// East-Asian language? /// @implemented -BOOL IsEALang(VOID) +CFunctionProviderBase::CFunctionProviderBase(_In_ TfClientId clientId) { - TLS *pTLS = TLS::GetTLS(); - if (!pTLS || !pTLS->m_pProfile) - return FALSE; + m_clientId = clientId; + m_guid = GUID_NULL; + m_bstr = NULL; + m_cRefs = 1; +} - LANGID LangID; - pTLS->m_pProfile->GetLangId(&LangID); +/// @implemented +CFunctionProviderBase::~CFunctionProviderBase() +{ + if (!DllShutdownInProgress()) + ::SysFreeString(m_bstr); +} - switch (PRIMARYLANGID(LangID)) +/// @implemented +BOOL +CFunctionProviderBase::Init( + _In_ REFGUID rguid, + _In_ LPCWSTR psz) +{ + m_bstr = ::SysAllocString(psz); + m_guid = rguid; + return (m_bstr != NULL); +} + +/// @implemented +STDMETHODIMP +CFunctionProviderBase::QueryInterface( + _In_ REFIID riid, + _Out_ LPVOID* ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfFunctionProvider)) { - case LANG_CHINESE: - case LANG_JAPANESE: - case LANG_KOREAN: - return TRUE; + *ppvObj = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} - default: - return FALSE; +/// @implemented +STDMETHODIMP_(ULONG) CFunctionProviderBase::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/// @implemented +STDMETHODIMP_(ULONG) CFunctionProviderBase::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/// @implemented +STDMETHODIMP CFunctionProviderBase::GetType(_Out_ GUID *guid) +{ + *guid = m_guid; + return S_OK; +} + +/// @implemented +STDMETHODIMP CFunctionProviderBase::GetDescription(_Out_ BSTR *desc) +{ + *desc = ::SysAllocString(m_bstr); + return (*desc ? S_OK : E_OUTOFMEMORY); +} + +/***********************************************************************/ + +/// @implemented +CFunctionProvider::CFunctionProvider(_In_ TfClientId clientId) : CFunctionProviderBase(clientId) +{ + Init(CLSID_CAImmLayer, L"MSCTFIME::Function Provider"); +} + +/// @implemented +STDMETHODIMP +CFunctionProvider::GetFunction( + _In_ REFGUID guid, + _In_ REFIID riid, + _Out_ IUnknown **func) +{ + *func = NULL; + + if (IsEqualGUID(guid, GUID_NULL) && + IsEqualIID(riid, IID_IAImmFnDocFeed)) + { + *func = new(cicNoThrow) CFnDocFeed(); + if (*func) + return S_OK; } + + return E_NOINTERFACE; +} + +/***********************************************************************/ + +CFnDocFeed::CFnDocFeed() +{ + m_cRefs = 1; +} + +CFnDocFeed::~CFnDocFeed() +{ +} + +/// @implemented +STDMETHODIMP CFnDocFeed::QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IAImmFnDocFeed)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +/// @implemented +STDMETHODIMP_(ULONG) CFnDocFeed::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/// @implemented +STDMETHODIMP_(ULONG) CFnDocFeed::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/// @implemented +STDMETHODIMP CFnDocFeed::DocFeed() +{ + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + pCicIC->SetupDocFeedString(imcLock, uCodePage); + return S_OK; +} + +/// @implemented +STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() +{ + if (!TLS::GetTLS()) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + pCicIC->EscbClearDocFeedBuffer(imcLock, TRUE); + return S_OK; +} + +/// @unimplemented +STDMETHODIMP CFnDocFeed::StartReconvert() +{ + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + auto *pThreadMgr = pTLS->m_pThreadMgr; + if (!pThreadMgr) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + + pCicIC->m_bReconverting = TRUE; + pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, 0); + pCicIC->EndReconvertString(imcLock); + pCicIC->m_bReconverting = FALSE; + return S_OK; +} + +/// @implemented +STDMETHODIMP CFnDocFeed::StartUndoCompositionString() +{ + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + auto *pThreadMgr = pTLS->m_pThreadMgr; + if (!pThreadMgr) + return E_OUTOFMEMORY; + + HIMC hIMC = GetActiveContext(); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return E_FAIL; + + UINT uCodePage = CP_ACP; + pTLS->m_pProfile->GetCodePageA(&uCodePage); + + pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, 0, TRUE); + pCicIC->EndReconvertString(imcLock); + return S_OK; } diff --git a/dll/ime/msctfime/misc.h b/dll/ime/msctfime/misc.h index 49cca38c0cc..d5d17f15f53 100644 --- a/dll/ime/msctfime/misc.h +++ b/dll/ime/msctfime/misc.h @@ -7,6 +7,17 @@ #pragma once +BOOLEAN DllShutdownInProgress(VOID); +BOOL IsEALang(LANGID LangID); +BOOL IsInteractiveUserLogon(VOID); +BYTE GetCharsetFromLangId(_In_ DWORD dwValue); +HIMC GetActiveContext(VOID); +ITfCategoryMgr *GetUIMCat(PCIC_LIBTHREAD pLibThread); +HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); +HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); + +/***********************************************************************/ + HRESULT GetCompartment( IUnknown *pUnknown, @@ -59,4 +70,59 @@ public: /***********************************************************************/ -BOOL IsEALang(VOID); +class CFunctionProviderBase : public ITfFunctionProvider +{ +protected: + TfClientId m_clientId; + GUID m_guid; + BSTR m_bstr; + LONG m_cRefs; + +public: + CFunctionProviderBase(_In_ TfClientId clientId); + virtual ~CFunctionProviderBase(); + + // IUnknown interface + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // ITfFunctionProvider interface + STDMETHODIMP GetType(_Out_ GUID *guid) override; + STDMETHODIMP GetDescription(_Out_ BSTR *desc) override; + //STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) = 0; + + BOOL Init(_In_ REFGUID rguid, _In_ LPCWSTR psz); +}; + +/***********************************************************************/ + +class CFunctionProvider : public CFunctionProviderBase +{ +public: + CFunctionProvider(_In_ TfClientId clientId); + + STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) override; +}; + +/***********************************************************************/ + +class CFnDocFeed : public IAImmFnDocFeed +{ + LONG m_cRefs; + +public: + CFnDocFeed(); + virtual ~CFnDocFeed(); + + // IUnknown interface + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // IAImmFnDocFeed interface + STDMETHODIMP DocFeed() override; + STDMETHODIMP ClearDocFeedBuffer() override; + STDMETHODIMP StartReconvert() override; + STDMETHODIMP StartUndoCompositionString() override; +}; diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 87ca208819c..cd4b4af212c 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -6,12 +6,9 @@ */ #include "msctfime.h" -#include <ndk/ldrfuncs.h> /* for RtlDllShutdownInProgress */ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); -typedef CicArray<GUID> CDispAttrPropCache; - HINSTANCE g_hInst = NULL; /* The instance of this module */ BOOL g_bWinLogon = FALSE; UINT g_uACP = CP_ACP; @@ -25,148 +22,6 @@ EXTERN_C void __cxa_pure_virtual(void) ERR("__cxa_pure_virtual\n"); } -typedef BOOLEAN (WINAPI *FN_DllShutdownInProgress)(VOID); - -/// This function calls ntdll!RtlDllShutdownInProgress. -/// It can detect the system is shutting down or not. -/// @implemented -EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID) -{ - HMODULE hNTDLL; - static FN_DllShutdownInProgress s_fnDllShutdownInProgress = NULL; - - if (s_fnDllShutdownInProgress) - return s_fnDllShutdownInProgress(); - - hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); - s_fnDllShutdownInProgress = - (FN_DllShutdownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress"); - if (!s_fnDllShutdownInProgress) - return FALSE; - - return s_fnDllShutdownInProgress(); -} - -/// This function checks if the current user logon session is interactive. -/// @implemented -static BOOL -IsInteractiveUserLogon(VOID) -{ - BOOL bOK, IsMember = FALSE; - PSID pSid; - SID_IDENTIFIER_AUTHORITY IdentAuth = { SECURITY_NT_AUTHORITY }; - - if (!AllocateAndInitializeSid(&IdentAuth, 1, SECURITY_INTERACTIVE_RID, - 0, 0, 0, 0, 0, 0, 0, &pSid)) - { - ERR("Error: %ld\n", GetLastError()); - return FALSE; - } - - bOK = CheckTokenMembership(NULL, pSid, &IsMember); - - if (pSid) - FreeSid(pSid); - - return bOK && IsMember; -} - -/// @implemented -ITfCategoryMgr *GetUIMCat(PCIC_LIBTHREAD pLibThread) -{ - if (!pLibThread) - return NULL; - - if (pLibThread->m_pCategoryMgr) - return pLibThread->m_pCategoryMgr; - - if (FAILED(cicCoCreateInstance(CLSID_TF_CategoryMgr, NULL, CLSCTX_INPROC_SERVER, - IID_ITfCategoryMgr, (void **)&pLibThread->m_pCategoryMgr))) - { - return NULL; - } - return pLibThread->m_pCategoryMgr; -} - -/// @implemented -HRESULT LibEnumItemsInCategory(PCIC_LIBTHREAD pLibThread, REFGUID rguid, IEnumGUID **ppEnum) -{ - ITfCategoryMgr *pCat = GetUIMCat(pLibThread); - if (!pCat) - return E_FAIL; - return pCat->EnumItemsInCategory(rguid, ppEnum); -} - -/// @implemented -HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) -{ - if (!pLibThread) - return E_FAIL; - - if (pLibThread->m_pDisplayAttrMgr) - { - pLibThread->m_pDisplayAttrMgr->Release(); - pLibThread->m_pDisplayAttrMgr = NULL; - } - - if (FAILED(cicCoCreateInstance(CLSID_TF_DisplayAttributeMgr, NULL, CLSCTX_INPROC_SERVER, - IID_ITfDisplayAttributeMgr, - (void **)&pLibThread->m_pDisplayAttrMgr))) - { - return E_FAIL; - } - - IEnumGUID *pEnumGuid; - LibEnumItemsInCategory(pLibThread, GUID_TFCAT_DISPLAYATTRIBUTEPROPERTY, &pEnumGuid); - - HRESULT hr = E_OUTOFMEMORY; - - ::EnterCriticalSection(&g_csLock); - if (pEnumGuid && !g_pPropCache) - { - g_pPropCache = new(cicNoThrow) CDispAttrPropCache(); - if (g_pPropCache) - { - g_pPropCache->Add(GUID_PROP_ATTRIBUTE); - GUID guid; - while (pEnumGuid->Next(1, &guid, NULL) == S_OK) - { - if (!IsEqualGUID(guid, GUID_PROP_ATTRIBUTE)) - g_pPropCache->Add(guid); - } - hr = S_OK; - } - } - ::LeaveCriticalSection(&g_csLock); - - return hr; -} - -/// @implemented -HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) -{ - if (!pLibThread) - return E_FAIL; - - if (pLibThread->m_pDisplayAttrMgr) - { - pLibThread->m_pDisplayAttrMgr->Release(); - pLibThread->m_pDisplayAttrMgr = NULL; - } - - return S_OK; -} - -/// Gets the charset from a language ID. -/// @implemented -BYTE GetCharsetFromLangId(_In_ DWORD dwValue) -{ - CHARSETINFO info; - if (!::TranslateCharsetInfo((DWORD*)(DWORD_PTR)dwValue, &info, TCI_SRCLOCALE)) - return 0; - return info.ciCharset; -} - /// Selects or unselects the input context. /// @implemented HRESULT @@ -236,8 +91,6 @@ InternalSelectEx( return imcLock.m_hr; } -class TLS; - /*********************************************************************** * ImeInquire (MSCTFIME.@) * @@ -245,6 +98,7 @@ class TLS; * * @implemented * @see CtfImeInquireExW + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeInquire.html */ EXTERN_C BOOL WINAPI @@ -264,6 +118,7 @@ ImeInquire( * * @implemented * @see ImmGetConversionListW + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeConversionList.ht… */ EXTERN_C DWORD WINAPI ImeConversionList( @@ -284,6 +139,7 @@ ImeConversionList( * * @implemented * @see ImeUnregisterWord + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeRegisterWord.html */ EXTERN_C BOOL WINAPI ImeRegisterWord( @@ -302,6 +158,7 @@ ImeRegisterWord( * * @implemented * @see ImeRegisterWord + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeUnregisterWord.ht… */ EXTERN_C BOOL WINAPI ImeUnregisterWord( @@ -320,6 +177,7 @@ ImeUnregisterWord( * * @implemented * @see ImeRegisterWord + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeGetRegisterWordSt… */ EXTERN_C UINT WINAPI ImeGetRegisterWordStyle( @@ -337,6 +195,7 @@ ImeGetRegisterWordStyle( * * @implemented * @see ImeRegisterWord + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeEnumRegisterWord.… */ EXTERN_C UINT WINAPI ImeEnumRegisterWord( @@ -351,6 +210,12 @@ ImeEnumRegisterWord( return 0; } +/*********************************************************************** + * ImeConfigure (MSCTFIME.@) + * + * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeConfigure.html + */ EXTERN_C BOOL WINAPI ImeConfigure( _In_ HKL hKL, @@ -380,6 +245,7 @@ ImeConfigure( * ImeDestroy (MSCTFIME.@) * * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeDestroy.html */ EXTERN_C BOOL WINAPI ImeDestroy( @@ -410,6 +276,7 @@ ImeDestroy( * * @implemented * @see CtfImeEscapeEx + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeEscape.html */ EXTERN_C LRESULT WINAPI ImeEscape( @@ -439,6 +306,7 @@ ImeProcessKey( * * @implemented * @see CtfImeSelectEx + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeSelect.html */ EXTERN_C BOOL WINAPI ImeSelect( @@ -456,6 +324,7 @@ ImeSelect( * * @implemented * @see CtfImeSetActiveContextAlways + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImeSetActiveContext.… */ EXTERN_C BOOL WINAPI ImeSetActiveContext( @@ -480,6 +349,12 @@ ImeToAsciiEx( return 0; } +/*********************************************************************** + * NotifyIME (MSCTFIME.@) + * + * @implemented + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/NotifyIME.html + */ EXTERN_C BOOL WINAPI NotifyIME( _In_ HIMC hIMC, @@ -487,8 +362,19 @@ NotifyIME( _In_ DWORD dwIndex, _In_ DWORD_PTR dwValue) { - FIXME("stub:(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue); - return FALSE; + TRACE("(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue); + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return FALSE; + + auto pBridge = pTLS->m_pBridge; + auto pThreadMgr = pTLS->m_pThreadMgr; + if (!pBridge || !pThreadMgr) + return FALSE; + + HRESULT hr = pBridge->Notify(pTLS, pThreadMgr, hIMC, dwAction, dwIndex, dwValue); + return (hr == S_OK); } EXTERN_C BOOL WINAPI @@ -704,11 +590,22 @@ CtfImeDestroyThreadMgr(VOID) return hr; } +/*********************************************************************** + * CtfImeCreateInputContext (MSCTFIME.@) + * + * @implemented + */ EXTERN_C HRESULT WINAPI CtfImeCreateInputContext( _In_ HIMC hIMC) { - return E_NOTIMPL; + TRACE("(%p)\n", hIMC); + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pBridge) + return E_OUTOFMEMORY; + + return pTLS->m_pBridge->CreateInputContext(pTLS, hIMC); } /*********************************************************************** @@ -729,6 +626,11 @@ CtfImeDestroyInputContext( return pTLS->m_pBridge->DestroyInputContext(pTLS, hIMC); } +/*********************************************************************** + * CtfImeSetActiveContextAlways (MSCTFIME.@) + * + * @implemented + */ EXTERN_C HRESULT WINAPI CtfImeSetActiveContextAlways( _In_ HIMC hIMC, @@ -736,10 +638,13 @@ CtfImeSetActiveContextAlways( _In_ HWND hWnd, _In_ HKL hKL) { - FIXME("stub:(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL); - return E_NOTIMPL; -} + TRACE("(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL); + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pBridge) + return E_OUTOFMEMORY; + return pTLS->m_pBridge->SetActiveContextAlways(pTLS, hIMC, fActive, hWnd, hKL); +} /*********************************************************************** * CtfImeProcessCicHotkey (MSCTFIME.@) diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 59a89d537f2..48b184940df 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -35,18 +35,10 @@ #include <wine/debug.h> -EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID); +extern CRITICAL_SECTION g_csLock; -HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); -HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); - -static inline HIMC GetActiveContext(VOID) -{ - HWND hwndFocus = ::GetFocus(); - if (!hwndFocus) - hwndFocus = ::GetActiveWindow(); - return ::ImmGetContext(hwndFocus); -} +typedef CicArray<GUID> CDispAttrPropCache; +extern CDispAttrPropCache *g_pPropCache; DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); DEFINE_GUID(GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0x85A688F7, 0x6DC8, 0x4F17, 0xA8, 0x3A, 0xB1, 0x1C, 0x09, 0xCD, 0xD7, 0xBF); @@ -55,13 +47,11 @@ DEFINE_GUID(GUID_MODEBIAS_NUMERIC, 0x4021766C, 0xE872, 0x48FD, DEFINE_GUID(GUID_MODEBIAS_URLHISTORY, 0x8B0E54D9, 0x63F2, 0x4C68, 0x84, 0xD4, 0x79, 0xAE, 0xE7, 0xA5, 0x9F, 0x09); DEFINE_GUID(GUID_MODEBIAS_DEFAULT, 0xF3DA8BD4, 0x0786, 0x49C2, 0x8C, 0x09, 0x68, 0x39, 0xD8, 0xB8, 0x4F, 0x58); DEFINE_GUID(GUID_PROP_MODEBIAS, 0x372E0716, 0x974F, 0x40AC, 0xA0, 0x88, 0x08, 0xCD, 0xC9, 0x2E, 0xBF, 0xBC); - #define GUID_MODEBIAS_NONE GUID_NULL #include "resource.h" #include "bridge.h" -#include "functions.h" #include "inputcontext.h" #include "misc.h" #include "profile.h" diff --git a/dll/ime/msctfime/tls.cpp b/dll/ime/msctfime/tls.cpp index c6db21cc61e..392106e96ed 100644 --- a/dll/ime/msctfime/tls.cpp +++ b/dll/ime/msctfime/tls.cpp @@ -11,6 +11,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); DWORD TLS::s_dwTlsIndex = (DWORD)-1; +/// @implemented +BOOL TLS::Initialize() +{ + s_dwTlsIndex = ::TlsAlloc(); + return s_dwTlsIndex != (DWORD)-1; +} + +/// @implemented +VOID TLS::Uninitialize() +{ + if (s_dwTlsIndex != (DWORD)-1) + { + ::TlsFree(s_dwTlsIndex); + s_dwTlsIndex = (DWORD)-1; + } +} + +/// @implemented +TLS* TLS::GetTLS() +{ + if (s_dwTlsIndex == (DWORD)-1) + return NULL; + + return InternalAllocateTLS(); +} + +/// @implemented +TLS* TLS::PeekTLS() +{ + return (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); +} + /// @implemented TLS* TLS::InternalAllocateTLS() { diff --git a/dll/ime/msctfime/tls.h b/dll/ime/msctfime/tls.h index 2d2c882a67e..87788650d46 100644 --- a/dll/ime/msctfime/tls.h +++ b/dll/ime/msctfime/tls.h @@ -7,8 +7,6 @@ #pragma once -class TLS; - class CicBridge; class CicProfile; @@ -29,45 +27,11 @@ public: DWORD m_NonEAComposition; DWORD m_cWnds; - /** - * @implemented - */ - static BOOL Initialize() - { - s_dwTlsIndex = ::TlsAlloc(); - return s_dwTlsIndex != (DWORD)-1; - } - - /** - * @implemented - */ - static VOID Uninitialize() - { - if (s_dwTlsIndex != (DWORD)-1) - { - ::TlsFree(s_dwTlsIndex); - s_dwTlsIndex = (DWORD)-1; - } - } - - /** - * @implemented - */ - static TLS* GetTLS() - { - if (s_dwTlsIndex == (DWORD)-1) - return NULL; - - return InternalAllocateTLS(); - } + static BOOL Initialize(); + static VOID Uninitialize(); - /** - * @implemented - */ - static TLS* PeekTLS() - { - return (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); - } + static TLS* GetTLS(); + static TLS* PeekTLS(); static TLS* InternalAllocateTLS(); static BOOL InternalDestroyTLS(); diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 7b6b5b2a2fc..650c88171fc 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -529,7 +529,7 @@ HRESULT UIComposition::CreateCompButtonWnd(HWND hwndParent, HIMC hIMC) if (!pTLS || !pTLS->NonEACompositionEnabled()) return S_OK; - if (IsEALang()) + if (IsEALang(0)) { if (m_pCompButtonFrameWindow) { diff --git a/dll/ime/msctfime/ui.h b/dll/ime/msctfime/ui.h index 72dd14c7761..3d9c822755a 100644 --- a/dll/ime/msctfime/ui.h +++ b/dll/ime/msctfime/ui.h @@ -44,8 +44,6 @@ public: /***********************************************************************/ -class CCompFrameWindow; - class CCompFinalizeButton : public CUIFToolbarButton { public:

1 0

[reactos] 01/01: [MSCTFIME][CICERO] Half-implement CIMEUIWindowHandler (#6521)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69b08be0e0f03f28ef5ed… commit 69b08be0e0f03f28ef5edfce46587f1b1cd42d32 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 23 13:45:00 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 23 13:45:00 2024 +0900 [MSCTFIME][CICERO] Half-implement CIMEUIWindowHandler (#6521) Supporting TIPs... JIRA issue: CORE-19360 - Add implementation to CIMEUIWindowHandler class. --- dll/ime/msctfime/bridge.cpp | 2 +- dll/ime/msctfime/inputcontext.cpp | 29 ++- dll/ime/msctfime/inputcontext.h | 22 ++- dll/ime/msctfime/misc.h | 2 + dll/ime/msctfime/msctfime.h | 2 + dll/ime/msctfime/ui.cpp | 365 ++++++++++++++++++++++++++++++++++++-- dll/ime/msctfime/ui.h | 4 + sdk/lib/cicero/ciccaret.h | 1 + 8 files changed, 407 insertions(+), 20 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index ed74a566328..50ac6622614 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -231,7 +231,7 @@ CicBridge::SelectEx( if (fSelect) { if (pCicIC) - pCicIC->m_dwUnknown6[1] &= ~1; + pCicIC->m_bCandidateOpen = FALSE; if (imcLock.get().fOpen) OnSetOpenStatus(pTLS, pThreadMgr, imcLock, pCicIC); } diff --git a/dll/ime/msctfime/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index 7362040c8fb..a208fe8885a 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -16,7 +16,6 @@ CicInputContext::CicInputContext( _In_ HIMC hIMC) { m_hIMC = hIMC; - m_guid = GUID_NULL; m_dwQueryPos = 0; m_cRefs = 1; } @@ -266,18 +265,44 @@ HRESULT CicInputContext::EscbCompComplete(CicIMCLock& imcLock) return E_NOTIMPL; } +/// @unimplemented +HRESULT CicInputContext::DelayedReconvertFuncCall(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT +CicInputContext::MsImeMouseHandler( + DWORD dwUnknown58, + DWORD dwUnknown59, + UINT keys, + CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + /// @unimplemented HRESULT CicInputContext::SetupReconvertString( CicIMCLock& imcLock, ITfThreadMgr_P *pThreadMgr, UINT uCodePage, - DWORD dwUnknown61, + UINT uMsg, BOOL bUndo) { return E_NOTIMPL; } +void CicInputContext::ClearPrevCandidatePos() +{ + m_dwUnknown8 = 0; + ZeroMemory(&m_rcCandidate1, sizeof(m_rcCandidate1)); + ZeroMemory(&m_CandForm, sizeof(m_CandForm)); + ZeroMemory(&m_rcCandidate2, sizeof(m_rcCandidate2)); + m_dwQueryPos = 0; +} + /// @unimplemented HRESULT CicInputContext::EndReconvertString(CicIMCLock& imcLock) { diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index 185d9b8161b..695aa5a158c 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -8,6 +8,7 @@ #pragma once #include "sinks.h" +#include "misc.h" class CInputContextOwnerCallBack; class CInputContextOwner; @@ -44,8 +45,10 @@ public: DWORD m_dwUnknown4[2]; DWORD m_dwQueryPos; DWORD m_dwUnknown5; - GUID m_guid; - DWORD m_dwUnknown6[11]; + CModeBias m_ModeBias; + DWORD m_dwUnknown6; + BOOL m_bCandidateOpen; + DWORD m_dwUnknown6_5[9]; BOOL m_bSelecting; BOOL m_bReconverting; LONG m_cCompLocks; @@ -53,7 +56,10 @@ public: WORD m_cGuidAtoms; WORD m_padding; DWORD m_adwGuidAtoms[256]; - DWORD m_dwUnknown8[17]; + DWORD m_dwUnknown8; + RECT m_rcCandidate1; + CANDIDATEFORM m_CandForm; + RECT m_rcCandidate2; TfClientId m_clientId; DWORD m_dwUnknown9; @@ -96,7 +102,15 @@ public: CicIMCLock& imcLock, ITfThreadMgr_P *pThreadMgr, UINT uCodePage, - DWORD dwUnknown61, + UINT uMsg, BOOL bUndo); + HRESULT MsImeMouseHandler( + DWORD dwUnknown58, + DWORD dwUnknown59, + UINT keys, + CicIMCLock& imcLock); + HRESULT EndReconvertString(CicIMCLock& imcLock); + HRESULT DelayedReconvertFuncCall(CicIMCLock& imcLock); + void ClearPrevCandidatePos(); }; diff --git a/dll/ime/msctfime/misc.h b/dll/ime/msctfime/misc.h index f1f600b4671..49cca38c0cc 100644 --- a/dll/ime/msctfime/misc.h +++ b/dll/ime/msctfime/misc.h @@ -50,6 +50,8 @@ class CModeBias public: GUID m_guid; + CModeBias() : m_guid(GUID_NULL) { } + GUID ConvertModeBias(LONG bias); LONG ConvertModeBias(REFGUID guid); void SetModeBias(REFGUID rguid); diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 28597863047..59a89d537f2 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -54,6 +54,8 @@ DEFINE_GUID(GUID_MODEBIAS_FILENAME, 0xD7F707FE, 0x44C6, 0x4FCA, DEFINE_GUID(GUID_MODEBIAS_NUMERIC, 0x4021766C, 0xE872, 0x48FD, 0x9C, 0xEE, 0x4E, 0xC5, 0xC7, 0x5E, 0x16, 0xC3); DEFINE_GUID(GUID_MODEBIAS_URLHISTORY, 0x8B0E54D9, 0x63F2, 0x4C68, 0x84, 0xD4, 0x79, 0xAE, 0xE7, 0xA5, 0x9F, 0x09); DEFINE_GUID(GUID_MODEBIAS_DEFAULT, 0xF3DA8BD4, 0x0786, 0x49C2, 0x8C, 0x09, 0x68, 0x39, 0xD8, 0xB8, 0x4F, 0x58); +DEFINE_GUID(GUID_PROP_MODEBIAS, 0x372E0716, 0x974F, 0x40AC, 0xA0, 0x88, 0x08, 0xCD, 0xC9, 0x2E, 0xBF, 0xBC); + #define GUID_MODEBIAS_NONE GUID_NULL #include "resource.h" diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index ed8455782c2..7b6b5b2a2fc 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -784,6 +784,88 @@ UIComposition::CompWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +/// @implemented +HRESULT UIComposition::OnImeNotifySetCompositionWindow(CicIMCLock& imcLock) +{ + return UpdateCompositionRect(imcLock); +} + +/// @unimplemented +HRESULT UIComposition::UpdateCompositionRect(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + +/// @implemented +INT UIComposition::GetLevelFromIMC(CicIMCLock& imcLock) +{ + DWORD dwStyle = imcLock.get().cfCompForm.dwStyle; + if (dwStyle == CFS_DEFAULT) + return 1; + if (!(dwStyle & (CFS_FORCE_POSITION | CFS_POINT | CFS_RECT))) + return 0; + + RECT rc; + ::GetClientRect(imcLock.get().hWnd, &rc); + if (!::PtInRect(&rc, imcLock.get().cfCompForm.ptCurrentPos)) + return 1; + + INPUTCONTEXT *pIC = &imcLock.get(); + if ((pIC->cfCompForm.dwStyle & CFS_RECT) && + (pIC->cfCompForm.rcArea.top == pIC->cfCompForm.rcArea.bottom) && + (pIC->cfCompForm.rcArea.left == pIC->cfCompForm.rcArea.right)) + { + return 1; + } + + return 2; +} + +/// @implemented +HRESULT UIComposition::OnImeSetContextAfter(CicIMCLock& imcLock) +{ + if ((!m_pDefCompFrameWindow || !::IsWindow(*m_pDefCompFrameWindow)) && !::IsWindow(m_CompStrs[0].m_hWnd)) + { + m_dwUnknown56[0] &= ~0x8000; + return S_OK; + } + + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + INT Level = GetLevelFromIMC(imcLock); + if ((Level == 1 || Level == 2) && (m_dwUnknown56[0] & 0x80000000) && m_dwUnknown56[1]) + { + DWORD dwCompStrLen = 0; + UpdateShowCompWndFlag(imcLock, &dwCompStrLen); + + if (Level == 1) + { + ::ShowWindow(*m_pDefCompFrameWindow, (m_bHasCompStr ? SW_SHOWNOACTIVATE : SW_HIDE)); + } + else if (Level == 2 && !m_bHasCompStr && dwCompStrLen) + { + for (INT iCompStr = 0; iCompStr < 3; ++iCompStr) + { + m_CompStrs[iCompStr].m_Caret.HideCaret(); + ::ShowWindow(m_CompStrs[iCompStr].m_Caret, SW_HIDE); + } + } + } + else + { + ::ShowWindow(*m_pDefCompFrameWindow, SW_HIDE); + + for (INT iCompStr = 0; iCompStr < 3; ++iCompStr) + { + m_CompStrs[iCompStr].m_Caret.HideCaret(); + ::ShowWindow(m_CompStrs[iCompStr].m_Caret, SW_HIDE); + } + } + + return S_OK; +} + /***********************************************************************/ // For GetWindowLongPtr/SetWindowLongPtr @@ -853,31 +935,166 @@ void UI::OnImeSetContext(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam) struct CIMEUIWindowHandler { static LRESULT CALLBACK ImeUIMsImeHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK ImeUIMsImeMouseHandler(HWND hWnd, WPARAM wParam, LPARAM lParam); + static HRESULT CALLBACK ImeUIMsImeMouseHandler(HWND hWnd, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK ImeUIMsImeModeBiasHandler(HWND hWnd, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK ImeUIMsImeReconvertRequest(HWND hWnd, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static HRESULT CALLBACK ImeUIDelayedReconvertFuncCall(HWND hWnd); + static HRESULT CALLBACK ImeUIOnLayoutChange(LPARAM lParam); + static HRESULT CALLBACK ImeUIPrivateHandler(UINT uMsg, WPARAM wParam, LPARAM lParam); + static LRESULT CALLBACK ImeUINotifyHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); }; -/// @unimplemented -LRESULT CALLBACK +/// @implemented +HRESULT CALLBACK CIMEUIWindowHandler::ImeUIMsImeMouseHandler(HWND hWnd, WPARAM wParam, LPARAM lParam) { - return 0; //FIXME + if ((BYTE)wParam == 0xFF) + return TRUE; + + CicIMCLock imcLock((HIMC)lParam); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return FALSE; + + HRESULT hr = E_FAIL; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + UINT keys = 0; + if (wParam & MK_LBUTTON) + keys |= 0x1; + if (wParam & MK_SHIFT) + keys |= 0x10; + if (wParam & MK_RBUTTON) + keys |= 0x2; + if (wParam & MK_MBUTTON) + keys |= 0x780000; + else if (wParam & MK_ALT) + keys |= 0xFF880000; + hr = pCicIC->MsImeMouseHandler(HIWORD(wParam), HIBYTE(LOWORD(wParam)), keys, imcLock); + } + + return hr; } -/// @unimplemented +/// @implemented +HRESULT CALLBACK CIMEUIWindowHandler::ImeUIOnLayoutChange(LPARAM lParam) +{ + CicIMCLock imcLock((HIMC)lParam); + if (FAILED(imcLock.m_hr)) + return S_OK; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return S_OK; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + auto pContextOwnerServices = pCicIC->m_pContextOwnerServices; + pContextOwnerServices->AddRef(); + pContextOwnerServices->OnLayoutChange(); + pContextOwnerServices->Release(); + } + + return S_OK; +} + +/// @implemented +HRESULT CALLBACK +CIMEUIWindowHandler::ImeUIPrivateHandler(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CicIMCLock imcLock((HIMC)lParam); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC && wParam == 0x10) + pCicIC->EscbClearDocFeedBuffer(imcLock, TRUE); + + return S_OK; +} + +/// @implemented LRESULT CALLBACK CIMEUIWindowHandler::ImeUIMsImeModeBiasHandler(HWND hWnd, WPARAM wParam, LPARAM lParam) { - return 0; //FIXME + if (!wParam) + return TRUE; + + CicIMCLock imcLock((HIMC)lParam); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return FALSE; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return FALSE; + + if (wParam == 1) + { + if (lParam == 0 || lParam == 1 || lParam == 4 || lParam == 0x10000) + { + GUID guid = pCicIC->m_ModeBias.ConvertModeBias((DWORD)lParam); + pCicIC->m_ModeBias.SetModeBias(guid); + + pCicIC->m_dwUnknown7[2] |= 1; + pCicIC->m_pContextOwnerServices->AddRef(); + pCicIC->m_pContextOwnerServices->OnAttributeChange(GUID_PROP_MODEBIAS); + pCicIC->m_pContextOwnerServices->Release(); + return TRUE; + } + } + else if (wParam == 2) + { + return pCicIC->m_ModeBias.ConvertModeBias(pCicIC->m_ModeBias.m_guid); + } + + return FALSE; } -/// @unimplemented +/// @implemented LRESULT CALLBACK CIMEUIWindowHandler::ImeUIMsImeReconvertRequest(HWND hWnd, WPARAM wParam, LPARAM lParam) { - return 0; //FIXME + if (wParam == 0x10000000) + return TRUE; + + HIMC hIMC = (HIMC)::GetWindowLongPtrW(hWnd, UI_GWLP_HIMC); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return FALSE; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return FALSE; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + TLS *pTLS = TLS::GetTLS(); + if (!pCicIC || !pTLS) + return FALSE; + + auto pThreadMgr = pTLS->m_pThreadMgr; + auto pProfile = pTLS->m_pProfile; + if (!pThreadMgr || !pProfile) + return FALSE; + + UINT uCodePage = 0; + pProfile->GetCodePageA(&uCodePage); + pCicIC->SetupReconvertString(imcLock, pThreadMgr, uCodePage, WM_MSIME_RECONVERT, FALSE); + pCicIC->EndReconvertString(imcLock); + return TRUE; } /// @implemented @@ -905,8 +1122,114 @@ CIMEUIWindowHandler::ImeUIMsImeHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR return 0; } +/// @implemented +HRESULT CALLBACK +CIMEUIWindowHandler::ImeUIDelayedReconvertFuncCall(HWND hWnd) +{ + HIMC hIMC = (HIMC)::GetWindowLongPtrW(hWnd, UI_GWLP_HIMC); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + pCicIC->DelayedReconvertFuncCall(imcLock); + return S_OK; +} + /// @unimplemented LRESULT CALLBACK +CIMEUIWindowHandler::ImeUINotifyHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HIMC hIMC = (HIMC)::GetWindowLongPtrW(hWnd, UI_GWLP_HIMC); + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + switch (wParam) + { + case IMN_CLOSECANDIDATE: + { + pCicIC->m_bCandidateOpen = FALSE; + HWND hImeWnd = ::ImmGetDefaultIMEWnd(NULL); + if (::IsWindow(hImeWnd)) + ::PostMessage(hImeWnd, WM_IME_NOTIFY, 0x10, (LPARAM)hIMC); + break; + } + case IMN_OPENCANDIDATE: + { + pCicIC->m_bCandidateOpen = TRUE; + pCicIC->ClearPrevCandidatePos(); + break; + } + case IMN_SETCANDIDATEPOS: + { + //FIXME + break; + } + case IMN_SETCOMPOSITIONFONT: + { + //FIXME + break; + } + case IMN_SETCOMPOSITIONWINDOW: + { + //FIXME + break; + } + case 0xF: + { + CIMEUIWindowHandler::ImeUIOnLayoutChange(lParam); + break; + } + case 0x10: + { + CIMEUIWindowHandler::ImeUIPrivateHandler(uMsg, 0x10, lParam); + break; + } + case 0x13: + { + CIMEUIWindowHandler::ImeUIOnLayoutChange(lParam); + break; + } + case 0x14: + { + //FIXME + break; + } + case 0x16: + { + ::SetTimer(hWnd, 2, 100, NULL); + break; + } + case 0x17: + { + return (LRESULT)hWnd; + } + case 0x10D: + { + //FIXME + break; + } + case 0x10E: + pCicIC->m_dwQueryPos = 0; + break; + } + } + + return 0; +} + +/// @implemented +LRESULT CALLBACK CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TLS *pTLS = TLS::GetTLS(); @@ -914,7 +1237,7 @@ CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPA { if (uMsg == WM_CREATE) return -1; - return DefWindowProcW(hWnd, uMsg, wParam, lParam); + return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); } switch (uMsg) @@ -954,7 +1277,7 @@ CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPA { pUI->m_pComp->OnImeCompositionUpdate(imcLock); ::SetTimer(hWnd, 0, 10, NULL); - //FIXME + pUI->m_pComp->m_bInComposition = TRUE; } break; } @@ -973,8 +1296,24 @@ CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPA } case WM_TIMER: { - //FIXME - ::KillTimer(hWnd, wParam); + switch (wParam) + { + case 0: + ::KillTimer(hWnd, wParam); + pUI->m_pComp->m_bInComposition = FALSE; + pUI->m_pComp->OnImeNotifySetCompositionWindow(imcLock); + break; + case 1: + ::KillTimer(hWnd, wParam); + pUI->m_pComp->OnImeSetContextAfter(imcLock); + break; + case 2: + ::KillTimer(hWnd, wParam); + CIMEUIWindowHandler::ImeUIDelayedReconvertFuncCall(hWnd); + break; + default: + break; + } break; } case WM_IME_NOTIFY: @@ -991,7 +1330,7 @@ CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPA { if (IsMsImeMessage(uMsg)) return CIMEUIWindowHandler::ImeUIMsImeHandler(hWnd, uMsg, wParam, lParam); - return DefWindowProcW(hWnd, uMsg, wParam, lParam); + return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); } } diff --git a/dll/ime/msctfime/ui.h b/dll/ime/msctfime/ui.h index 8d416312a72..72dd14c7761 100644 --- a/dll/ime/msctfime/ui.h +++ b/dll/ime/msctfime/ui.h @@ -175,11 +175,15 @@ public: HRESULT UpdateShowCompWndFlag(CicIMCLock& imcLock, DWORD *pdwCompStrLen); HRESULT UpdateFont(CicIMCLock& imcLock); + HRESULT UpdateCompositionRect(CicIMCLock& imcLock); LPWSTR GetCompStrBuffer(INT cchStr); + INT GetLevelFromIMC(CicIMCLock& imcLock); void OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd); HRESULT OnImeCompositionUpdate(CicIMCLock& imcLock); HRESULT OnImeEndComposition(); + HRESULT OnImeNotifySetCompositionWindow(CicIMCLock& imcLock); + HRESULT OnImeSetContextAfter(CicIMCLock& imcLock); void OnImeSetContext(CicIMCLock& imcLock, HWND hUIWnd, WPARAM wParam, LPARAM lParam); void OnPaintTheme(WPARAM wParam); void OnTimer(HWND hWnd); diff --git a/sdk/lib/cicero/ciccaret.h b/sdk/lib/cicero/ciccaret.h index 09044ee4884..503cd58049d 100644 --- a/sdk/lib/cicero/ciccaret.h +++ b/sdk/lib/cicero/ciccaret.h @@ -21,6 +21,7 @@ public: enum { TIMER_ID = 0x4F83AF91 }; CicCaret(); virtual ~CicCaret(); + operator HWND() const { return m_hWnd; } void CreateCaret(HWND hWnd, SIZE size); void DestroyCaret();

1 0

[reactos] 01/01: [MSCTFIME] Add UIComposition Part 2 (#6520)
by Katayama Hirofumi MZ 23 Feb '24

23 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=353edbd3f4aaefe56ecbe… commit 353edbd3f4aaefe56ecbe0b8c0de7cf811186d31 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 23 11:18:52 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 23 11:18:52 2024 +0900 [MSCTFIME] Add UIComposition Part 2 (#6520) Supporting TIPs... JIRA issue: CORE-19360 - Add implementation to UIComposition class. --- dll/ime/msctfime/misc.cpp | 25 +++ dll/ime/msctfime/misc.h | 4 + dll/ime/msctfime/tls.cpp | 22 +++ dll/ime/msctfime/tls.h | 2 + dll/ime/msctfime/ui.cpp | 412 +++++++++++++++++++++++++++++++++++++++++++--- dll/ime/msctfime/ui.h | 71 +++++++- 6 files changed, 504 insertions(+), 32 deletions(-) diff --git a/dll/ime/msctfime/misc.cpp b/dll/ime/msctfime/misc.cpp index 18e01939ada..7cf38ad15b2 100644 --- a/dll/ime/msctfime/misc.cpp +++ b/dll/ime/msctfime/misc.cpp @@ -208,3 +208,28 @@ LONG CModeBias::ConvertModeBias(REFGUID guid) } return 0; } + +/***********************************************************************/ + +/// East-Asian language? +/// @implemented +BOOL IsEALang(VOID) +{ + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pProfile) + return FALSE; + + LANGID LangID; + pTLS->m_pProfile->GetLangId(&LangID); + + switch (PRIMARYLANGID(LangID)) + { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + return TRUE; + + default: + return FALSE; + } +} diff --git a/dll/ime/msctfime/misc.h b/dll/ime/msctfime/misc.h index ca96a227f54..f1f600b4671 100644 --- a/dll/ime/msctfime/misc.h +++ b/dll/ime/msctfime/misc.h @@ -54,3 +54,7 @@ public: LONG ConvertModeBias(REFGUID guid); void SetModeBias(REFGUID rguid); }; + +/***********************************************************************/ + +BOOL IsEALang(VOID); diff --git a/dll/ime/msctfime/tls.cpp b/dll/ime/msctfime/tls.cpp index efb6f9726f5..c6db21cc61e 100644 --- a/dll/ime/msctfime/tls.cpp +++ b/dll/ime/msctfime/tls.cpp @@ -54,3 +54,25 @@ BOOL TLS::InternalDestroyTLS() ::TlsSetValue(s_dwTlsIndex, NULL); return TRUE; } + +/// @implemented +BOOL TLS::NonEACompositionEnabled() +{ + if (!m_NonEAComposition) + { + DWORD dwValue = 1; + + CicRegKey regKey; + LSTATUS error = regKey.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\CUAS")); + if (error == ERROR_SUCCESS) + { + error = regKey.QueryDword(TEXT("NonEAComposition"), &dwValue); + if (error != ERROR_SUCCESS) + dwValue = 1; + } + + m_NonEAComposition = dwValue; + } + + return (m_NonEAComposition == 2); +} diff --git a/dll/ime/msctfime/tls.h b/dll/ime/msctfime/tls.h index ae1a6000e9c..2d2c882a67e 100644 --- a/dll/ime/msctfime/tls.h +++ b/dll/ime/msctfime/tls.h @@ -71,4 +71,6 @@ public: static TLS* InternalAllocateTLS(); static BOOL InternalDestroyTLS(); + + BOOL NonEACompositionEnabled(); }; diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index fb8ae4105a9..ed8455782c2 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -287,8 +287,8 @@ void CDefCompFrameWindow::SetCompStrRect(INT nWidth, INT nHeight, BOOL bShow) Show(bShow); - ::MoveWindow(m_hwndDefCompFrame, GripperWidth + 2, 7, nWidth, nHeight, TRUE); - ::ShowWindow(m_hwndDefCompFrame, (bShow ? SW_SHOWNOACTIVATE : SW_HIDE)); + ::MoveWindow(m_hwndCompStr, GripperWidth + 2, 7, nWidth, nHeight, TRUE); + ::ShowWindow(m_hwndCompStr, (bShow ? SW_SHOWNOACTIVATE : SW_HIDE)); } /// @implemented @@ -342,11 +342,11 @@ STDMETHODIMP_(void) CDefCompFrameWindow::OnCreate(HWND hWnd) /// @implemented STDMETHODIMP_(BOOL) CDefCompFrameWindow::OnSetCursor(UINT uMsg, LONG x, LONG y) { - if (!::IsWindow(m_hwndDefCompFrame)) + if (!::IsWindow(m_hwndCompStr)) return FALSE; RECT rc; - ::GetWindowRect(m_hwndDefCompFrame, &rc); + ::GetWindowRect(m_hwndCompStr, &rc); MyScreenToClient(NULL, &rc); POINT pt = { x, y }; return ::PtInRect(&rc, pt); @@ -365,15 +365,15 @@ CDefCompFrameWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPA /// @implemented STDMETHODIMP_(void) CDefCompFrameWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG y) { - if (::IsWindow(m_hwndDefCompFrame)) + if (::IsWindow(m_hwndCompStr)) { RECT rc; - ::GetWindowRect(m_hwndDefCompFrame, &rc); + ::GetWindowRect(m_hwndCompStr, &rc); MyScreenToClient(NULL, &rc); POINT pt = { x, y }; if (::PtInRect(&rc, pt)) - ::SendMessage(m_hwndDefCompFrame, 0x7E8, 0, 0); + ::SendMessage(m_hwndCompStr, 0x7E8, 0, 0); } CUIFWindow::HandleMouseMsg(uMsg, x, y); @@ -381,27 +381,380 @@ STDMETHODIMP_(void) CDefCompFrameWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG /***********************************************************************/ +/// @implemented +POLYTEXTW *CPolyText::GetPolyAt(INT iItem) +{ + return &m_PolyTextArray[iItem]; +} + +/// @implemented +HRESULT CPolyText::ShiftPolyText(INT xDelta, INT yDelta) +{ + for (size_t iItem = 0; iItem < m_PolyTextArray.size(); ++iItem) + { + POLYTEXTW *pPolyText = &m_PolyTextArray[iItem]; + pPolyText->x += xDelta; + pPolyText->y += yDelta; + ::OffsetRect((LPRECT)&pPolyText->rcl, xDelta, yDelta); + } + return S_OK; +} + +/// @implemented +HRESULT CPolyText::RemoveLastLine(BOOL bHorizontal) +{ + size_t iItem, cItems = m_PolyTextArray.size(); + if (!cItems) + return E_FAIL; + + POLYTEXTW *pData1 = &m_PolyTextArray[cItems - 1]; + + for (iItem = 0; iItem < cItems; ++iItem) + { + POLYTEXTW *pData2 = &m_PolyTextArray[iItem]; + if (bHorizontal) + { + if (pData1->x == pData2->x) + break; + } + else + { + if (pData1->y == pData2->y) + break; + } + } + + if (iItem >= cItems) + return E_FAIL; + + m_PolyTextArray.Remove(iItem, cItems - iItem); + m_ValueArray.Remove(iItem, cItems - iItem); + return S_OK; +} + +/// @implemented +void CPolyText::RemoveAll() +{ + m_PolyTextArray.clear(); + m_ValueArray.clear(); +} + +/***********************************************************************/ + +/// @implemented +void COMPWND::_ClientToScreen(LPRECT prc) +{ + ::ClientToScreen(m_hWnd, (LPPOINT)prc); + ::ClientToScreen(m_hWnd, (LPPOINT)&prc->right); +} + +/***********************************************************************/ + // For GetWindowLongPtr/SetWindowLongPtr -#define UIGWLP_HIMC 0 -#define UIGWLP_UI sizeof(HIMC) -#define UIGWLP_SIZE (UIGWLP_UI + sizeof(UI*)) +#define UICOMP_GWLP_INDEX 0 +#define UICOMP_GWLP_SIZE (UICOMP_GWLP_INDEX + sizeof(INT)) /// @unimplemented -void UIComposition::OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd) +UIComposition::UIComposition(HWND hwndParent) { - //FIXME +} + +/// @implemented +UIComposition::~UIComposition() +{ + DestroyCompositionWindow(); + + if (m_hFont1) + { + ::DeleteObject(m_hFont1); + m_hFont1 = NULL; + } + + if (m_hFont2) + { + ::DeleteObject(m_hFont2); + m_hFont2 = NULL; + } + + if (m_strCompStr) + { + cicMemFree(m_strCompStr); + m_strCompStr = NULL; + } + + m_cchCompStr = 0; +} + +// @implemented +BOOL UIComposition::SendMessageToUI(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam) +{ + HWND hImeWnd = ImmGetDefaultIMEWnd(0); + if (!::IsWindow(hImeWnd)) + return TRUE; + TLS *pTLS = TLS::GetTLS(); + LRESULT ret; + if (pTLS && pTLS->m_cWnds > 1) + ret = ::SendMessage(imcLock.get().hWnd, WM_IME_NOTIFY, wParam, lParam); + else + ret = ::SendMessage(hImeWnd, WM_IME_NOTIFY, wParam, lParam); + return !ret; +} + +/// @implemented +HRESULT UIComposition::CreateDefFrameWnd(HWND hwndParent, HIMC hIMC) +{ + if (!m_pDefCompFrameWindow) + { + m_pDefCompFrameWindow = new(cicNoThrow) CDefCompFrameWindow(hIMC, 0x800000A4); + if (!m_pDefCompFrameWindow) + return E_OUTOFMEMORY; + if (!m_pDefCompFrameWindow->Initialize()) + { + delete m_pDefCompFrameWindow; + m_pDefCompFrameWindow = NULL; + return E_FAIL; + } + + m_pDefCompFrameWindow->Init(); + } + + m_pDefCompFrameWindow->CreateWnd(hwndParent); + return S_OK; +} + +/// @implemented +HRESULT UIComposition::CreateCompButtonWnd(HWND hwndParent, HIMC hIMC) +{ + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->NonEACompositionEnabled()) + return S_OK; + + if (IsEALang()) + { + if (m_pCompButtonFrameWindow) + { + delete m_pCompButtonFrameWindow; + m_pCompButtonFrameWindow = NULL; + } + return S_OK; + } + + if (!m_pCompButtonFrameWindow) + { + m_pCompButtonFrameWindow = new(cicNoThrow) CCompButtonFrameWindow(hIMC, 0x800000B4); + if (!m_pCompButtonFrameWindow) + return E_OUTOFMEMORY; + + if (!m_pCompButtonFrameWindow->Initialize()) + { + if (m_pCompButtonFrameWindow) + { + delete m_pCompButtonFrameWindow; + m_pCompButtonFrameWindow = NULL; + } + return E_FAIL; + } + + m_pCompButtonFrameWindow->Init(); + } + + m_pCompButtonFrameWindow->CreateWnd(hwndParent); + return S_OK; +} + +/// @implemented +HRESULT UIComposition::CreateCompositionWindow(CicIMCLock& imcLock, HWND hwndParent) +{ + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + if (!::IsWindow(hwndParent) || m_bHasCompWnd) + return E_FAIL; + + for (INT iCompStr = 0; iCompStr < 3; ++iCompStr) + { + DWORD style = WS_POPUP | WS_DISABLED; + HWND hwndCompStr = ::CreateWindowExW(0, L"MSCTFIME Composition", NULL, style, + 0, 0, 0, 0, hwndParent, NULL, g_hInst, NULL); + m_CompStrs[iCompStr].m_hWnd = hwndCompStr; + ::SetWindowLongPtrW(hwndCompStr, GWLP_USERDATA, (LONG_PTR)this); + ::SetWindowLongPtrW(hwndCompStr, UICOMP_GWLP_INDEX, iCompStr); + m_CompStrs[iCompStr].m_Caret.CreateCaret(hwndCompStr, m_CaretSize); + } + + HRESULT hr = CreateCompButtonWnd(hwndParent, imcLock.m_hIMC); + if (FAILED(hr)) + { + DestroyCompositionWindow(); + return E_OUTOFMEMORY; + } + + hr = CreateDefFrameWnd(hwndParent, imcLock.m_hIMC); + if (FAILED(hr)) + { + DestroyCompositionWindow(); + return E_OUTOFMEMORY; + } + + DWORD style = WS_CHILD | WS_DISABLED; + HWND hwndCompStr = ::CreateWindowExW(WS_EX_CLIENTEDGE, L"MSCTFIME Composition", NULL, style, + 0, 0, 0, 0, *m_pDefCompFrameWindow, NULL, g_hInst, NULL); + if (!hwndCompStr) + { + DestroyCompositionWindow(); + return E_OUTOFMEMORY; + } + + m_CompStrs[3].m_hWnd = hwndCompStr; + m_pDefCompFrameWindow->m_hwndCompStr = hwndCompStr; + ::SetWindowLongPtrW(hwndCompStr, GWLP_USERDATA, (LONG_PTR)this); + ::SetWindowLongPtrW(hwndCompStr, UICOMP_GWLP_INDEX, -1); + m_CompStrs[3].m_Caret.CreateCaret(hwndCompStr, m_CaretSize); + m_bHasCompWnd = TRUE; + + return S_OK; +} + +/// @implemented +HRESULT UIComposition::DestroyCompositionWindow() +{ + for (INT i = 0; i < 4; ++i) + { + COMPWND *pCompStr = &m_CompStrs[i]; + pCompStr->m_Caret.DestroyCaret(); + if (::IsWindow(pCompStr->m_hWnd)) + { + DestroyWindow(pCompStr->m_hWnd); + pCompStr->m_PolyText.RemoveAll(); + } + pCompStr->m_hWnd = NULL; + } + + if (m_pCompButtonFrameWindow) + { + ::DestroyWindow(*m_pCompButtonFrameWindow); + delete m_pCompButtonFrameWindow; + m_pCompButtonFrameWindow = NULL; + } + + if (m_pDefCompFrameWindow) + { + ::DestroyWindow(*m_pDefCompFrameWindow); + delete m_pDefCompFrameWindow; + m_pDefCompFrameWindow = NULL; + } + + return 0; +} + +// @implemented +BOOL UIComposition::InquireImeUIWndState(CicIMCLock& imcLock) +{ + BOOL bValue = FALSE; + UIComposition::SendMessageToUI(imcLock, 0x11u, (LPARAM)&bValue); + return bValue; +} + +/// @implemented +HRESULT UIComposition::UpdateShowCompWndFlag(CicIMCLock& imcLock, DWORD *pdwCompStrLen) +{ + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + if (!::IsWindow(imcLock.get().hWnd)) + return E_FAIL; + + CicIMCCLock<COMPOSITIONSTRING> compStr(imcLock.get().hCompStr); + if (FAILED(compStr.m_hr)) + return compStr.m_hr; + + if ((m_dwUnknown56[0] & 0x80000000) && compStr.get().dwCompStrLen) + m_bHasCompStr = TRUE; + else + m_bHasCompStr = FALSE; + + if (pdwCompStrLen) + *pdwCompStrLen = compStr.get().dwCompStrLen; + + return S_OK; +} + +/// @implemented +HRESULT UIComposition::UpdateFont(CicIMCLock& imcLock) +{ + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + if (m_hFont1) + ::DeleteObject(m_hFont1); + if (m_hFont2) + ::DeleteObject(m_hFont2); + + LOGFONTW lf = imcLock.get().lfFont.W; + m_hFont2 = ::CreateFontIndirectW(&lf); + + lf.lfEscapement = 0; + lf.lfOrientation = 0; + BOOL bVertical = (lf.lfFaceName[0] == L'@'); + if (bVertical) + { + MoveMemory(lf.lfFaceName, &lf.lfFaceName[1], sizeof(lf.lfFaceName) - sizeof(WCHAR)); + lf.lfFaceName[_countof(lf.lfFaceName) - 1] = UNICODE_NULL; + } + m_hFont1 = ::CreateFontIndirectW(&lf); + + return S_OK; +} + +// @implemented +void UIComposition::OnTimer(HWND hWnd) +{ + INT iCompStr = (INT)::GetWindowLongPtrW(hWnd, UICOMP_GWLP_INDEX); + if (iCompStr == -1) + m_CompStrs[3].m_Caret.OnTimer(); + else + m_CompStrs[iCompStr].m_Caret.OnTimer(); +} + +/// @implemented +BOOL UIComposition::GetImeUIWndTextExtent(CicIMCLock& imcLock, LPARAM lParam) +{ + return !UIComposition::SendMessageToUI(imcLock, 0x14, lParam); +} + +/// @implemented +LPWSTR UIComposition::GetCompStrBuffer(INT cchStr) +{ + if (!m_strCompStr) + { + m_strCompStr = (LPWSTR)cicMemAllocClear((cchStr + 1) * sizeof(WCHAR)); + m_cchCompStr = cchStr; + } + if (m_cchCompStr < cchStr) + { + m_strCompStr = (LPWSTR)cicMemReAlloc(m_strCompStr, (cchStr + 1) * sizeof(WCHAR)); + m_cchCompStr = cchStr; + } + return m_strCompStr; } /// @unimplemented -void UIComposition::OnImeCompositionUpdate(CicIMCLock& imcLock) +void UIComposition::OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd) { //FIXME } +/// @implemented +HRESULT UIComposition::OnImeCompositionUpdate(CicIMCLock& imcLock) +{ + m_dwUnknown56[0] |= 0x8000; + return UIComposition::UpdateShowCompWndFlag(imcLock, NULL); +} + /// @unimplemented -void UIComposition::OnImeEndComposition() +HRESULT UIComposition::OnImeEndComposition() { - //FIXME + m_dwUnknown56[0] = 0; + return DestroyCompositionWindow(); } /// @unimplemented @@ -416,10 +769,10 @@ void UIComposition::OnPaintTheme(WPARAM wParam) //FIXME } -/// @unimplemented -void UIComposition::OnDestroy() +/// @implemented +HRESULT UIComposition::OnDestroy() { - //FIXME + return DestroyCompositionWindow(); } /// @unimplemented @@ -433,6 +786,11 @@ UIComposition::CompWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /***********************************************************************/ +// For GetWindowLongPtr/SetWindowLongPtr +#define UI_GWLP_HIMC 0 +#define UI_GWLP_UI sizeof(HIMC) +#define UI_GWLP_SIZE (UI_GWLP_UI + sizeof(UI*)) + /// @implemented UI::UI(HWND hWnd) : m_hWnd(hWnd) { @@ -447,11 +805,11 @@ UI::~UI() /// @implemented HRESULT UI::_Create() { - m_pComp = new(cicNoThrow) UIComposition(); + m_pComp = new(cicNoThrow) UIComposition(m_hWnd); if (!m_pComp) return E_OUTOFMEMORY; - ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); + ::SetWindowLongPtrW(m_hWnd, UI_GWLP_UI, (LONG_PTR)this); return S_OK; } @@ -459,13 +817,13 @@ HRESULT UI::_Create() void UI::_Destroy() { m_pComp->OnDestroy(); - ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); + ::SetWindowLongPtrW(m_hWnd, UI_GWLP_UI, 0); } /// @implemented void UI::OnCreate(HWND hWnd) { - UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UI_GWLP_UI); if (pUI) return; pUI = new(cicNoThrow) UI(hWnd); @@ -476,7 +834,7 @@ void UI::OnCreate(HWND hWnd) /// @implemented void UI::OnDestroy(HWND hWnd) { - UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UI_GWLP_UI); if (!pUI) return; @@ -580,8 +938,8 @@ CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPA case WM_IME_SELECT: case WM_TIMER: { - HIMC hIMC = (HIMC)GetWindowLongPtrW(hWnd, UIGWLP_HIMC); - UI* pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); + HIMC hIMC = (HIMC)GetWindowLongPtrW(hWnd, UI_GWLP_HIMC); + UI* pUI = (UI*)GetWindowLongPtrW(hWnd, UI_GWLP_UI); CicIMCLock imcLock(hIMC); switch (uMsg) { @@ -664,7 +1022,7 @@ BOOL RegisterImeClass(VOID) { ZeroMemory(&wcx, sizeof(wcx)); wcx.cbSize = sizeof(WNDCLASSEXW); - wcx.cbWndExtra = UIGWLP_SIZE; + wcx.cbWndExtra = UI_GWLP_SIZE; wcx.hIcon = LoadIconW(0, (LPCWSTR)IDC_ARROW); wcx.hInstance = g_hInst; wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); @@ -680,7 +1038,7 @@ BOOL RegisterImeClass(VOID) { ZeroMemory(&wcx, sizeof(wcx)); wcx.cbSize = sizeof(WNDCLASSEXW); - wcx.cbWndExtra = sizeof(DWORD); + wcx.cbWndExtra = UICOMP_GWLP_SIZE; wcx.hIcon = NULL; wcx.hInstance = g_hInst; wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_IBEAM); diff --git a/dll/ime/msctfime/ui.h b/dll/ime/msctfime/ui.h index 71b32ebb40d..8d416312a72 100644 --- a/dll/ime/msctfime/ui.h +++ b/dll/ime/msctfime/ui.h @@ -94,7 +94,7 @@ public: class CDefCompFrameWindow : public CCompFrameWindow { public: - HWND m_hwndDefCompFrame; + HWND m_hwndCompStr; CDefCompFrameGripper *m_pGripper; CCompFinalizeButton *m_pFinalizeButton; MARGINS m_Margins; @@ -120,14 +120,74 @@ public: /***********************************************************************/ -struct UIComposition +struct CPolyText { + CicArray<POLYTEXTW> m_PolyTextArray; + CicArray<DWORD> m_ValueArray; + + HRESULT ShiftPolyText(INT xDelta, INT yDelta); + POLYTEXTW *GetPolyAt(INT iItem); + HRESULT RemoveLastLine(BOOL bHorizontal); + void RemoveAll(); +}; + +/***********************************************************************/ + +struct COMPWND +{ + HWND m_hWnd; + CPolyText m_PolyText; + CicCaret m_Caret; + DWORD m_dwUnknown57[3]; + + void _ClientToScreen(LPRECT prc); +}; + +/***********************************************************************/ + +class UIComposition +{ +public: + HWND m_hwndParent; + BOOL m_bHasCompWnd; + COMPWND m_CompStrs[4]; + HFONT m_hFont1; + DWORD m_dwUnknown54; + HFONT m_hFont2; + DWORD m_dwUnknown55; + SIZE m_CaretSize; + DWORD m_dwUnknown56[2]; + LPWSTR m_strCompStr; + INT m_cchCompStr; + BOOL m_bInComposition; + BOOL m_bHasCompStr; + CDefCompFrameWindow *m_pDefCompFrameWindow; + CCompButtonFrameWindow *m_pCompButtonFrameWindow; + +public: + UIComposition(HWND hwndParent); + virtual ~UIComposition(); + + HRESULT CreateDefFrameWnd(HWND hwndParent, HIMC hIMC); + HRESULT CreateCompButtonWnd(HWND hwndParent, HIMC hIMC); + HRESULT CreateCompositionWindow(CicIMCLock& imcLock, HWND hwndParent); + HRESULT DestroyCompositionWindow(); + + HRESULT UpdateShowCompWndFlag(CicIMCLock& imcLock, DWORD *pdwCompStrLen); + HRESULT UpdateFont(CicIMCLock& imcLock); + LPWSTR GetCompStrBuffer(INT cchStr); + void OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd); - void OnImeCompositionUpdate(CicIMCLock& imcLock); - void OnImeEndComposition(); + HRESULT OnImeCompositionUpdate(CicIMCLock& imcLock); + HRESULT OnImeEndComposition(); void OnImeSetContext(CicIMCLock& imcLock, HWND hUIWnd, WPARAM wParam, LPARAM lParam); void OnPaintTheme(WPARAM wParam); - void OnDestroy(); + void OnTimer(HWND hWnd); + HRESULT OnDestroy(); + + static BOOL SendMessageToUI(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam); + static BOOL InquireImeUIWndState(CicIMCLock& imcLock); + static BOOL GetImeUIWndTextExtent(CicIMCLock& imcLock, LPARAM lParam); static LRESULT CALLBACK CompWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); }; @@ -147,6 +207,7 @@ struct UI static void OnCreate(HWND hWnd); static void OnDestroy(HWND hWnd); + void OnImeSetContext(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam); };

1 0

[reactos] 01/01: [NTFS] Typo fix: "Steam" -> "Stream"
by Hermès Bélusca-Maïto 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14d3b53cc6199d7117320… commit 14d3b53cc6199d71173208987f3e82dd98c1e05a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 20:33:34 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:43:40 2024 +0100 [NTFS] Typo fix: "Steam" -> "Stream" --- drivers/filesystems/ntfs/finfo.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index b8c039a5d15..f6cfdce68ed 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -223,10 +223,10 @@ NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb, static NTSTATUS -NtfsGetSteamInformation(PNTFS_FCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_STREAM_INFORMATION StreamInfo, - PULONG BufferLength) +NtfsGetStreamInformation(PNTFS_FCB Fcb, + PDEVICE_EXTENSION DeviceExt, + PFILE_STREAM_INFORMATION StreamInfo, + PULONG BufferLength) { ULONG CurrentSize; FIND_ATTR_CONTXT Context; @@ -492,10 +492,10 @@ NtfsQueryInformation(PNTFS_IRP_CONTEXT IrpContext) break; case FileStreamInformation: - Status = NtfsGetSteamInformation(Fcb, - DeviceObject->DeviceExtension, - SystemBuffer, - &BufferLength); + Status = NtfsGetStreamInformation(Fcb, + DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); break; case FileAlternateNameInformation:

1 0

[reactos] 04/04: [WINSRV] Delay-load psapi.dll
by Hermès Bélusca-Maïto 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59f8611321c676050a413… commit 59f8611321c676050a41315c660f93f7d6b9143c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 14:05:04 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:06 2024 +0100 [WINSRV] Delay-load psapi.dll Note that it is used only in debug builds in order to display the list of processes being terminated in the debug log. --- win32ss/user/winsrv/CMakeLists.txt | 2 +- win32ss/user/winsrv/consrv.cmake | 4 ++-- win32ss/user/winsrv/usersrv.cmake | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt index a04ad47fabd..c0cc6d68164 100644 --- a/win32ss/user/winsrv/CMakeLists.txt +++ b/win32ss/user/winsrv/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(winsrv consrv usersrv) # Add win32ksys because of NtUser...() target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSEH_LIB}) -add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) +add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} ${USERSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) add_dependencies(winsrv bugcodes xdk) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index d2ef3a2b5ec..dd4b6da03c2 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -57,7 +57,7 @@ target_link_libraries(consrv pseh) add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) -list(APPEND CONSRV_IMPORT_LIBS psapi) -list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32) +#list(APPEND CONSRV_IMPORT_LIBS) +list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32 psapi) list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid) set_module_type(consrv module UNICODE) diff --git a/win32ss/user/winsrv/usersrv.cmake b/win32ss/user/winsrv/usersrv.cmake index 8db138e5a27..ebdd72ca597 100644 --- a/win32ss/user/winsrv/usersrv.cmake +++ b/win32ss/user/winsrv/usersrv.cmake @@ -14,5 +14,6 @@ target_link_libraries(usersrv pseh) add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) -list(APPEND USERSRV_IMPORT_LIBS basesrv psapi) +list(APPEND USERSRV_IMPORT_LIBS basesrv) +list(APPEND USERSRV_DELAY_IMPORT_LIBS psapi) set_module_type(usersrv module UNICODE)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs