Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/04: [WINSRV] Use ARRAYSIZE() instead of hardcoding buffer size in GetProcessImageFileNameW call
by Hermès Bélusca-Maïto 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c0af91ba198b3114db0f… commit 2c0af91ba198b3114db0f9ad8973a345431b9d28 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 14:03:33 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:05 2024 +0100 [WINSRV] Use ARRAYSIZE() instead of hardcoding buffer size in GetProcessImageFileNameW call --- win32ss/user/winsrv/consrv/shutdown.c | 3 +-- win32ss/user/winsrv/usersrv/shutdown.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/consrv/shutdown.c b/win32ss/user/winsrv/consrv/shutdown.c index 91e43993ba8..aec89dfb8e6 100644 --- a/win32ss/user/winsrv/consrv/shutdown.c +++ b/win32ss/user/winsrv/consrv/shutdown.c @@ -49,7 +49,7 @@ NonConsoleProcessShutdown(IN PCSR_PROCESS Process, /* Terminate this process */ #if DBG WCHAR buffer[MAX_PATH]; - if (!GetProcessImageFileNameW(Process->ProcessHandle, buffer, MAX_PATH)) + if (!GetProcessImageFileNameW(Process->ProcessHandle, buffer, ARRAYSIZE(buffer))) { DPRINT1("Terminating process %x\n", Process->ClientId.UniqueProcess); } @@ -58,7 +58,6 @@ NonConsoleProcessShutdown(IN PCSR_PROCESS Process, DPRINT1("Terminating process %x (%S)\n", Process->ClientId.UniqueProcess, buffer); } #endif - NtTerminateProcess(Process->ProcessHandle, 0); WaitForSingleObject(Process->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout); } diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index 42973b4cfc6..ce9d4f97e1e 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -777,7 +777,7 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, #if DBG { WCHAR buffer[MAX_PATH]; - if (!GetProcessImageFileNameW(CsrProcess->ProcessHandle, buffer, MAX_PATH)) + if (!GetProcessImageFileNameW(CsrProcess->ProcessHandle, buffer, ARRAYSIZE(buffer))) { DPRINT1("Terminating process %x\n", CsrProcess->ClientId.UniqueProcess); } @@ -788,7 +788,6 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, } #endif NtTerminateProcess(CsrProcess->ProcessHandle, 0); - WaitForSingleObject(CsrProcess->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout); /* We are done */

1 0

[reactos] 02/04: [PSAPI] Don't make the dll depend on MSVCRT
by Hermès Bélusca-Maïto 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5db85276e31e3b914575… commit e5db85276e31e3b9145755b9129a5b727701817e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 13:37:36 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:04 2024 +0100 [PSAPI] Don't make the dll depend on MSVCRT psapi.dll can also used by low-level DLLs, such as winsrv.dll, therefore it is better to reduce its dependencies. --- dll/win32/psapi/CMakeLists.txt | 4 ++-- dll/win32/psapi/psapi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index d92b5d415ff..60c1398b70e 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi MODULE ${SOURCE}) -set_module_type(psapi win32dll) +set_module_type(psapi win32dll ENTRYPOINT DllMain 12) target_link_libraries(psapi ${PSEH_LIB}) -add_importlibs(psapi msvcrt kernel32 ntdll) +add_importlibs(psapi kernel32 ntdll) add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/psapi/psapi.c b/dll/win32/psapi/psapi.c index 8194571624d..c73f3176d3b 100644 --- a/dll/win32/psapi/psapi.c +++ b/dll/win32/psapi/psapi.c @@ -299,9 +299,9 @@ DllMain(HINSTANCE hDllHandle, PsStopAndAnalyzeProfile(); } break; - } + } - return TRUE; + return TRUE; }

1 0

[reactos] 01/04: [USETUP] Exchange SetupStartPage and LanguagePage
by Hermès Bélusca-Maïto 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=047f1c3d551ee404b83d6… commit 047f1c3d551ee404b83d63918b86baea21c3e670 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 22 12:05:56 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 22 22:41:03 2024 +0100 [USETUP] Exchange SetupStartPage and LanguagePage --- base/setup/usetup/usetup.c | 206 ++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 59593f38b59..9dbba31f27c 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -536,6 +536,109 @@ GetNTOSInstallationName( } +/* + * Start page + * + * Next pages: + * LanguagePage (at once, default) + * InstallIntroPage (at once, if unattended) + * QuitPage + * + * SIDEEFFECTS + * Init Sdi + * Init USetupData.SourcePath + * Init USetupData.SourceRootPath + * Init USetupData.SourceRootDir + * Init USetupData.SetupInf + * Init USetupData.RequiredPartitionDiskSpace + * Init IsUnattendedSetup + * If unattended, init *List and sets the Codepage + * If unattended, init SelectedLanguageId + * If unattended, init USetupData.LanguageId + * + * RETURNS + * Number of the next page. + */ +static PAGE_NUMBER +SetupStartPage(PINPUT_RECORD Ir) +{ + ULONG Error; + PGENERIC_LIST_ENTRY ListEntry; + PCWSTR LocaleId; + + MUIDisplayPage(SETUP_INIT_PAGE); + + /* Initialize Setup, phase 1 */ + Error = InitializeSetup(&USetupData, 1); + if (Error != ERROR_SUCCESS) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + /* Initialize the user-mode PnP manager */ + if (!EnableUserModePnpManager()) + DPRINT1("The user-mode PnP manager could not initialize, expect unavailable devices!\n"); + + /* Wait for any immediate pending installations to finish */ + if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) + DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); + + CheckUnattendedSetup(&USetupData); + + if (IsUnattendedSetup) + { + // TODO: Read options from inf + /* Load the hardware, language and keyboard layout lists */ + + USetupData.ComputerList = CreateComputerTypeList(USetupData.SetupInf); + USetupData.DisplayList = CreateDisplayDriverList(USetupData.SetupInf); + USetupData.KeyboardList = CreateKeyboardDriverList(USetupData.SetupInf); + + USetupData.LanguageList = CreateLanguageList(USetupData.SetupInf, DefaultLanguage); + + /* new part */ + SelectedLanguageId = DefaultLanguage; + wcscpy(DefaultLanguage, USetupData.LocaleID); + USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + + USetupData.LayoutList = CreateKeyboardLayoutList(USetupData.SetupInf, SelectedLanguageId, DefaultKBLayout); + + /* first we hack LanguageList */ + for (ListEntry = GetFirstListEntry(USetupData.LanguageList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) + { + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) + { + DPRINT("found %S in LanguageList\n", LocaleId); + SetCurrentListEntry(USetupData.LanguageList, ListEntry); + break; + } + } + + /* now LayoutList */ + for (ListEntry = GetFirstListEntry(USetupData.LayoutList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) + { + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) + { + DPRINT("found %S in LayoutList\n", LocaleId); + SetCurrentListEntry(USetupData.LayoutList, ListEntry); + break; + } + } + + SetConsoleCodePage(); + + return INSTALL_INTRO_PAGE; + } + + return LANGUAGE_PAGE; +} + + /* * Displays the LanguagePage. * @@ -690,109 +793,6 @@ LanguagePage(PINPUT_RECORD Ir) } -/* - * Start page - * - * Next pages: - * LanguagePage (at once, default) - * InstallIntroPage (at once, if unattended) - * QuitPage - * - * SIDEEFFECTS - * Init Sdi - * Init USetupData.SourcePath - * Init USetupData.SourceRootPath - * Init USetupData.SourceRootDir - * Init USetupData.SetupInf - * Init USetupData.RequiredPartitionDiskSpace - * Init IsUnattendedSetup - * If unattended, init *List and sets the Codepage - * If unattended, init SelectedLanguageId - * If unattended, init USetupData.LanguageId - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -SetupStartPage(PINPUT_RECORD Ir) -{ - ULONG Error; - PGENERIC_LIST_ENTRY ListEntry; - PCWSTR LocaleId; - - MUIDisplayPage(SETUP_INIT_PAGE); - - /* Initialize Setup, phase 1 */ - Error = InitializeSetup(&USetupData, 1); - if (Error != ERROR_SUCCESS) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Initialize the user-mode PnP manager */ - if (!EnableUserModePnpManager()) - DPRINT1("The user-mode PnP manager could not initialize, expect unavailable devices!\n"); - - /* Wait for any immediate pending installations to finish */ - if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) - DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); - - CheckUnattendedSetup(&USetupData); - - if (IsUnattendedSetup) - { - // TODO: Read options from inf - /* Load the hardware, language and keyboard layout lists */ - - USetupData.ComputerList = CreateComputerTypeList(USetupData.SetupInf); - USetupData.DisplayList = CreateDisplayDriverList(USetupData.SetupInf); - USetupData.KeyboardList = CreateKeyboardDriverList(USetupData.SetupInf); - - USetupData.LanguageList = CreateLanguageList(USetupData.SetupInf, DefaultLanguage); - - /* new part */ - SelectedLanguageId = DefaultLanguage; - wcscpy(DefaultLanguage, USetupData.LocaleID); - USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); - - USetupData.LayoutList = CreateKeyboardLayoutList(USetupData.SetupInf, SelectedLanguageId, DefaultKBLayout); - - /* first we hack LanguageList */ - for (ListEntry = GetFirstListEntry(USetupData.LanguageList); ListEntry; - ListEntry = GetNextListEntry(ListEntry)) - { - LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) - { - DPRINT("found %S in LanguageList\n", LocaleId); - SetCurrentListEntry(USetupData.LanguageList, ListEntry); - break; - } - } - - /* now LayoutList */ - for (ListEntry = GetFirstListEntry(USetupData.LayoutList); ListEntry; - ListEntry = GetNextListEntry(ListEntry)) - { - LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) - { - DPRINT("found %S in LayoutList\n", LocaleId); - SetCurrentListEntry(USetupData.LayoutList, ListEntry); - break; - } - } - - SetConsoleCodePage(); - - return INSTALL_INTRO_PAGE; - } - - return LANGUAGE_PAGE; -} - - /* * Displays the WelcomePage. *

1 0

[reactos] 01/01: [MSCTFIME] Implement CModeBias (#6515)
by Katayama Hirofumi MZ 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9262df661e9f679c2f73c… commit 9262df661e9f679c2f73c95404454d1efafda696 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 18:43:08 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 18:43:08 2024 +0900 [MSCTFIME] Implement CModeBias (#6515) Supporting TIPs... JIRA issue: CORE-19360 - Rename compartment.cpp as misc.cpp. - Implement CModeBias class. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/{compartment.cpp => misc.cpp} | 49 +++++++++++++++++++++++++- dll/ime/msctfime/{compartment.h => misc.h} | 14 +++++++- dll/ime/msctfime/msctfime.h | 7 +++- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 3a48a7cbabb..0e5acc805b0 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -6,9 +6,9 @@ spec2def(msctfime.ime msctfime.spec) list(APPEND SOURCE bridge.cpp - compartment.cpp functions.cpp inputcontext.cpp + misc.cpp msctfime.cpp profile.cpp sinks.cpp diff --git a/dll/ime/msctfime/compartment.cpp b/dll/ime/msctfime/misc.cpp similarity index 76% rename from dll/ime/msctfime/compartment.cpp rename to dll/ime/msctfime/misc.cpp index d92b1b526f4..18e01939ada 100644 --- a/dll/ime/msctfime/compartment.cpp +++ b/dll/ime/msctfime/misc.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: Supporting compartments + * PURPOSE: Miscellaneous of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -161,3 +161,50 @@ ClearCompartment( return hr; } + +/***********************************************************************/ + +struct MODEBIAS +{ + REFGUID m_guid; + LONG m_bias; +}; + +static const MODEBIAS g_ModeBiasMap[] = +{ + { GUID_MODEBIAS_FILENAME, 0x00000001 }, + { GUID_MODEBIAS_NUMERIC, 0x00000004 }, + { GUID_MODEBIAS_URLHISTORY, 0x00010000 }, + { GUID_MODEBIAS_DEFAULT, 0x00000000 }, + { GUID_MODEBIAS_NONE, 0x00000000 }, +}; + +void CModeBias::SetModeBias(REFGUID rguid) +{ + m_guid = rguid; +} + +GUID CModeBias::ConvertModeBias(LONG bias) +{ + const GUID *pguid = &GUID_NULL; + for (auto& item : g_ModeBiasMap) + { + if (item.m_bias == bias) + { + pguid = &item.m_guid; + break; + } + } + + return *pguid; +} + +LONG CModeBias::ConvertModeBias(REFGUID guid) +{ + for (auto& item : g_ModeBiasMap) + { + if (IsEqualGUID(guid, item.m_guid)) + return item.m_bias; + } + return 0; +} diff --git a/dll/ime/msctfime/compartment.h b/dll/ime/msctfime/misc.h similarity index 74% rename from dll/ime/msctfime/compartment.h rename to dll/ime/msctfime/misc.h index 88805566832..ca96a227f54 100644 --- a/dll/ime/msctfime/compartment.h +++ b/dll/ime/msctfime/misc.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: Supporting compartments + * PURPOSE: Miscellaneous of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -42,3 +42,15 @@ ClearCompartment( IUnknown *pUnknown, REFGUID rguid, BOOL bThread); + +/***********************************************************************/ + +class CModeBias +{ +public: + GUID m_guid; + + 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 cb482318830..28597863047 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -50,13 +50,18 @@ static inline HIMC GetActiveContext(VOID) 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); +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_MODEBIAS_NONE GUID_NULL #include "resource.h" #include "bridge.h" -#include "compartment.h" #include "functions.h" #include "inputcontext.h" +#include "misc.h" #include "profile.h" #include "sinks.h" #include "tls.h"

1 0

[reactos] 01/01: [MSCTFIME] Implement CicBridge::OnSetOpenStatus (#6514)
by Katayama Hirofumi MZ 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d0b5482f6ae2997d85f9… commit 7d0b5482f6ae2997d85f9bba819333de2077f184 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 17:28:40 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 17:28:40 2024 +0900 [MSCTFIME] Implement CicBridge::OnSetOpenStatus (#6514) Supporting TIPs... JIRA issue: CORE-19360 - Add CicInputContext::EscbCompComplete method (stub). - Implement CicBridge::OnSetOpenStatus method. --- dll/ime/msctfime/bridge.cpp | 13 +++++++++++-- dll/ime/msctfime/functions.cpp | 2 +- dll/ime/msctfime/functions.h | 2 +- dll/ime/msctfime/inputcontext.cpp | 6 ++++++ dll/ime/msctfime/inputcontext.h | 1 + dll/ime/msctfime/tls.h | 2 +- dll/ime/msctfime/ui.cpp | 13 ++++++------- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index e7801024cf9..ed74a566328 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -178,6 +178,7 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) return hr; } +/// @implemented ITfContext * CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) { @@ -187,14 +188,22 @@ CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) return pCicIC->m_pContext; } -/// @unimplemented +/// @implemented HRESULT CicBridge::OnSetOpenStatus( TLS *pTLS, ITfThreadMgr_P *pThreadMgr, CicIMCLock& imcLock, CicInputContext *pCicIC) { - return E_NOTIMPL; + if (!imcLock.get().fOpen && imcLock.ValidCompositionString()) + pCicIC->EscbCompComplete(imcLock); + + pTLS->m_bNowOpening = TRUE; + HRESULT hr = SetCompartmentDWORD(m_cliendId, pThreadMgr, + GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, + imcLock.get().fOpen, FALSE); + pTLS->m_bNowOpening = FALSE; + return hr; } /// Selects the IME context. diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp index 2852aece1cd..e3133022023 100644 --- a/dll/ime/msctfime/functions.cpp +++ b/dll/ime/msctfime/functions.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: The functions of msctfime.ime + * PURPOSE: The functionalities of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/ime/msctfime/functions.h b/dll/ime/msctfime/functions.h index 6938162a6e5..d0b7d8c2ebe 100644 --- a/dll/ime/msctfime/functions.h +++ b/dll/ime/msctfime/functions.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: The functions of msctfime.ime + * PURPOSE: The functionalities of msctfime.ime * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/ime/msctfime/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index 81344d26545..7362040c8fb 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -260,6 +260,12 @@ HRESULT CicInputContext::EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag) return E_NOTIMPL; } +/// @unimplemented +HRESULT CicInputContext::EscbCompComplete(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + /// @unimplemented HRESULT CicInputContext::SetupReconvertString( diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index b567304b779..185d9b8161b 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -91,6 +91,7 @@ public: HRESULT SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage); HRESULT EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag); + HRESULT EscbCompComplete(CicIMCLock& imcLock); HRESULT SetupReconvertString( CicIMCLock& imcLock, ITfThreadMgr_P *pThreadMgr, diff --git a/dll/ime/msctfime/tls.h b/dll/ime/msctfime/tls.h index 28f6d427177..ae1a6000e9c 100644 --- a/dll/ime/msctfime/tls.h +++ b/dll/ime/msctfime/tls.h @@ -25,7 +25,7 @@ public: DWORD m_dwFlags2; DWORD m_dwUnknown2; BOOL m_bDestroyed; - DWORD m_dwNowOpening; + BOOL m_bNowOpening; DWORD m_NonEAComposition; DWORD m_cWnds; diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 2fec663f97f..fb8ae4105a9 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -444,15 +444,14 @@ UI::~UI() delete m_pComp; } -/// @unimplemented +/// @implemented HRESULT UI::_Create() { m_pComp = new(cicNoThrow) UIComposition(); if (!m_pComp) return E_OUTOFMEMORY; - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); - //FIXME + ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); return S_OK; } @@ -460,13 +459,13 @@ HRESULT UI::_Create() void UI::_Destroy() { m_pComp->OnDestroy(); - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); + ::SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); } /// @implemented void UI::OnCreate(HWND hWnd) { - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); if (pUI) return; pUI = new(cicNoThrow) UI(hWnd); @@ -477,7 +476,7 @@ void UI::OnCreate(HWND hWnd) /// @implemented void UI::OnDestroy(HWND hWnd) { - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); + UI *pUI = (UI*)::GetWindowLongPtrW(hWnd, UIGWLP_UI); if (!pUI) return; @@ -656,7 +655,7 @@ UIWndProc( /***********************************************************************/ -/// @unimplemented +/// @implemented BOOL RegisterImeClass(VOID) { WNDCLASSEXW wcx;

1 0

[reactos] 01/01: [MSCTFIME][CICERO] Implement CFnDocFeed (#6513)
by Katayama Hirofumi MZ 22 Feb '24

22 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f53f1334eda2daeb94e2c… commit f53f1334eda2daeb94e2cf2d7722f4e6a76e06fa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 22 15:46:05 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 22 15:46:05 2024 +0900 [MSCTFIME][CICERO] Implement CFnDocFeed (#6513) Supporting TIPs... JIRA issue: CORE-19360 - Add missing CicInputContext methods. - Implement CFnDocFeed class. --- dll/ime/msctfime/bridge.cpp | 13 ++--- dll/ime/msctfime/functions.cpp | 100 +++++++++++++++++++++++++++++++++++--- dll/ime/msctfime/inputcontext.cpp | 41 +++++++++++++--- dll/ime/msctfime/inputcontext.h | 12 ++++- dll/ime/msctfime/msctfime.cpp | 35 +++---------- dll/ime/msctfime/msctfime.h | 8 +++ dll/ime/msctfime/ui.cpp | 2 - sdk/lib/cicero/cicimc.h | 3 +- 8 files changed, 156 insertions(+), 58 deletions(-) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp index de9e6ba10ef..e7801024cf9 100644 --- a/dll/ime/msctfime/bridge.cpp +++ b/dll/ime/msctfime/bridge.cpp @@ -87,11 +87,8 @@ CicBridge::CreateInputContext( _In_ HIMC hIMC) { CicIMCLock imcLock(hIMC); - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; if (!imcLock.get().hCtfImeContext) { @@ -126,7 +123,7 @@ CicBridge::CreateInputContext( imeContext.get().m_pCicIC = pCicIC; } - hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); + HRESULT hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); if (FAILED(hr)) { pCicIC->Release(); @@ -149,8 +146,6 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) { CicIMCLock imcLock(hIMC); HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; if (FAILED(hr)) return hr; @@ -217,8 +212,6 @@ CicBridge::SelectEx( return imcLock.m_hr; CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (!imeContext) - imeContext.m_hr = E_FAIL; if (FAILED(imeContext.m_hr)) return imeContext.m_hr; diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp index c9832f90cff..2852aece1cd 100644 --- a/dll/ime/msctfime/functions.cpp +++ b/dll/ime/msctfime/functions.cpp @@ -150,26 +150,112 @@ STDMETHODIMP_(ULONG) CFnDocFeed::Release() return m_cRefs; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::DocFeed() { - return E_NOTIMPL; + 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; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() { - return E_NOTIMPL; + 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() { - return E_NOTIMPL; + 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; } -/// @unimplemented +/// @implemented STDMETHODIMP CFnDocFeed::StartUndoCompositionString() { - return E_NOTIMPL; + 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/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp index 1bdf64cb62e..81344d26545 100644 --- a/dll/ime/msctfime/inputcontext.cpp +++ b/dll/ime/msctfime/inputcontext.cpp @@ -65,7 +65,7 @@ CicInputContext::OnStartComposition( ITfCompositionView *pComposition, BOOL *pfOk) { - if ((m_cCompLocks <= 0) || m_dwUnknown6_5) + if ((m_cCompLocks <= 0) || m_bReconverting) { *pfOk = TRUE; ++m_cCompLocks; @@ -103,13 +103,10 @@ CicInputContext::GetGuidAtom( _Out_opt_ LPDWORD pdwGuidAtom) { CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); - HRESULT hr = imeContext.m_hr; - if (!imeContext) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; - hr = E_FAIL; + HRESULT hr = E_FAIL; if (iAtom < m_cGuidAtoms) { *pdwGuidAtom = m_adwGuidAtoms[iAtom]; @@ -251,6 +248,36 @@ CicInputContext::OnCleanupContext( return S_OK; } +/// @unimplemented +HRESULT CicInputContext::SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT CicInputContext::EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT +CicInputContext::SetupReconvertString( + CicIMCLock& imcLock, + ITfThreadMgr_P *pThreadMgr, + UINT uCodePage, + DWORD dwUnknown61, + BOOL bUndo) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT CicInputContext::EndReconvertString(CicIMCLock& imcLock) +{ + return E_NOTIMPL; +} + /// Retrieves the IME information. /// @implemented HRESULT diff --git a/dll/ime/msctfime/inputcontext.h b/dll/ime/msctfime/inputcontext.h index 2273161926e..b567304b779 100644 --- a/dll/ime/msctfime/inputcontext.h +++ b/dll/ime/msctfime/inputcontext.h @@ -47,7 +47,7 @@ public: GUID m_guid; DWORD m_dwUnknown6[11]; BOOL m_bSelecting; - DWORD m_dwUnknown6_5; + BOOL m_bReconverting; LONG m_cCompLocks; DWORD m_dwUnknown7[5]; WORD m_cGuidAtoms; @@ -88,4 +88,14 @@ public: HRESULT CreateInputContext(_Inout_ ITfThreadMgr *pThreadMgr, _Inout_ CicIMCLock& imcLock); HRESULT DestroyInputContext(); + + HRESULT SetupDocFeedString(CicIMCLock& imcLock, UINT uCodePage); + HRESULT EscbClearDocFeedBuffer(CicIMCLock& imcLock, BOOL bFlag); + HRESULT SetupReconvertString( + CicIMCLock& imcLock, + ITfThreadMgr_P *pThreadMgr, + UINT uCodePage, + DWORD dwUnknown61, + BOOL bUndo); + HRESULT EndReconvertString(CicIMCLock& imcLock); }; diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 445998d6a9c..87ca208819c 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -142,14 +142,6 @@ HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) return hr; } -HIMC GetActiveContext(VOID) -{ - HWND hwndFocus = ::GetFocus(); - if (!hwndFocus) - hwndFocus = ::GetActiveWindow(); - return ::ImmGetContext(hwndFocus); -} - /// @implemented HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { @@ -184,8 +176,6 @@ InternalSelectEx( _In_ LANGID LangID) { CicIMCLock imcLock(hIMC); - if (!imcLock) - imcLock.m_hr = E_FAIL; if (FAILED(imcLock.m_hr)) return imcLock.m_hr; @@ -608,25 +598,17 @@ CtfImeGetGuidAtom( TRACE("(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); CicIMCLock imcLock(hIMC); - - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; CicIMCCLock<CTFIMECONTEXT> imccLock(imcLock.get().hCtfImeContext); - hr = imccLock.m_hr; - if (!imccLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; + if (FAILED(imccLock.m_hr)) + return imccLock.m_hr; if (!imccLock.get().m_pCicIC) return E_OUTOFMEMORY; - hr = imccLock.get().m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); - return hr; + return imccLock.get().m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); } /*********************************************************************** @@ -641,13 +623,8 @@ CtfImeIsGuidMapEnable( TRACE("(%p)\n", hIMC); BOOL ret = FALSE; - HRESULT hr; CicIMCLock imcLock(hIMC); - - hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (SUCCEEDED(hr)) + if (SUCCEEDED(imcLock.m_hr)) ret = !!(imcLock.get().fdwInit & INIT_GUIDMAP); return ret; diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 7b2f2fff822..cb482318830 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -40,6 +40,14 @@ EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID); 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); +} + 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); diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 660d20824d6..2fec663f97f 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -357,8 +357,6 @@ STDMETHODIMP_(LRESULT) CDefCompFrameWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CicIMCLock imcLock(m_hIMC); - if (!imcLock) - imcLock.m_hr = E_FAIL; if (SUCCEEDED(imcLock.m_hr)) ::SendMessage(imcLock.get().hWnd, WM_IME_NOTIFY, 0xF, (LPARAM)m_hIMC); return ::DefWindowProc(hWnd, uMsg, wParam, lParam); diff --git a/sdk/lib/cicero/cicimc.h b/sdk/lib/cicero/cicimc.h index 779884abfdd..7db0783cee5 100644 --- a/sdk/lib/cicero/cicimc.h +++ b/sdk/lib/cicero/cicimc.h @@ -45,8 +45,7 @@ class CicIMCCLock : public CIC_IMCC_LOCK<T_DATA> public: CicIMCCLock(HIMCC hIMCC) : CIC_IMCC_LOCK<T_DATA>(hIMCC) { - if (hIMCC) - _LockIMCC(this->m_hIMCC, &this->m_pIMCC); + this->m_hr = _LockIMCC(this->m_hIMCC, &this->m_pIMCC); } ~CicIMCCLock() {

1 0

[reactos] 01/01: [EXT2FS] Ext2Read(): Complete request on VCB_VOLUME_LOCKED case (#4770)
by Serge Gautherie 21 Feb '24

21 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0086d05007aaa4505afd5… commit 0086d05007aaa4505afd5e1f38c87ac965aac840 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Feb 21 16:31:09 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 21 07:31:09 2024 -0800 [EXT2FS] Ext2Read(): Complete request on VCB_VOLUME_LOCKED case (#4770) CORE-10645 Co-authored-by: Victor Martinez Calvo <vicmarcal(a)gmail.com> --- drivers/filesystems/ext2/src/read.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/filesystems/ext2/src/read.c b/drivers/filesystems/ext2/src/read.c index b01e97e1c35..b754299b496 100644 --- a/drivers/filesystems/ext2/src/read.c +++ b/drivers/filesystems/ext2/src/read.c @@ -905,6 +905,9 @@ Ext2Read (IN PEXT2_IRP_CONTEXT IrpContext) if (FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED) && Vcb->LockFile != FileObject ) { Status = STATUS_ACCESS_DENIED; +#ifdef __REACTOS__ + bCompleteRequest = TRUE; +#endif _SEH2_LEAVE; }

1 0

[reactos] 01/01: [MSCTFIME][CICERO] Implement CDefCompFrameWindow (#6512)
by Katayama Hirofumi MZ 21 Feb '24

21 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a55345be298e4f7ab4521… commit a55345be298e4f7ab452109c77bf8b97e9e3ad18 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 21 10:36:32 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 21 10:36:32 2024 +0900 [MSCTFIME][CICERO] Implement CDefCompFrameWindow (#6512) Supporting TIPs... JIRA issue: CORE-19360 - Add delay link to uxtheme.dll. - Implement CDefCompFrameGripper, CCompFinalizeButton, CCompButtonFrameWindow, and CDefCompFrameWindow classes. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/msctfime.h | 1 + dll/ime/msctfime/ui.cpp | 322 ++++++++++++++++++++++++++++++++++++++++ dll/ime/msctfime/ui.h | 95 ++++++++++++ sdk/lib/cicero/cicuif.cpp | 8 +- sdk/lib/cicero/cicuif.h | 4 +- 6 files changed, 425 insertions(+), 7 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 288c14afc7f..3a48a7cbabb 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -26,5 +26,5 @@ set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid cicero) add_importlibs(msctfime user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msctfime comctl32 msctf oleaut32 imm32) +add_delay_importlibs(msctfime uxtheme comctl32 msctf oleaut32 imm32) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index f7ada8fbd6e..7b2f2fff822 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -28,6 +28,7 @@ #include <cicarray.h> #include <cicimc.h> #include <cictf.h> +#include <cicreg.h> #include <ciccaret.h> #include <cicuif.h> #include <cicutb.h> diff --git a/dll/ime/msctfime/ui.cpp b/dll/ime/msctfime/ui.cpp index 74a8c733de0..660d20824d6 100644 --- a/dll/ime/msctfime/ui.cpp +++ b/dll/ime/msctfime/ui.cpp @@ -9,6 +9,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); +/***********************************************************************/ + UINT WM_MSIME_SERVICE = 0; UINT WM_MSIME_UIREADY = 0; UINT WM_MSIME_RECONVERTREQUEST = 0; @@ -61,6 +63,326 @@ BOOL RegisterMSIMEMessage(VOID) WM_MSIME_KEYMAP); } +/***********************************************************************/ + +/// @implemented +CDefCompFrameGripper::CDefCompFrameGripper( + CDefCompFrameWindow *pDefCompFrameWindow, + LPCRECT prc, + DWORD style) : CUIFGripper(pDefCompFrameWindow, prc, style) +{ + m_pDefCompFrameWindow = pDefCompFrameWindow; +} + +/***********************************************************************/ + +/// @implemented +CCompFinalizeButton::CCompFinalizeButton( + CCompFrameWindow *pParent, + DWORD nObjectID, + LPCRECT prc, + DWORD style, + DWORD dwButtonFlags, + LPCWSTR pszText) + : CUIFToolbarButton(pParent, nObjectID, prc, style, dwButtonFlags, pszText) +{ + m_pCompFrameWindow = pParent; +} + +/// @implemented +CCompFinalizeButton::~CCompFinalizeButton() +{ + HICON hIcon = CUIFToolbarButton::GetIcon(); + if (hIcon) + { + ::DestroyIcon(hIcon); + CUIFToolbarButton::SetIcon(NULL); + } +} + +/// @implemented +void CCompFinalizeButton::OnLeftClick() +{ + HIMC hIMC = m_pCompFrameWindow->m_hIMC; + if (hIMC) + ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); +} + +/***********************************************************************/ + +/// @implemented +CCompFrameWindow::CCompFrameWindow(HIMC hIMC, DWORD style) + : CUIFWindow(g_hInst, style) +{ + m_hIMC = hIMC; +} + +/***********************************************************************/ + +/// @implemented +CCompButtonFrameWindow::CCompButtonFrameWindow(HIMC hIMC, DWORD style) + : CCompFrameWindow(hIMC, style) +{ +} + +/// @implemented +void CCompButtonFrameWindow::Init() +{ + if (m_pFinalizeButton) + return; + + RECT rc = { 0, 0, 0, 0 }; + m_pFinalizeButton = new(cicNoThrow) CCompFinalizeButton(this, 0, &rc, 0, 0x10000, NULL); + + m_pFinalizeButton->Initialize(); + m_pFinalizeButton->Init(); + + HICON hIcon = (HICON)::LoadImageW(g_hInst, MAKEINTRESOURCEW(IDI_DOWN), IMAGE_ICON, 16, 16, 0); + m_pFinalizeButton->SetIcon(hIcon); + + WCHAR szText[256]; + LoadStringW(g_hInst, IDS_FINALIZE_STRING, szText, _countof(szText)); + m_pFinalizeButton->SetToolTip(szText); + + AddUIObj(m_pFinalizeButton); +} + +/// @implemented +void CCompButtonFrameWindow::MoveShow(LONG x, LONG y, BOOL bShow) +{ + INT nWidth = m_Margins.cxRightWidth + m_Margins.cxLeftWidth + 18; + INT nHeight = m_Margins.cyBottomHeight + m_Margins.cyTopHeight + 18; + Move(x, y, nWidth + 4, nHeight + 4); + + if (m_pFinalizeButton) + { + RECT rc = { 1, 1, nWidth + 1, nHeight + 1 }; + m_pFinalizeButton->SetRect(&rc); + } + + Show(bShow); +} + +/// @implemented +STDMETHODIMP_(void) CCompButtonFrameWindow::OnCreate(HWND hWnd) +{ + ::SetWindowTheme(hWnd, L"TOOLBAR", NULL); + + ZeroMemory(&m_Margins, sizeof(m_Margins)); + + CUIFTheme theme; + theme.m_hTheme = NULL; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + if (SUCCEEDED(theme.InternalOpenThemeData(hWnd))) + theme.GetThemeMargins(NULL, 1, 3602, NULL, &m_Margins); +} + +/***********************************************************************/ + +/// @implemented +CDefCompFrameWindow::CDefCompFrameWindow(HIMC hIMC, DWORD style) + : CCompFrameWindow(hIMC, style) +{ + LoadPosition(); + m_iPartId = 1; + m_iStateId = 1; + m_pszClassList = L"TASKBAR"; +} + +/// @implemented +CDefCompFrameWindow::~CDefCompFrameWindow() +{ + SavePosition(); +} + +/// @implemented +void CDefCompFrameWindow::Init() +{ + RECT rc; + + if (!m_pGripper) + { + ZeroMemory(&rc, sizeof(rc)); + m_pGripper = new(cicNoThrow) CDefCompFrameGripper(this, &rc, 0); + m_pGripper->Initialize(); + AddUIObj(m_pGripper); + } + + if (!m_pFinalizeButton) + { + ZeroMemory(&rc, sizeof(rc)); + m_pFinalizeButton = new(cicNoThrow) CCompFinalizeButton(this, 0, &rc, 0, 0x10000, NULL); + m_pFinalizeButton->Initialize(); + m_pFinalizeButton->Init(); + + HICON hIcon = (HICON)LoadImageW(g_hInst, MAKEINTRESOURCEW(IDI_DOWN), IMAGE_ICON, 16, 16, 0); + m_pFinalizeButton->SetIcon(hIcon); + + WCHAR szText[256]; + ::LoadStringW(g_hInst, IDS_FINALIZE_STRING, szText, _countof(szText)); + SetToolTip(szText); + + AddUIObj(m_pFinalizeButton); + } +} + +/// @implemented +INT CDefCompFrameWindow::GetGripperWidth() +{ + if (!m_pGripper || FAILED(m_pGripper->EnsureThemeData(m_hWnd))) + return 5; + + INT ret = -1; + HDC hDC = ::GetDC(m_hWnd); + SIZE partSize; + if (SUCCEEDED(m_pGripper->GetThemePartSize(hDC, 1, 0, TS_TRUE, &partSize))) + ret = partSize.cx + 4; + + ::ReleaseDC(m_hWnd, hDC); + + return ((ret < 0) ? 5 : ret); +} + +/// @implemented +void CDefCompFrameWindow::MyScreenToClient(LPPOINT ppt, LPRECT prc) +{ + if (ppt) + ::ScreenToClient(m_hWnd, ppt); + + if (prc) + { + ::ScreenToClient(m_hWnd, (LPPOINT)prc); + ::ScreenToClient(m_hWnd, (LPPOINT)&prc->right); + } +} + +/// @implemented +void CDefCompFrameWindow::SetCompStrRect(INT nWidth, INT nHeight, BOOL bShow) +{ + INT GripperWidth = GetGripperWidth(); + + RECT rc; + ::GetWindowRect(m_hWnd, &rc); + + Move(rc.left, rc.top, GripperWidth + nWidth + 24, nHeight + 10); + + if (m_pGripper) + { + rc = { 2, 3, GripperWidth + 2, nHeight + 7 }; + m_pGripper->SetRect(&rc); + } + + if (m_pFinalizeButton) + { + rc = { + GripperWidth + nWidth + 4, + 3, + m_Margins.cxLeftWidth + m_Margins.cxRightWidth + GripperWidth + nWidth + 22, + m_Margins.cyBottomHeight + m_Margins.cyTopHeight + 21 + }; + m_pFinalizeButton->SetRect(&rc); + } + + Show(bShow); + + ::MoveWindow(m_hwndDefCompFrame, GripperWidth + 2, 7, nWidth, nHeight, TRUE); + ::ShowWindow(m_hwndDefCompFrame, (bShow ? SW_SHOWNOACTIVATE : SW_HIDE)); +} + +/// @implemented +void CDefCompFrameWindow::LoadPosition() +{ + DWORD x = 0, y = 0; + + LSTATUS error; + CicRegKey regKey; + error = regKey.Open(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\CUAS\\DefaultCompositionWindow")); + if (error == ERROR_SUCCESS) + { + regKey.QueryDword(TEXT("Left"), &x); + regKey.QueryDword(TEXT("Top"), &y); + } + + Move(x, y, 0, 0); +} + +/// @implemented +void CDefCompFrameWindow::SavePosition() +{ + LSTATUS error; + CicRegKey regKey; + error = regKey.Create(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\CUAS\\DefaultCompositionWindow")); + if (error == ERROR_SUCCESS) + { + regKey.SetDword(TEXT("Left"), m_nLeft); + regKey.SetDword(TEXT("Top"), m_nTop); + } +} + +/// @implemented +STDMETHODIMP_(void) CDefCompFrameWindow::OnCreate(HWND hWnd) +{ + ::SetWindowTheme(hWnd, L"TASKBAR", NULL); + + ZeroMemory(&m_Margins, sizeof(m_Margins)); + + CUIFTheme theme; + theme.m_hTheme = NULL; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + if (SUCCEEDED(theme.InternalOpenThemeData(hWnd))) + GetThemeMargins(NULL, 1, 3602, NULL, &m_Margins); +} + +/// @implemented +STDMETHODIMP_(BOOL) CDefCompFrameWindow::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + if (!::IsWindow(m_hwndDefCompFrame)) + return FALSE; + + RECT rc; + ::GetWindowRect(m_hwndDefCompFrame, &rc); + MyScreenToClient(NULL, &rc); + POINT pt = { x, y }; + return ::PtInRect(&rc, pt); +} + +/// @implemented +STDMETHODIMP_(LRESULT) +CDefCompFrameWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CicIMCLock imcLock(m_hIMC); + if (!imcLock) + imcLock.m_hr = E_FAIL; + if (SUCCEEDED(imcLock.m_hr)) + ::SendMessage(imcLock.get().hWnd, WM_IME_NOTIFY, 0xF, (LPARAM)m_hIMC); + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +/// @implemented +STDMETHODIMP_(void) CDefCompFrameWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG y) +{ + if (::IsWindow(m_hwndDefCompFrame)) + { + RECT rc; + ::GetWindowRect(m_hwndDefCompFrame, &rc); + MyScreenToClient(NULL, &rc); + + POINT pt = { x, y }; + if (::PtInRect(&rc, pt)) + ::SendMessage(m_hwndDefCompFrame, 0x7E8, 0, 0); + } + + CUIFWindow::HandleMouseMsg(uMsg, x, y); +} + +/***********************************************************************/ + // For GetWindowLongPtr/SetWindowLongPtr #define UIGWLP_HIMC 0 #define UIGWLP_UI sizeof(HIMC) diff --git a/dll/ime/msctfime/ui.h b/dll/ime/msctfime/ui.h index e9433fc734c..71b32ebb40d 100644 --- a/dll/ime/msctfime/ui.h +++ b/dll/ime/msctfime/ui.h @@ -7,6 +7,15 @@ #pragma once +class CUIFGripper; + class CDefCompFrameGripper; +class CUIFToolbarButton; + class CCompFinalizeButton; +class CUIFWindow; + class CCompFrameWindow; + class CCompButtonFrameWindow; + class CDefCompFrameWindow; + /***********************************************************************/ extern UINT WM_MSIME_SERVICE; @@ -25,6 +34,92 @@ BOOL RegisterMSIMEMessage(VOID); /***********************************************************************/ +class CDefCompFrameGripper : public CUIFGripper +{ +public: + CDefCompFrameWindow *m_pDefCompFrameWindow; + + CDefCompFrameGripper(CDefCompFrameWindow *pDefCompFrameWindow, LPCRECT prc, DWORD style); +}; + +/***********************************************************************/ + +class CCompFrameWindow; + +class CCompFinalizeButton : public CUIFToolbarButton +{ +public: + CCompFrameWindow *m_pCompFrameWindow; + + CCompFinalizeButton( + CCompFrameWindow *pParent, + DWORD nObjectID, + LPCRECT prc, + DWORD style, + DWORD dwButtonFlags, + LPCWSTR pszText); + ~CCompFinalizeButton() override; + + STDMETHOD_(void, OnLeftClick)() override; +}; + +/***********************************************************************/ + +class CCompFrameWindow : public CUIFWindow +{ +public: + HIMC m_hIMC; + + CCompFrameWindow(HIMC hIMC, DWORD style); +}; + +/***********************************************************************/ + +class CCompButtonFrameWindow : public CCompFrameWindow +{ +public: + MARGINS m_Margins; + CCompFinalizeButton *m_pFinalizeButton; + + CCompButtonFrameWindow(HIMC hIMC, DWORD style); + + void Init(); + void MoveShow(LONG x, LONG y, BOOL bShow); + + STDMETHOD_(void, OnCreate)(HWND hWnd) override; +}; + +/***********************************************************************/ + +class CDefCompFrameWindow : public CCompFrameWindow +{ +public: + HWND m_hwndDefCompFrame; + CDefCompFrameGripper *m_pGripper; + CCompFinalizeButton *m_pFinalizeButton; + MARGINS m_Margins; + +public: + CDefCompFrameWindow(HIMC hIMC, DWORD style); + ~CDefCompFrameWindow() override; + + void Init(); + INT GetGripperWidth(); + void MyScreenToClient(LPPOINT ppt, LPRECT prc); + void SetCompStrRect(INT nWidth, INT nHeight, BOOL bShow); + + void LoadPosition(); + void SavePosition(); + + STDMETHOD_(void, OnCreate)(HWND hWnd) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; + STDMETHOD_(LRESULT, OnWindowPosChanged)(HWND hWnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) override; + STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y) override; +}; + +/***********************************************************************/ + struct UIComposition { void OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd); diff --git a/sdk/lib/cicero/cicuif.cpp b/sdk/lib/cicero/cicuif.cpp index 322058e1ad3..3ef832053a9 100644 --- a/sdk/lib/cicero/cicuif.cpp +++ b/sdk/lib/cicero/cicuif.cpp @@ -3409,7 +3409,7 @@ STDMETHODIMP_(void) CUIFToolbarMenuButton::OnLButtonUp(LONG x, LONG y) { CUIFButton::OnLButtonUp(x, y); - m_pToolbarButton->OnUnknownMouse2(x, y); + m_pToolbarButton->OnUnknownMouse0(); } STDMETHODIMP_(BOOL) @@ -3444,16 +3444,16 @@ CUIFToolbarButtonElement::OnLButtonUp(LONG x, LONG y) { CUIFButton::OnLButtonUp(x, y); if ((m_pToolbarButton->m_dwToolbarButtonFlags & 0x30000) == 0x20000) - m_pToolbarButton->OnUnknownMouse2(x, y); + m_pToolbarButton->OnUnknownMouse0(); else - m_pToolbarButton->OnUnknownMouse1(x, y); + m_pToolbarButton->OnLeftClick(); } STDMETHODIMP_(void) CUIFToolbarButtonElement::OnRButtonUp(LONG x, LONG y) { if ((m_pToolbarButton->m_dwToolbarButtonFlags & 0x30000) != 0x20000) - m_pToolbarButton->OnUnknownMouse0(); + m_pToolbarButton->OnRightClick(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/sdk/lib/cicero/cicuif.h b/sdk/lib/cicero/cicuif.h index e01518cb05d..6ec4f1deeb3 100644 --- a/sdk/lib/cicero/cicuif.h +++ b/sdk/lib/cicero/cicuif.h @@ -928,8 +928,8 @@ public: STDMETHOD_(void, SetToolTip)(LPCWSTR pszToolTip) override; STDMETHOD_(void, OnUnknownMouse0)() { } - STDMETHOD_(void, OnUnknownMouse1)(LONG x, LONG y) { } - STDMETHOD_(void, OnUnknownMouse2)(LONG x, LONG y) { } + STDMETHOD_(void, OnLeftClick)() { } + STDMETHOD_(void, OnRightClick)() { } }; /////////////////////////////////////////////////////////////////////////////

1 0

[reactos] 01/01: [SETUPLIB][USETUP] Some cleanup for partition code.
by Hermès Bélusca-Maïto 20 Feb '24

20 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7ad4a2298edc0c232e00… commit b7ad4a2298edc0c232e001c1662205dad022578f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 7 23:29:28 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 20 15:52:37 2024 +0100 [SETUPLIB][USETUP] Some cleanup for partition code. - Make the Create*Partition helpers take a size in bytes, not in sectors. This allows them to be easier to use by the caller, alleviating the need for making the size conversion into sectors. Instead it is done internally by the helpers. - Introduce helper macros to easily retrieve the size of a partition entry or a disk in bytes, from their internal representation in number of sectors. - The 'AutoCreate' variable being USETUP-specific, remove it from the PARTENTRY structure and use instead a flag set into the 'New' member. - Rename IsDiskSizeValid to IsPartitionLargeEnough, to better describe what the function is for. --- base/setup/lib/utils/osdetect.c | 6 +- base/setup/lib/utils/partlist.c | 104 ++++++++++++++++--------------- base/setup/lib/utils/partlist.h | 18 ++++-- base/setup/usetup/partlist.c | 4 +- base/setup/usetup/usetup.c | 134 ++++++++++++++++++++-------------------- 5 files changed, 139 insertions(+), 127 deletions(-) diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index 0ee246c60b1..cc45fa907c2 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -806,12 +806,11 @@ CreateNTOSInstallationsList( ASSERT(PartEntry->DiskEntry == DiskEntry); - DPRINT(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + DPRINT(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", PartEntry->IsPartitioned ? "TRUE" : "FALSE", PartEntry->New ? "Yes" : "No", - PartEntry->AutoCreate ? "Yes" : "No", PartEntry->FormatState, ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); @@ -828,12 +827,11 @@ CreateNTOSInstallationsList( ASSERT(PartEntry->DiskEntry == DiskEntry); - DPRINT(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + DPRINT(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", PartEntry->IsPartitioned ? "TRUE" : "FALSE", PartEntry->New ? "Yes" : "No", - PartEntry->AutoCreate ? "Yes" : "No", PartEntry->FormatState, ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 49c15e9ffe2..6bb16fed9d4 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -552,7 +552,7 @@ IsSuperFloppy( } /* The partition lengths should agree */ - PartitionLengthEstimate = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionLengthEstimate = GetDiskSizeInBytes(DiskEntry); if (PartitionInfo->PartitionLength.QuadPart != PartitionLengthEstimate) { DPRINT1("PartitionLength = %I64u is different from PartitionLengthEstimate = %I64u\n", @@ -676,26 +676,46 @@ CreateInsertBlankRegion( static BOOLEAN InitializePartitionEntry( - IN OUT PPARTENTRY PartEntry, - IN ULONGLONG SectorCount, - IN BOOLEAN AutoCreate) + _Inout_ PPARTENTRY PartEntry, + _In_opt_ ULONGLONG SizeBytes) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; + ULONGLONG SectorCount; + + DPRINT1("Current entry sector count: %I64u\n", PartEntry->SectorCount.QuadPart); - DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + /* The entry must not be already partitioned and not be void */ + ASSERT(!PartEntry->IsPartitioned); + ASSERT(PartEntry->SectorCount.QuadPart); + + /* Convert the size in bytes to sector count. SizeBytes being + * zero means the caller wants to use all the empty space. */ + if ((SizeBytes == 0) || (SizeBytes == GetPartEntrySizeInBytes(PartEntry))) + { + /* Use all of the unpartitioned disk space */ + SectorCount = PartEntry->SectorCount.QuadPart; + } + else + { + SectorCount = SizeBytes / DiskEntry->BytesPerSector; + if (SectorCount == 0) + { + /* SizeBytes was certainly less than the minimal size, so fail */ + DPRINT1("Partition size %I64u too small\n", SizeBytes); + return FALSE; + } + } + DPRINT1(" New sector count: %I64u\n", SectorCount); - /* Fail if we try to initialize this partition entry with more sectors than what it actually contains */ + /* Fail if we request more sectors than what the entry actually contains */ if (SectorCount > PartEntry->SectorCount.QuadPart) return FALSE; - /* Fail if the partition is already in use */ - ASSERT(!PartEntry->IsPartitioned); - - if ((AutoCreate != FALSE) || + if ((SectorCount == 0) || (AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart)) { - PartEntry->AutoCreate = AutoCreate; + /* Reuse the whole current entry */ } else { @@ -703,7 +723,8 @@ InitializePartitionEntry( ULONGLONG SectorCount2; PPARTENTRY NewPartEntry; - /* Create a partition entry that represents the remaining space after the partition to be initialized */ + /* Create a partition entry that represents the remaining space + * after the partition to be initialized */ StartSector = AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment); SectorCount2 = PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - StartSector; @@ -735,7 +756,6 @@ InitializePartitionEntry( PartEntry->FormatState = Unformatted; PartEntry->FileSystem[0] = L'\0'; - // PartEntry->AutoCreate = AutoCreate; PartEntry->BootIndicator = FALSE; DPRINT1("First Sector : %I64u\n", PartEntry->StartSector.QuadPart); @@ -2390,37 +2410,24 @@ GetPrevPartition( return NULL; } -// static -FORCEINLINE +static inline BOOLEAN IsEmptyLayoutEntry( - IN PPARTITION_INFORMATION PartitionInfo) + _In_ PPARTITION_INFORMATION PartitionInfo) { - if (PartitionInfo->StartingOffset.QuadPart == 0 && - PartitionInfo->PartitionLength.QuadPart == 0) - { - return TRUE; - } - - return FALSE; + return (PartitionInfo->StartingOffset.QuadPart == 0 && + PartitionInfo->PartitionLength.QuadPart == 0); } -// static -FORCEINLINE +static inline BOOLEAN IsSamePrimaryLayoutEntry( - IN PPARTITION_INFORMATION PartitionInfo, - IN PDISKENTRY DiskEntry, - IN PPARTENTRY PartEntry) + _In_ PPARTITION_INFORMATION PartitionInfo, + _In_ PPARTENTRY PartEntry) { - if (PartitionInfo->StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector && - PartitionInfo->PartitionLength.QuadPart == PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) + return ((PartitionInfo->StartingOffset.QuadPart == GetPartEntryOffsetInBytes(PartEntry)) && + (PartitionInfo->PartitionLength.QuadPart == GetPartEntrySizeInBytes(PartEntry))); // PartitionInfo->PartitionType == PartEntry->PartitionType - { - return TRUE; - } - - return FALSE; } static @@ -2578,12 +2585,12 @@ UpdateDiskLayout( PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); - if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) + if (!IsSamePrimaryLayoutEntry(PartitionInfo, PartEntry)) { DPRINT1("Updating primary partition entry %lu\n", Index); - PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); + PartitionInfo->PartitionLength.QuadPart = GetPartEntrySizeInBytes(PartEntry); PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; PartitionInfo->PartitionType = PartEntry->PartitionType; @@ -2624,8 +2631,8 @@ UpdateDiskLayout( DPRINT1("Updating logical partition entry %lu\n", Index); - PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); + PartitionInfo->PartitionLength.QuadPart = GetPartEntrySizeInBytes(PartEntry); PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; PartitionInfo->PartitionType = PartEntry->PartitionType; @@ -2862,12 +2869,11 @@ BOOLEAN CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount, - _In_ BOOLEAN AutoCreate) + _In_opt_ ULONGLONG SizeBytes) { ERROR_NUMBER Error; - DPRINT1("CreatePartition(%I64u)\n", SectorCount); + DPRINT1("CreatePartition(%I64u bytes)\n", SizeBytes); if (List == NULL || PartEntry == NULL || PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) @@ -2883,7 +2889,7 @@ CreatePartition( } /* Initialize the partition entry, inserting a new blank region if needed */ - if (!InitializePartitionEntry(PartEntry, SectorCount, AutoCreate)) + if (!InitializePartitionEntry(PartEntry, SizeBytes)) return FALSE; UpdateDiskLayout(PartEntry->DiskEntry); @@ -2924,11 +2930,11 @@ BOOLEAN CreateExtendedPartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount) + _In_opt_ ULONGLONG SizeBytes) { ERROR_NUMBER Error; - DPRINT1("CreateExtendedPartition(%I64u)\n", SectorCount); + DPRINT1("CreateExtendedPartition(%I64u bytes)\n", SizeBytes); if (List == NULL || PartEntry == NULL || PartEntry->DiskEntry == NULL || PartEntry->IsPartitioned) @@ -2944,7 +2950,7 @@ CreateExtendedPartition( } /* Initialize the partition entry, inserting a new blank region if needed */ - if (!InitializePartitionEntry(PartEntry, SectorCount, FALSE)) + if (!InitializePartitionEntry(PartEntry, SizeBytes)) return FALSE; ASSERT(PartEntry->LogicalPartition == FALSE); @@ -3933,7 +3939,7 @@ SetMountedDeviceValues( /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { - StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->LayoutBuffer->Signature, StartingOffset)) @@ -3956,7 +3962,7 @@ SetMountedDeviceValues( /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { - StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + StartingOffset.QuadPart = GetPartEntryOffsetInBytes(PartEntry); if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->LayoutBuffer->Signature, StartingOffset)) diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index c59b5e1f4b7..d5b20615455 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -70,9 +70,6 @@ typedef struct _PARTENTRY /* Partition is new, table does not exist on disk yet */ BOOLEAN New; - /* Partition was created automatically */ - BOOLEAN AutoCreate; - /* Partition must be checked */ BOOLEAN NeedsCheck; @@ -227,6 +224,16 @@ RoundingDivide( IN ULONGLONG Divisor); +#define GetPartEntryOffsetInBytes(PartEntry) \ + ((PartEntry)->StartSector.QuadPart * (PartEntry)->DiskEntry->BytesPerSector) + +#define GetPartEntrySizeInBytes(PartEntry) \ + ((PartEntry)->SectorCount.QuadPart * (PartEntry)->DiskEntry->BytesPerSector) + +#define GetDiskSizeInBytes(DiskEntry) \ + ((DiskEntry)->SectorCount.QuadPart * (DiskEntry)->BytesPerSector) + + BOOLEAN IsSuperFloppy( IN PDISKENTRY DiskEntry); @@ -306,14 +313,13 @@ BOOLEAN CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount, - _In_ BOOLEAN AutoCreate); + _In_opt_ ULONGLONG SizeBytes); BOOLEAN CreateExtendedPartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, - _In_ ULONGLONG SectorCount); + _In_opt_ ULONGLONG SizeBytes); NTSTATUS DismountVolume( diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 5feaf446529..72ae328cbde 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -156,7 +156,7 @@ PartitionDescription( PCSTR Unit; /* Get the partition size */ - PartSize = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + PartSize = GetPartEntrySizeInBytes(PartEntry); PrettifySize2(&PartSize, &Unit); if (PartEntry->IsPartitioned == FALSE) @@ -307,7 +307,7 @@ DiskDescription( PCSTR Unit; /* Get the disk size */ - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + DiskSize = GetDiskSizeInBytes(DiskEntry); PrettifySize1(&DiskSize, &Unit); // diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 61fae743780..59593f38b59 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -79,6 +79,9 @@ static enum { PartTypeExtended // MBR-disk container } PartCreateType = PartTypeData; +/* Flag set in PARTENTRY::New when a partition is created automatically */ +#define PARTITION_NEW_AUTOCREATE 0x80 + /* List of supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; @@ -1503,18 +1506,18 @@ LayoutSettingsPage(PINPUT_RECORD Ir) } -static BOOL -IsDiskSizeValid(PPARTENTRY PartEntry) +static BOOLEAN +IsPartitionLargeEnough( + _In_ PPARTENTRY PartEntry) { - ULONGLONG size; + /* Retrieve the maximum size in MB (rounded up) */ + ULONGLONG PartSize = RoundingDivide(GetPartEntrySizeInBytes(PartEntry), MB); - size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; - size = (size + (512 * KB)) / MB; /* in MBytes */ - - if (size < USetupData.RequiredPartitionDiskSpace) + if (PartSize < USetupData.RequiredPartitionDiskSpace) { /* Partition is too small so ask for another one */ - DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, USetupData.RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", + PartSize, USetupData.RequiredPartitionDiskSpace); return FALSE; } else @@ -1608,13 +1611,15 @@ SelectPartitionPage(PINPUT_RECORD Ir) ASSERT(CurrentPartition != NULL); ASSERT(!IsContainerPartition(CurrentPartition->PartitionType)); + /* Automatically create the partition on the whole empty space; + * it will be formatted later with default parameters */ CreatePartition(PartitionList, CurrentPartition, - CurrentPartition->SectorCount.QuadPart, - TRUE); + 0ULL); + CurrentPartition->New |= PARTITION_NEW_AUTOCREATE; // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(CurrentPartition)) + if (!IsPartitionLargeEnough(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -1632,7 +1637,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) DrawPartitionList(&ListUi); // FIXME: Doesn't make much sense... // FIXME?? Aren't we going to enter an infinite loop, if this test fails?? - if (!IsDiskSizeValid(InstallPartition)) + if (!IsPartitionLargeEnough(InstallPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -1737,13 +1742,15 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } + /* Automatically create the partition on the whole empty space; + * it will be formatted later with default parameters */ CreatePartition(PartitionList, CurrentPartition, - 0ULL, - TRUE); + 0ULL); + CurrentPartition->New |= PARTITION_NEW_AUTOCREATE; } - if (!IsDiskSizeValid(CurrentPartition)) + if (!IsPartitionLargeEnough(CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, USetupData.RequiredPartitionDiskSpace); @@ -2040,11 +2047,9 @@ CreatePartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; PDISKENTRY DiskEntry; ULONG uID; - BOOLEAN Quit; - BOOLEAN Cancel; ULONG MaxSize; - ULONGLONG PartSize; - ULONGLONG SectorCount; + ULONGLONG MaxPartSize, PartSize; + BOOLEAN Quit, Cancel; WCHAR InputBuffer[50]; CHAR LineBuffer[100]; @@ -2078,15 +2083,17 @@ CreatePartitionPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); + MaxPartSize = GetPartEntrySizeInBytes(PartEntry); + while (TRUE) { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ - if (MaxSize > PARTITION_MAXSIZE) - MaxSize = PARTITION_MAXSIZE; + /* Retrieve the maximum size in MB (rounded up) + * and cap it with what the user can enter */ + MaxSize = (ULONG)RoundingDivide(MaxPartSize, MB); + MaxSize = min(MaxSize, PARTITION_MAXSIZE); - ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, MaxSize, InputBuffer, &Quit, &Cancel); - if (Quit) { if (ConfirmQuit(Ir)) @@ -2097,50 +2104,41 @@ CreatePartitionPage(PINPUT_RECORD Ir) { return SELECT_PARTITION_PAGE; } - else - { - PartSize = _wcstoui64(InputBuffer, NULL, 10); - /* Retry if too small or too large */ - if (PartSize < 1) - continue; - if (PartSize > MaxSize) - continue; - - /* Convert to bytes */ - if (PartSize == MaxSize) - { - /* Use all of the unpartitioned disk space */ - SectorCount = PartEntry->SectorCount.QuadPart; - } - else - { - /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * MB / DiskEntry->BytesPerSector; + PartSize = _wcstoui64(InputBuffer, NULL, 10); - /* But never get larger than the unpartitioned disk space */ - if (SectorCount > PartEntry->SectorCount.QuadPart) - SectorCount = PartEntry->SectorCount.QuadPart; - } + /* Retry if too small or too large */ + if ((PartSize < 1) || (PartSize > MaxSize)) + continue; - DPRINT("Partition size: %I64u bytes\n", PartSize); + /* + * If the input size, given in MB, specifies the maximum partition + * size, it may slightly under- or over-estimate it due to rounding + * error. In this case, use all of the unpartitioned disk space. + * Otherwise, directly convert the size to bytes. + */ + if (PartSize == MaxSize) + PartSize = MaxPartSize; + else // if (PartSize < MaxSize) + PartSize *= MB; + DPRINT("Partition size: %I64u bytes\n", PartSize); - if (PartCreateType == PartTypeData) - { - CreatePartition(PartitionList, - CurrentPartition, - SectorCount, - FALSE); - } - else // if (PartCreateType == PartTypeExtended) - { - CreateExtendedPartition(PartitionList, - CurrentPartition, - SectorCount); - } + ASSERT(PartSize <= MaxPartSize); - return SELECT_PARTITION_PAGE; + if (PartCreateType == PartTypeData) + { + CreatePartition(PartitionList, + CurrentPartition, + PartSize); } + else // if (PartCreateType == PartTypeExtended) + { + CreateExtendedPartition(PartitionList, + CurrentPartition, + PartSize); + } + + return SELECT_PARTITION_PAGE; } return CREATE_PARTITION_PAGE; @@ -2392,10 +2390,14 @@ SelectFileSystemPage(PINPUT_RECORD Ir) */ if (!SystemPartition->IsPartitioned) { + /* Automatically create the partition; it will be + * formatted later with default parameters */ + // FIXME: Don't use the whole empty space, but a minimal size + // specified from the TXTSETUP.SIF or unattended setup. CreatePartition(PartitionList, SystemPartition, - 0LL, // SystemPartition->SectorCount.QuadPart, - TRUE); + 0ULL); + SystemPartition->New |= PARTITION_NEW_AUTOCREATE; ASSERT(SystemPartition->IsPartitioned); } @@ -2548,9 +2550,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); - if (PartEntry->AutoCreate) + if (PartEntry->New & PARTITION_NEW_AUTOCREATE) { - PartEntry->AutoCreate = FALSE; + PartEntry->New &= ~PARTITION_NEW_AUTOCREATE; CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); }

1 0

[reactos] 01/01: [MSCTFIME] Restructuring (#6505)
by Katayama Hirofumi MZ 20 Feb '24

20 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2ec78673d2f2fd8f4156… commit b2ec78673d2f2fd8f41565fef070f40297e911da Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 20 21:11:08 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 20 21:11:08 2024 +0900 [MSCTFIME] Restructuring (#6505) Improve code flexibility. 3700+ lines of msctfime.cpp was too long. JIRA issue: CORE-19360 - Split msctfime.cpp code to some source files and header files. --- dll/ime/msctfime/CMakeLists.txt | 10 +- dll/ime/msctfime/bridge.cpp | 608 ++++++++ dll/ime/msctfime/bridge.h | 80 + dll/ime/msctfime/compartment.cpp | 163 ++ dll/ime/msctfime/compartment.h | 44 + dll/ime/msctfime/functions.cpp | 175 +++ dll/ime/msctfime/functions.h | 63 + dll/ime/msctfime/inputcontext.cpp | 323 ++++ dll/ime/msctfime/inputcontext.h | 91 ++ dll/ime/msctfime/msctfime.cpp | 3003 ++----------------------------------- dll/ime/msctfime/msctfime.h | 17 + dll/ime/msctfime/profile.cpp | 173 +++ dll/ime/msctfime/profile.h | 51 + dll/ime/msctfime/sinks.cpp | 539 +++++++ dll/ime/msctfime/sinks.h | 166 ++ dll/ime/msctfime/tls.cpp | 56 + dll/ime/msctfime/tls.h | 74 + dll/ime/msctfime/ui.cpp | 393 +++++ dll/ime/msctfime/ui.h | 68 + 19 files changed, 3177 insertions(+), 2920 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 5a034398964..288c14afc7f 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -5,7 +5,15 @@ include_directories( spec2def(msctfime.ime msctfime.spec) list(APPEND SOURCE - msctfime.cpp) + bridge.cpp + compartment.cpp + functions.cpp + inputcontext.cpp + msctfime.cpp + profile.cpp + sinks.cpp + tls.cpp + ui.cpp) file(GLOB msctfime_rc_deps res/*.*) add_rc_deps(msctfime.rc ${msctfime_rc_deps}) diff --git a/dll/ime/msctfime/bridge.cpp b/dll/ime/msctfime/bridge.cpp new file mode 100644 index 00000000000..de9e6ba10ef --- /dev/null +++ b/dll/ime/msctfime/bridge.cpp @@ -0,0 +1,608 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Bridge + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +/// @implemented +CicBridge::CicBridge() +{ + m_bImmxInited = FALSE; + m_bUnknown1 = FALSE; + m_bDeactivating = FALSE; + m_bUnknown2 = FALSE; + m_pKeystrokeMgr = NULL; + m_pDocMgr = NULL; + m_pThreadMgrEventSink = NULL; + m_cliendId = 0; + m_cRefs = 1; +} + +/// @implemented +STDMETHODIMP CicBridge::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + *ppvObj = NULL; + + if (!IsEqualIID(riid, IID_ITfSysHookSink)) + return E_NOINTERFACE; + + *ppvObj = this; + AddRef(); + + return S_OK; +} + +/// @implemented +STDMETHODIMP_(ULONG) CicBridge::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/// @implemented +STDMETHODIMP_(ULONG) CicBridge::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/// @implemented +CicBridge::~CicBridge() +{ + TLS *pTLS = TLS::PeekTLS(); + if (!pTLS || !pTLS->m_pThreadMgr) + return; + + if (SUCCEEDED(DeactivateIMMX(pTLS, pTLS->m_pThreadMgr))) + UnInitIMMX(pTLS); +} + +void 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; + } +} + +/// @unimplemented +HRESULT +CicBridge::CreateInputContext( + _Inout_ TLS *pTLS, + _In_ HIMC hIMC) +{ + CicIMCLock imcLock(hIMC); + HRESULT hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + if (!imcLock.get().hCtfImeContext) + { + HIMCC hCtfImeContext = ImmCreateIMCC(sizeof(CTFIMECONTEXT)); + if (!hCtfImeContext) + return E_OUTOFMEMORY; + imcLock.get().hCtfImeContext = hCtfImeContext; + } + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + 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.get().m_pCicIC = pCicIC; + } + + hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); + if (FAILED(hr)) + { + pCicIC->Release(); + imeContext.get().m_pCicIC = NULL; + } + else + { + if (imcLock.get().hWnd && imcLock.get().hWnd == ::GetFocus()) + { + GetDocumentManager(imeContext); + //FIXME + } + } + + return E_NOTIMPL; +} + +/// @implemented +HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) +{ + CicIMCLock imcLock(hIMC); + HRESULT hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + hr = E_FAIL; + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (imeContext) + hr = imeContext.m_hr; + + if (SUCCEEDED(hr) && !(imeContext.get().m_dwCicFlags & 1)) + { + imeContext.get().m_dwCicFlags |= 1; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + imeContext.get().m_pCicIC = NULL; + hr = pCicIC->DestroyInputContext(); + pCicIC->Release(); + imeContext.get().m_pCicIC = NULL; + } + } + + if (imcLock.get().hCtfImeContext) + { + ImmDestroyIMCC(imcLock.get().hCtfImeContext); + imcLock.get().hCtfImeContext = NULL; + hr = S_OK; + } + + return hr; +} + +ITfContext * +CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) +{ + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return NULL; + return pCicIC->m_pContext; +} + +/// @unimplemented +HRESULT CicBridge::OnSetOpenStatus( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + CicIMCLock& imcLock, + CicInputContext *pCicIC) +{ + return E_NOTIMPL; +} + +/// Selects the IME context. +/// @implemented +HRESULT +CicBridge::SelectEx( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr, + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL) +{ + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (!imeContext) + imeContext.m_hr = E_FAIL; + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + pCicIC->m_bSelecting = TRUE; + + if (fSelect) + { + if (pCicIC) + pCicIC->m_dwUnknown6[1] &= ~1; + if (imcLock.get().fOpen) + OnSetOpenStatus(pTLS, pThreadMgr, imcLock, pCicIC); + } + else + { + ITfContext *pContext = GetInputContext(imeContext); + pThreadMgr->RequestPostponedLock(pContext); + if (pCicIC) + pCicIC->m_bSelecting = FALSE; + if (pContext) + pContext->Release(); + } + + return imeContext.m_hr; +} + +/// Used in CicBridge::EnumCreateInputContextCallback and +/// CicBridge::EnumDestroyInputContextCallback. +typedef struct ENUM_CREATE_DESTROY_IC +{ + TLS *m_pTLS; + CicBridge *m_pBridge; +} ENUM_CREATE_DESTROY_IC, *PENUM_CREATE_DESTROY_IC; + +/// Creates input context for the current thread. +/// @implemented +BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam) +{ + PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; + pData->m_pBridge->CreateInputContext(pData->m_pTLS, hIMC); + return TRUE; +} + +/// Destroys input context for the current thread. +/// @implemented +BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam) +{ + PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; + pData->m_pBridge->DestroyInputContext(pData->m_pTLS, hIMC); + return TRUE; +} + +/// @implemented +HRESULT +CicBridge::ActivateIMMX( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr) +{ + HRESULT hr = pThreadMgr->ActivateEx(&m_cliendId, 1); + if (hr != S_OK) + { + m_cliendId = 0; + return E_FAIL; + } + + if (m_cActivateLocks++ != 0) + return S_OK; + + ITfSourceSingle *pSource = NULL; + hr = pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void**)&pSource); + if (FAILED(hr)) + { + DeactivateIMMX(pTLS, pThreadMgr); + return hr; + } + + CFunctionProvider *pProvider = new(cicNoThrow) CFunctionProvider(m_cliendId); + if (!pProvider) + { + hr = E_FAIL; + goto Finish; + } + + pSource->AdviseSingleSink(m_cliendId, IID_ITfFunctionProvider, pProvider); + pProvider->Release(); + + if (!m_pDocMgr) + { + hr = pThreadMgr->CreateDocumentMgr(&m_pDocMgr); + if (FAILED(hr)) + { + hr = E_FAIL; + goto Finish; + } + + SetCompartmentDWORD(m_cliendId, m_pDocMgr, GUID_COMPARTMENT_CTFIME_DIMFLAGS, TRUE, FALSE); + } + + pThreadMgr->SetSysHookSink(this); + + hr = S_OK; + if (pTLS->m_bDestroyed) + { + ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; + ImmEnumInputContext(0, CicBridge::EnumCreateInputContextCallback, (LPARAM)&Data); + } + +Finish: + if (FAILED(hr)) + DeactivateIMMX(pTLS, pThreadMgr); + if (pSource) + pSource->Release(); + return hr; +} + +/// @implemented +HRESULT +CicBridge::DeactivateIMMX( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr) +{ + if (m_bDeactivating) + return TRUE; + + m_bDeactivating = TRUE; + + if (m_cliendId) + { + ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; + ImmEnumInputContext(0, CicBridge::EnumDestroyInputContextCallback, (LPARAM)&Data); + pTLS->m_bDestroyed = TRUE; + + ITfSourceSingle *pSource = NULL; + if (pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) + pSource->UnadviseSingleSink(m_cliendId, IID_ITfFunctionProvider); + + m_cliendId = 0; + + while (m_cActivateLocks > 0) + { + --m_cActivateLocks; + pThreadMgr->Deactivate(); + } + + if (pSource) + pSource->Release(); + } + + if (m_pDocMgr) + { + m_pDocMgr->Release(); + m_pDocMgr = NULL; + } + + pThreadMgr->SetSysHookSink(NULL); + + m_bDeactivating = FALSE; + + return S_OK; +} + +/// @implemented +HRESULT +CicBridge::InitIMMX(_Inout_ TLS *pTLS) +{ + if (m_bImmxInited) + return S_OK; + + HRESULT hr = S_OK; + if (!pTLS->m_pThreadMgr) + { + ITfThreadMgr *pThreadMgr = NULL; + hr = TF_CreateThreadMgr(&pThreadMgr); + if (FAILED(hr)) + return E_FAIL; + + hr = pThreadMgr->QueryInterface(IID_ITfThreadMgr_P, (void **)&pTLS->m_pThreadMgr); + if (pThreadMgr) + pThreadMgr->Release(); + if (FAILED(hr)) + return E_FAIL; + } + + if (!m_pThreadMgrEventSink) + { + m_pThreadMgrEventSink = + new(cicNoThrow) CThreadMgrEventSink(CThreadMgrEventSink::DIMCallback, NULL, NULL); + if (!m_pThreadMgrEventSink) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + } + + m_pThreadMgrEventSink->SetCallbackPV(m_pThreadMgrEventSink); + m_pThreadMgrEventSink->_Advise(pTLS->m_pThreadMgr); + + if (!pTLS->m_pProfile) + { + pTLS->m_pProfile = new(cicNoThrow) CicProfile(); + if (!pTLS->m_pProfile) + return E_OUTOFMEMORY; + + hr = pTLS->m_pProfile->InitProfileInstance(pTLS); + if (FAILED(hr)) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + } + + hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfKeystrokeMgr_P, (void **)&m_pKeystrokeMgr); + if (FAILED(hr)) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + + hr = InitDisplayAttrbuteLib(&m_LibThread); + if (FAILED(hr)) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + + m_bImmxInited = TRUE; + return S_OK; +} + +/// @implemented +BOOL CicBridge::UnInitIMMX(_Inout_ TLS *pTLS) +{ + UninitDisplayAttrbuteLib(&m_LibThread); + TFUninitLib_Thread(&m_LibThread); + + if (m_pKeystrokeMgr) + { + m_pKeystrokeMgr->Release(); + m_pKeystrokeMgr = NULL; + } + + if (pTLS->m_pProfile) + { + pTLS->m_pProfile->Release(); + pTLS->m_pProfile = NULL; + } + + if (m_pThreadMgrEventSink) + { + m_pThreadMgrEventSink->_Unadvise(); + m_pThreadMgrEventSink->Release(); + m_pThreadMgrEventSink = NULL; + } + + if (pTLS->m_pThreadMgr) + { + pTLS->m_pThreadMgr->Release(); + pTLS->m_pThreadMgr = NULL; + } + + m_bImmxInited = FALSE; + return TRUE; +} + +/// @implemented +STDMETHODIMP CicBridge::OnPreFocusDIM(HWND hwnd) +{ + return S_OK; +} + +/// @unimplemented +STDMETHODIMP CicBridge::OnSysKeyboardProc(UINT, LONG) +{ + return E_NOTIMPL; +} + +/// @implemented +STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG) +{ + return S_OK; +} + +/// @implemented +void +CicBridge::PostTransMsg( + _In_ HWND hWnd, + _In_ INT cTransMsgs, + _In_ const TRANSMSG *pTransMsgs) +{ + for (INT i = 0; i < cTransMsgs; ++i, ++pTransMsgs) + { + ::PostMessageW(hWnd, pTransMsgs->message, pTransMsgs->wParam, pTransMsgs->lParam); + } +} + +/// @implemented +HRESULT +CicBridge::ConfigureGeneral( + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd) +{ + CicProfile *pProfile = pTLS->m_pProfile; + if (!pProfile) + return E_OUTOFMEMORY; + + TF_LANGUAGEPROFILE profile; + HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); + if (FAILED(hr)) + return hr; + + ITfFunctionProvider *pProvider = NULL; + hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); + if (FAILED(hr)) + return hr; + + ITfFnConfigure *pFnConfigure = NULL; + hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigure, (IUnknown**)&pFnConfigure); + if (FAILED(hr)) + { + pProvider->Release(); + return hr; + } + + hr = pFnConfigure->Show(hWnd, profile.langid, profile.guidProfile); + + pFnConfigure->Release(); + pProvider->Release(); + return hr; +} + +/// @implemented +HRESULT +CicBridge::ConfigureRegisterWord( + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd, + _Inout_opt_ LPVOID lpData) +{ + CicProfile *pProfile = pTLS->m_pProfile; + if (!pProfile) + return E_OUTOFMEMORY; + + TF_LANGUAGEPROFILE profile; + HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); + if (FAILED(hr)) + return hr; + + ITfFunctionProvider *pProvider = NULL; + hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); + if (FAILED(hr)) + return hr; + + ITfFnConfigureRegisterWord *pFunction = NULL; + hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigureRegisterWord, (IUnknown**)&pFunction); + if (FAILED(hr)) + { + pProvider->Release(); + return hr; + } + + REGISTERWORDW* pRegWord = (REGISTERWORDW*)lpData; + if (pRegWord) + { + if (pRegWord->lpWord) + { + hr = E_OUTOFMEMORY; + BSTR bstrWord = SysAllocString(pRegWord->lpWord); + if (bstrWord) + { + hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, bstrWord); + SysFreeString(bstrWord); + } + } + else + { + hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, NULL); + } + } + + pProvider->Release(); + pFunction->Release(); + return hr; +} diff --git a/dll/ime/msctfime/bridge.h b/dll/ime/msctfime/bridge.h new file mode 100644 index 00000000000..c8b8441203d --- /dev/null +++ b/dll/ime/msctfime/bridge.h @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Bridge + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "sinks.h" +#include "tls.h" + +class CicBridge : public ITfSysHookSink +{ +protected: + LONG m_cRefs; + BOOL m_bImmxInited; + BOOL m_bUnknown1; + BOOL m_bDeactivating; + DWORD m_cActivateLocks; + ITfKeystrokeMgr *m_pKeystrokeMgr; + ITfDocumentMgr *m_pDocMgr; + CThreadMgrEventSink *m_pThreadMgrEventSink; + TfClientId m_cliendId; + CIC_LIBTHREAD m_LibThread; + BOOL m_bUnknown2; + + static BOOL CALLBACK EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam); + static BOOL CALLBACK EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam); + +public: + CicBridge(); + virtual ~CicBridge(); + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // ITfSysHookSink interface + STDMETHODIMP OnPreFocusDIM(HWND hwnd) override; + STDMETHODIMP OnSysKeyboardProc(UINT, LONG) override; + STDMETHODIMP OnSysShellProc(INT, UINT, LONG) override; + + HRESULT InitIMMX(_Inout_ TLS *pTLS); + BOOL UnInitIMMX(_Inout_ TLS *pTLS); + HRESULT ActivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); + HRESULT DeactivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); + + HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); + HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); + ITfContext *GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext); + + HRESULT SelectEx( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr, + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL); + HRESULT OnSetOpenStatus( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + CicIMCLock& imcLock, + CicInputContext *pCicIC); + + void PostTransMsg(_In_ HWND hWnd, _In_ INT cTransMsgs, _In_ const TRANSMSG *pTransMsgs); + void GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext); + + HRESULT + ConfigureGeneral(_Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd); + HRESULT ConfigureRegisterWord( + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd, + _Inout_opt_ LPVOID lpData); +}; diff --git a/dll/ime/msctfime/compartment.cpp b/dll/ime/msctfime/compartment.cpp new file mode 100644 index 00000000000..d92b1b526f4 --- /dev/null +++ b/dll/ime/msctfime/compartment.cpp @@ -0,0 +1,163 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting compartments + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +/// @implemented +HRESULT +GetCompartment( + IUnknown *pUnknown, + REFGUID rguid, + ITfCompartment **ppComp, + BOOL bThread) +{ + *ppComp = NULL; + + ITfThreadMgr *pThreadMgr = NULL; + ITfCompartmentMgr *pCompMgr = NULL; + + HRESULT hr; + if (bThread) + { + hr = pUnknown->QueryInterface(IID_ITfThreadMgr, (void **)&pThreadMgr); + if (FAILED(hr)) + return hr; + + hr = pThreadMgr->GetGlobalCompartment(&pCompMgr); + } + else + { + hr = pUnknown->QueryInterface(IID_ITfCompartmentMgr, (void **)&pCompMgr); + } + + if (SUCCEEDED(hr)) + { + hr = E_FAIL; + if (pCompMgr) + { + hr = pCompMgr->GetCompartment(rguid, ppComp); + pCompMgr->Release(); + } + } + + if (pThreadMgr) + pThreadMgr->Release(); + + return hr; +} + +/// @implemented +HRESULT +SetCompartmentDWORD( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + DWORD dwValue, + BOOL bThread) +{ + ITfCompartment *pComp = NULL; + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); + if (FAILED(hr)) + return hr; + + VARIANT vari; + V_I4(&vari) = dwValue; + V_VT(&vari) = VT_I4; + hr = pComp->SetValue(cookie, &vari); + + pComp->Release(); + return hr; +} + +/// @implemented +HRESULT +GetCompartmentDWORD( + IUnknown *pUnknown, + REFGUID rguid, + LPDWORD pdwValue, + BOOL bThread) +{ + *pdwValue = 0; + + ITfCompartment *pComp = NULL; + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); + if (FAILED(hr)) + return hr; + + VARIANT vari; + hr = pComp->GetValue(&vari); + if (hr == S_OK) + *pdwValue = V_I4(&vari); + + pComp->Release(); + return hr; +} + +/// @implemented +HRESULT +SetCompartmentUnknown( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + IUnknown *punkValue) +{ + ITfCompartment *pComp = NULL; + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, FALSE); + if (FAILED(hr)) + return hr; + + VARIANT vari; + V_UNKNOWN(&vari) = punkValue; + V_VT(&vari) = VT_UNKNOWN; + hr = pComp->SetValue(cookie, &vari); + + pComp->Release(); + return hr; +} + +/// @implemented +HRESULT +ClearCompartment( + TfClientId tid, + IUnknown *pUnknown, + REFGUID rguid, + BOOL bThread) +{ + ITfCompartmentMgr *pCompMgr = NULL; + ITfThreadMgr *pThreadMgr = NULL; + + HRESULT hr; + if (bThread) + { + hr = pUnknown->QueryInterface(IID_ITfThreadMgr, (void **)&pThreadMgr); + if (FAILED(hr)) + return hr; + + hr = pThreadMgr->GetGlobalCompartment(&pCompMgr); + } + else + { + hr = pUnknown->QueryInterface(IID_ITfCompartmentMgr, (void **)&pCompMgr); + } + + if (SUCCEEDED(hr)) + { + hr = E_FAIL; + if (pCompMgr) + { + hr = pCompMgr->ClearCompartment(tid, rguid); + pCompMgr->Release(); + } + } + + if (pThreadMgr) + pThreadMgr->Release(); + + return hr; +} diff --git a/dll/ime/msctfime/compartment.h b/dll/ime/msctfime/compartment.h new file mode 100644 index 00000000000..88805566832 --- /dev/null +++ b/dll/ime/msctfime/compartment.h @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting compartments + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +HRESULT +GetCompartment( + IUnknown *pUnknown, + REFGUID rguid, + ITfCompartment **ppComp, + BOOL bThread); + +HRESULT +SetCompartmentDWORD( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + DWORD dwValue, + BOOL bThread); + +HRESULT +GetCompartmentDWORD( + IUnknown *pUnknown, + REFGUID rguid, + LPDWORD pdwValue, + BOOL bThread); + +HRESULT +SetCompartmentUnknown( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + IUnknown *punkValue); + +HRESULT +ClearCompartment( + TfClientId tid, + IUnknown *pUnknown, + REFGUID rguid, + BOOL bThread); diff --git a/dll/ime/msctfime/functions.cpp b/dll/ime/msctfime/functions.cpp new file mode 100644 index 00000000000..c9832f90cff --- /dev/null +++ b/dll/ime/msctfime/functions.cpp @@ -0,0 +1,175 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: The functions 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; +} + +/// @unimplemented +STDMETHODIMP CFnDocFeed::DocFeed() +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CFnDocFeed::StartReconvert() +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CFnDocFeed::StartUndoCompositionString() +{ + return E_NOTIMPL; +} diff --git a/dll/ime/msctfime/functions.h b/dll/ime/msctfime/functions.h new file mode 100644 index 00000000000..6938162a6e5 --- /dev/null +++ b/dll/ime/msctfime/functions.h @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: The functions 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/inputcontext.cpp b/dll/ime/msctfime/inputcontext.cpp new file mode 100644 index 00000000000..1bdf64cb62e --- /dev/null +++ b/dll/ime/msctfime/inputcontext.cpp @@ -0,0 +1,323 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Input Context of msctfime.ime + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +/// @unimplemented +CicInputContext::CicInputContext( + _In_ TfClientId cliendId, + _Inout_ PCIC_LIBTHREAD pLibThread, + _In_ HIMC hIMC) +{ + m_hIMC = hIMC; + m_guid = GUID_NULL; + m_dwQueryPos = 0; + m_cRefs = 1; +} + +/// @implemented +STDMETHODIMP CicInputContext::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + *ppvObj = NULL; + + if (IsEqualIID(riid, IID_ITfContextOwnerCompositionSink)) + { + *ppvObj = static_cast<ITfContextOwnerCompositionSink*>(this); + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfCleanupContextSink)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + + return E_NOINTERFACE; +} + +/// @implemented +STDMETHODIMP_(ULONG) CicInputContext::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/// @implemented +STDMETHODIMP_(ULONG) CicInputContext::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/// @implemented +STDMETHODIMP +CicInputContext::OnStartComposition( + ITfCompositionView *pComposition, + BOOL *pfOk) +{ + if ((m_cCompLocks <= 0) || m_dwUnknown6_5) + { + *pfOk = TRUE; + ++m_cCompLocks; + } + else + { + *pfOk = FALSE; + } + return S_OK; +} + +/// @implemented +STDMETHODIMP +CicInputContext::OnUpdateComposition( + ITfCompositionView *pComposition, + ITfRange *pRangeNew) +{ + return S_OK; +} + +/// @implemented +STDMETHODIMP +CicInputContext::OnEndComposition( + ITfCompositionView *pComposition) +{ + --m_cCompLocks; + return S_OK; +} + +/// @implemented +HRESULT +CicInputContext::GetGuidAtom( + _Inout_ CicIMCLock& imcLock, + _In_ BYTE iAtom, + _Out_opt_ LPDWORD pdwGuidAtom) +{ + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); + HRESULT hr = imeContext.m_hr; + if (!imeContext) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + hr = E_FAIL; + if (iAtom < m_cGuidAtoms) + { + *pdwGuidAtom = m_adwGuidAtoms[iAtom]; + hr = S_OK; + } + + return hr; +} + +/// @unimplemented +HRESULT +CicInputContext::CreateInputContext( + _Inout_ ITfThreadMgr *pThreadMgr, + _Inout_ CicIMCLock& imcLock) +{ + //FIXME + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT +CicInputContext::DestroyInputContext() +{ + ITfSourceSingle *pSource = NULL; + + if (m_pContext && m_pContext->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) + pSource->UnadviseSingleSink(m_clientId, IID_ITfCleanupContextSink); + + //FIXME: m_dwUnknown5 + + if (m_pTextEventSink) + { + m_pTextEventSink->_Unadvise(); + m_pTextEventSink->Release(); + m_pTextEventSink = NULL; + } + + if (m_pCompEventSink2) + { + m_pCompEventSink2->_Unadvise(); + m_pCompEventSink2->Release(); + m_pCompEventSink2 = NULL; + } + + if (m_pCompEventSink1) + { + m_pCompEventSink1->_Unadvise(); + m_pCompEventSink1->Release(); + m_pCompEventSink1 = NULL; + } + + //FIXME: m_pInputContextOwner + + if (m_pDocumentMgr) + m_pDocumentMgr->Pop(1); + + if (m_pContext) + { + ClearCompartment(m_clientId, m_pContext, GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0); + m_pContext->Release(); + m_pContext = NULL; + } + + if (m_pContextOwnerServices) + { + m_pContextOwnerServices->Release(); + m_pContextOwnerServices = NULL; + } + + // FIXME: m_pICOwnerCallback + + if (m_pDocumentMgr) + { + m_pDocumentMgr->Release(); + m_pDocumentMgr = NULL; + } + + if (pSource) + pSource->Release(); + + return S_OK; +} + +/// @implemented +STDMETHODIMP +CicInputContext::OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) +{ + return S_OK; +} + +/// @implemented +STDMETHODIMP +CicInputContext::OnCleanupContext( + _In_ TfEditCookie ecWrite, + _Inout_ ITfContext *pic) +{ + TLS *pTLS = TLS::PeekTLS(); + if (!pTLS || !pTLS->m_pProfile) + return E_OUTOFMEMORY; + + LANGID LangID; + pTLS->m_pProfile->GetLangId(&LangID); + + IMEINFO IMEInfo; + WCHAR szPath[MAX_PATH]; + if (Inquire(&IMEInfo, szPath, 0, (HKL)UlongToHandle(LangID)) != S_OK) + return E_FAIL; + + ITfProperty *pProp = NULL; + if (!(IMEInfo.fdwProperty & IME_PROP_COMPLETE_ON_UNSELECT)) + return S_OK; + + HRESULT hr = pic->GetProperty(GUID_PROP_COMPOSING, &pProp); + if (FAILED(hr)) + return S_OK; + + IEnumTfRanges *pRanges = NULL; + hr = pProp->EnumRanges(ecWrite, &pRanges, NULL); + if (SUCCEEDED(hr)) + { + ITfRange *pRange = NULL; + while (pRanges->Next(1, &pRange, 0) == S_OK) + { + VARIANT vari; + V_VT(&vari) = VT_EMPTY; + pProp->GetValue(ecWrite, pRange, &vari); + if (V_VT(&vari) == VT_I4) + { + if (V_I4(&vari)) + pProp->Clear(ecWrite, pRange); + } + pRange->Release(); + pRange = NULL; + } + pRanges->Release(); + } + pProp->Release(); + + return S_OK; +} + +/// 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 new file mode 100644 index 00000000000..2273161926e --- /dev/null +++ b/dll/ime/msctfime/inputcontext.h @@ -0,0 +1,91 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Input Context of msctfime.ime + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "sinks.h" + +class CInputContextOwnerCallBack; +class CInputContextOwner; + +HRESULT +Inquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags, + _In_ HKL hKL); + +/*********************************************************************** + * CicInputContext + * + * The msctfime.ime's input context. + */ +class CicInputContext + : public ITfCleanupContextSink + , public ITfContextOwnerCompositionSink + , public ITfCompositionSink +{ +public: + LONG m_cRefs; + HIMC m_hIMC; + ITfDocumentMgr *m_pDocumentMgr; + ITfContext *m_pContext; + ITfContextOwnerServices *m_pContextOwnerServices; + CInputContextOwnerCallBack *m_pICOwnerCallback; + CTextEventSink *m_pTextEventSink; + CCompartmentEventSink *m_pCompEventSink1; + CCompartmentEventSink *m_pCompEventSink2; + CInputContextOwner *m_pInputContextOwner; + DWORD m_dwUnknown3[3]; + DWORD m_dwUnknown4[2]; + DWORD m_dwQueryPos; + DWORD m_dwUnknown5; + GUID m_guid; + DWORD m_dwUnknown6[11]; + BOOL m_bSelecting; + DWORD m_dwUnknown6_5; + LONG m_cCompLocks; + DWORD m_dwUnknown7[5]; + WORD m_cGuidAtoms; + WORD m_padding; + DWORD m_adwGuidAtoms[256]; + DWORD m_dwUnknown8[17]; + TfClientId m_clientId; + DWORD m_dwUnknown9; + +public: + CicInputContext( + _In_ TfClientId cliendId, + _Inout_ PCIC_LIBTHREAD pLibThread, + _In_ HIMC hIMC); + virtual ~CicInputContext() { } + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // ITfCleanupContextSink interface + STDMETHODIMP OnCleanupContext(_In_ TfEditCookie ecWrite, _Inout_ ITfContext *pic) override; + + // ITfContextOwnerCompositionSink interface + STDMETHODIMP OnStartComposition(ITfCompositionView *pComposition, BOOL *pfOk) override; + STDMETHODIMP OnUpdateComposition(ITfCompositionView *pComposition, ITfRange *pRangeNew) override; + STDMETHODIMP OnEndComposition(ITfCompositionView *pComposition) override; + + // ITfCompositionSink interface + STDMETHODIMP OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) override; + + HRESULT + GetGuidAtom( + _Inout_ CicIMCLock& imcLock, + _In_ BYTE iAtom, + _Out_opt_ LPDWORD pdwGuidAtom); + + HRESULT CreateInputContext(_Inout_ ITfThreadMgr *pThreadMgr, _Inout_ CicIMCLock& imcLock); + HRESULT DestroyInputContext(); +}; diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index ccd442083ab..445998d6a9c 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -20,87 +20,31 @@ BOOL gfTFInitLib = FALSE; CRITICAL_SECTION g_csLock; CDispAttrPropCache *g_pPropCache = NULL; -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); - EXTERN_C void __cxa_pure_virtual(void) { ERR("__cxa_pure_virtual\n"); } -UINT WM_MSIME_SERVICE = 0; -UINT WM_MSIME_UIREADY = 0; -UINT WM_MSIME_RECONVERTREQUEST = 0; -UINT WM_MSIME_RECONVERT = 0; -UINT WM_MSIME_DOCUMENTFEED = 0; -UINT WM_MSIME_QUERYPOSITION = 0; -UINT WM_MSIME_MODEBIAS = 0; -UINT WM_MSIME_SHOWIMEPAD = 0; -UINT WM_MSIME_MOUSE = 0; -UINT WM_MSIME_KEYMAP = 0; - -/// @implemented -BOOL IsMsImeMessage(_In_ UINT uMsg) -{ - return (uMsg == WM_MSIME_SERVICE || - uMsg == WM_MSIME_UIREADY || - uMsg == WM_MSIME_RECONVERTREQUEST || - uMsg == WM_MSIME_RECONVERT || - uMsg == WM_MSIME_DOCUMENTFEED || - uMsg == WM_MSIME_QUERYPOSITION || - uMsg == WM_MSIME_MODEBIAS || - uMsg == WM_MSIME_SHOWIMEPAD || - uMsg == WM_MSIME_MOUSE || - uMsg == WM_MSIME_KEYMAP); -} - -/// @implemented -BOOL RegisterMSIMEMessage(VOID) -{ - // Using ANSI (A) version here can reduce binary size. - WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); - WM_MSIME_UIREADY = RegisterWindowMessageA("MSIMEUIReady"); - WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); - WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); - WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); - WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); - WM_MSIME_MODEBIAS = RegisterWindowMessageA("MSIMEModeBias"); - WM_MSIME_SHOWIMEPAD = RegisterWindowMessageA("MSIMEShowImePad"); - WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); - WM_MSIME_KEYMAP = RegisterWindowMessageA("MSIMEKeyMap"); - return (WM_MSIME_SERVICE && - WM_MSIME_UIREADY && - WM_MSIME_RECONVERTREQUEST && - WM_MSIME_RECONVERT && - WM_MSIME_DOCUMENTFEED && - WM_MSIME_QUERYPOSITION && - WM_MSIME_MODEBIAS && - WM_MSIME_SHOWIMEPAD && - WM_MSIME_MOUSE && - WM_MSIME_KEYMAP); -} - -typedef BOOLEAN (WINAPI *FN_DllShutDownInProgress)(VOID); +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) +EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID) { HMODULE hNTDLL; - static FN_DllShutDownInProgress s_fnDllShutDownInProgress = NULL; + static FN_DllShutdownInProgress s_fnDllShutdownInProgress = NULL; - if (s_fnDllShutDownInProgress) - return s_fnDllShutDownInProgress(); + if (s_fnDllShutdownInProgress) + return s_fnDllShutdownInProgress(); hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); - s_fnDllShutDownInProgress = - (FN_DllShutDownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress"); - if (!s_fnDllShutDownInProgress) + s_fnDllShutdownInProgress = + (FN_DllShutdownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress"); + if (!s_fnDllShutdownInProgress) return FALSE; - return s_fnDllShutDownInProgress(); + return s_fnDllShutdownInProgress(); } /// This function checks if the current user logon session is interactive. @@ -195,2533 +139,115 @@ HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) } ::LeaveCriticalSection(&g_csLock); - return hr; -} - -HIMC GetActiveContext(VOID) -{ - HWND hwndFocus = ::GetFocus(); - if (!hwndFocus) - hwndFocus = ::GetActiveWindow(); - return ::ImmGetContext(hwndFocus); -} - -/// @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 -InternalSelectEx( - _In_ HIMC hIMC, - _In_ BOOL fSelect, - _In_ LANGID LangID) -{ - CicIMCLock imcLock(hIMC); - if (!imcLock) - imcLock.m_hr = E_FAIL; - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - if (PRIMARYLANGID(LangID) == LANG_CHINESE) - { - imcLock.get().cfCandForm[0].dwStyle = 0; - imcLock.get().cfCandForm[0].dwIndex = (DWORD)-1; - } - - if (!fSelect) - { - imcLock.get().fdwInit &= ~INIT_GUIDMAP; - return imcLock.m_hr; - } - - if (!imcLock.ClearCand()) - return imcLock.m_hr; - - // Populate conversion mode - if (!(imcLock.get().fdwInit & INIT_CONVERSION)) - { - DWORD dwConv = (imcLock.get().fdwConversion & IME_CMODE_SOFTKBD); - if (LangID) - { - if (PRIMARYLANGID(LangID) == LANG_JAPANESE) - { - dwConv |= IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; - } - else if (PRIMARYLANGID(LangID) != LANG_KOREAN) - { - dwConv |= IME_CMODE_NATIVE; - } - } - imcLock.get().fdwConversion |= dwConv; - imcLock.get().fdwInit |= INIT_CONVERSION; - } - - // Populate sentence mode - imcLock.get().fdwSentence |= IME_SMODE_PHRASEPREDICT; - - // Populate LOGFONT - if (!(imcLock.get().fdwInit & INIT_LOGFONT)) - { - // Get logical font - LOGFONTW lf; - HDC hDC = ::GetDC(imcLock.get().hWnd); - HGDIOBJ hFont = GetCurrentObject(hDC, OBJ_FONT); - ::GetObjectW(hFont, sizeof(LOGFONTW), &lf); - ::ReleaseDC(imcLock.get().hWnd, hDC); - - imcLock.get().lfFont.W = lf; - imcLock.get().fdwInit |= INIT_LOGFONT; - } - imcLock.get().lfFont.W.lfCharSet = GetCharsetFromLangId(LangID); - - imcLock.InitContext(); - - return imcLock.m_hr; -} - -/*********************************************************************** - * Compartment - */ - -/// @implemented -HRESULT -GetCompartment( - IUnknown *pUnknown, - REFGUID rguid, - ITfCompartment **ppComp, - BOOL bThread) -{ - *ppComp = NULL; - - ITfThreadMgr *pThreadMgr = NULL; - ITfCompartmentMgr *pCompMgr = NULL; - - HRESULT hr; - if (bThread) - { - hr = pUnknown->QueryInterface(IID_ITfThreadMgr, (void **)&pThreadMgr); - if (FAILED(hr)) - return hr; - - hr = pThreadMgr->GetGlobalCompartment(&pCompMgr); - } - else - { - hr = pUnknown->QueryInterface(IID_ITfCompartmentMgr, (void **)&pCompMgr); - } - - if (SUCCEEDED(hr)) - { - hr = E_FAIL; - if (pCompMgr) - { - hr = pCompMgr->GetCompartment(rguid, ppComp); - pCompMgr->Release(); - } - } - - if (pThreadMgr) - pThreadMgr->Release(); - - return hr; -} - -/// @implemented -HRESULT -SetCompartmentDWORD( - TfEditCookie cookie, - IUnknown *pUnknown, - REFGUID rguid, - DWORD dwValue, - BOOL bThread) -{ - ITfCompartment *pComp = NULL; - HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); - if (FAILED(hr)) - return hr; - - VARIANT vari; - V_I4(&vari) = dwValue; - V_VT(&vari) = VT_I4; - hr = pComp->SetValue(cookie, &vari); - - pComp->Release(); - return hr; -} - -/// @implemented -HRESULT -GetCompartmentDWORD( - IUnknown *pUnknown, - REFGUID rguid, - LPDWORD pdwValue, - BOOL bThread) -{ - *pdwValue = 0; - - ITfCompartment *pComp = NULL; - HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); - if (FAILED(hr)) - return hr; - - VARIANT vari; - hr = pComp->GetValue(&vari); - if (hr == S_OK) - *pdwValue = V_I4(&vari); - - pComp->Release(); - return hr; -} - -/// @implemented -HRESULT -SetCompartmentUnknown( - TfEditCookie cookie, - IUnknown *pUnknown, - REFGUID rguid, - IUnknown *punkValue) -{ - ITfCompartment *pComp = NULL; - HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, FALSE); - if (FAILED(hr)) - return hr; - - VARIANT vari; - V_UNKNOWN(&vari) = punkValue; - V_VT(&vari) = VT_UNKNOWN; - hr = pComp->SetValue(cookie, &vari); - - pComp->Release(); - return hr; -} - -/// @implemented -HRESULT -ClearCompartment( - TfClientId tid, - IUnknown *pUnknown, - REFGUID rguid, - BOOL bThread) -{ - ITfCompartmentMgr *pCompMgr = NULL; - ITfThreadMgr *pThreadMgr = NULL; - - HRESULT hr; - if (bThread) - { - hr = pUnknown->QueryInterface(IID_ITfThreadMgr, (void **)&pThreadMgr); - if (FAILED(hr)) - return hr; - - hr = pThreadMgr->GetGlobalCompartment(&pCompMgr); - } - else - { - hr = pUnknown->QueryInterface(IID_ITfCompartmentMgr, (void **)&pCompMgr); - } - - if (SUCCEEDED(hr)) - { - hr = E_FAIL; - if (pCompMgr) - { - hr = pCompMgr->ClearCompartment(tid, rguid); - pCompMgr->Release(); - } - } - - if (pThreadMgr) - pThreadMgr->Release(); - - return hr; -} - -typedef struct CESMAP -{ - ITfCompartment *m_pComp; - DWORD m_dwCookie; -} CESMAP, *PCESMAP; - -typedef INT (CALLBACK *FN_EVENTSINK)(LPVOID, REFGUID); - -class CCompartmentEventSink : public ITfCompartmentEventSink -{ - CicArray<CESMAP> m_array; - LONG m_cRefs; - FN_EVENTSINK m_fnEventSink; - LPVOID m_pUserData; - -public: - CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData); - virtual ~CCompartmentEventSink(); - - HRESULT _Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread); - HRESULT _Unadvise(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfCompartmentEventSink interface - STDMETHODIMP OnChange(REFGUID rguid) override; -}; - -/// @implemented -CCompartmentEventSink::CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData) - : m_array() - , m_cRefs(1) - , m_fnEventSink(fnEventSink) - , m_pUserData(pUserData) -{ -} - -/// @implemented -CCompartmentEventSink::~CCompartmentEventSink() -{ -} - -/// @implemented -STDMETHODIMP CCompartmentEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfCompartmentEventSink)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - - *ppvObj = NULL; - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CCompartmentEventSink::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CCompartmentEventSink::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -STDMETHODIMP CCompartmentEventSink::OnChange(REFGUID rguid) -{ - return m_fnEventSink(m_pUserData, rguid); -} - -/// @implemented -HRESULT -CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread) -{ - CESMAP *pCesMap = m_array.Append(1); - if (!pCesMap) - return E_OUTOFMEMORY; - - ITfSource *pSource = NULL; - - HRESULT hr = GetCompartment(pUnknown, rguid, &pCesMap->m_pComp, bThread); - if (FAILED(hr)) - { - hr = pCesMap->m_pComp->QueryInterface(IID_ITfSource, (void **)&pSource); - if (FAILED(hr)) - { - hr = pSource->AdviseSink(IID_ITfCompartmentEventSink, this, &pCesMap->m_dwCookie); - if (FAILED(hr)) - { - if (pCesMap->m_pComp) - { - pCesMap->m_pComp->Release(); - pCesMap->m_pComp = NULL; - } - m_array.Remove(m_array.size() - 1, 1); - } - else - { - hr = S_OK; - } - } - } - - if (pSource) - pSource->Release(); - - return hr; -} - -/// @implemented -HRESULT CCompartmentEventSink::_Unadvise() -{ - CESMAP *pCesMap = m_array.data(); - size_t cItems = m_array.size(); - if (!cItems) - return S_OK; - - do - { - ITfSource *pSource = NULL; - HRESULT hr = pCesMap->m_pComp->QueryInterface(IID_ITfSource, (void **)&pSource); - if (SUCCEEDED(hr)) - pSource->UnadviseSink(pCesMap->m_dwCookie); - - if (pCesMap->m_pComp) - { - pCesMap->m_pComp->Release(); - pCesMap->m_pComp = NULL; - } - - if (pSource) - pSource->Release(); - - ++pCesMap; - --cItems; - } while (cItems); - - return S_OK; -} - -class CInputContextOwnerCallBack; -class CInputContextOwner; - -typedef INT (CALLBACK *FN_ENDEDIT)(INT, LPVOID, LPVOID); -typedef INT (CALLBACK *FN_LAYOUTCHANGE)(UINT nType, FN_ENDEDIT fnEndEdit, ITfContextView *pView); - -class CTextEventSink : public ITfTextEditSink, ITfTextLayoutSink -{ -protected: - LONG m_cRefs; - IUnknown *m_pUnknown; - DWORD m_dwEditSinkCookie; - DWORD m_dwLayoutSinkCookie; - union - { - UINT m_uFlags; - FN_LAYOUTCHANGE m_fnLayoutChange; - }; - FN_ENDEDIT m_fnEndEdit; - LPVOID m_pCallbackPV; - -public: - CTextEventSink(FN_ENDEDIT fnEndEdit, LPVOID pCallbackPV); - virtual ~CTextEventSink(); - - HRESULT _Advise(IUnknown *pUnknown, UINT uFlags); - HRESULT _Unadvise(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfTextEditSink interface - STDMETHODIMP OnEndEdit( - ITfContext *pic, - TfEditCookie ecReadOnly, - ITfEditRecord *pEditRecord) override; - - // ITfTextLayoutSink interface - STDMETHODIMP - OnLayoutChange( - ITfContext *pContext, - TfLayoutCode lcode, - ITfContextView *pContextView) override; -}; - -/// @implemented -CTextEventSink::CTextEventSink(FN_ENDEDIT fnEndEdit, LPVOID pCallbackPV) -{ - m_cRefs = 1; - m_pUnknown = NULL; - m_dwEditSinkCookie = (DWORD)-1; - m_dwLayoutSinkCookie = (DWORD)-1; - m_fnLayoutChange = NULL; - m_fnEndEdit = fnEndEdit; - m_pCallbackPV = pCallbackPV; -} - -/// @implemented -CTextEventSink::~CTextEventSink() -{ -} - -/// @implemented -STDMETHODIMP CTextEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfTextEditSink)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - if (IsEqualIID(riid, IID_ITfTextLayoutSink)) - { - *ppvObj = static_cast<ITfTextLayoutSink*>(this); - AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CTextEventSink::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CTextEventSink::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -struct TEXT_EVENT_SINK_END_EDIT -{ - TfEditCookie m_ecReadOnly; - ITfEditRecord *m_pEditRecord; - ITfContext *m_pContext; -}; - -/// @implemented -STDMETHODIMP CTextEventSink::OnEndEdit( - ITfContext *pic, - TfEditCookie ecReadOnly, - ITfEditRecord *pEditRecord) -{ - TEXT_EVENT_SINK_END_EDIT Data = { ecReadOnly, pEditRecord, pic }; - return m_fnEndEdit(1, m_pCallbackPV, (LPVOID)&Data); -} - -/// @implemented -STDMETHODIMP CTextEventSink::OnLayoutChange( - ITfContext *pContext, - TfLayoutCode lcode, - ITfContextView *pContextView) -{ - switch (lcode) - { - case TF_LC_CREATE: - return m_fnLayoutChange(3, m_fnEndEdit, pContextView); - case TF_LC_CHANGE: - return m_fnLayoutChange(2, m_fnEndEdit, pContextView); - case TF_LC_DESTROY: - return m_fnLayoutChange(4, m_fnEndEdit, pContextView); - default: - return E_INVALIDARG; - } -} - -/// @implemented -HRESULT CTextEventSink::_Advise(IUnknown *pUnknown, UINT uFlags) -{ - m_pUnknown = NULL; - m_uFlags = uFlags; - - ITfSource *pSource = NULL; - HRESULT hr = pUnknown->QueryInterface(IID_ITfSource, (void**)&pSource); - if (SUCCEEDED(hr)) - { - ITfTextEditSink *pSink = static_cast<ITfTextEditSink*>(this); - if (uFlags & 1) - hr = pSource->AdviseSink(IID_ITfTextEditSink, pSink, &m_dwEditSinkCookie); - if (SUCCEEDED(hr) && (uFlags & 2)) - hr = pSource->AdviseSink(IID_ITfTextLayoutSink, pSink, &m_dwLayoutSinkCookie); - - if (SUCCEEDED(hr)) - { - m_pUnknown = pUnknown; - pUnknown->AddRef(); - } - else - { - pSource->UnadviseSink(m_dwEditSinkCookie); - } - } - - if (pSource) - pSource->Release(); - - return hr; -} - -/// @implemented -HRESULT CTextEventSink::_Unadvise() -{ - if (!m_pUnknown) - return E_FAIL; - - ITfSource *pSource = NULL; - HRESULT hr = m_pUnknown->QueryInterface(IID_ITfSource, (void**)&pSource); - if (SUCCEEDED(hr)) - { - if (m_uFlags & 1) - hr = pSource->UnadviseSink(m_dwEditSinkCookie); - if (m_uFlags & 2) - hr = pSource->UnadviseSink(m_dwLayoutSinkCookie); - - pSource->Release(); - } - - m_pUnknown->Release(); - m_pUnknown = NULL; - - return E_NOTIMPL; -} - -/*********************************************************************** - * CicInputContext - * - * The msctfime.ime's input context. - */ -class CicInputContext - : public ITfCleanupContextSink - , public ITfContextOwnerCompositionSink - , public ITfCompositionSink -{ -public: - LONG m_cRefs; - HIMC m_hIMC; - ITfDocumentMgr *m_pDocumentMgr; - ITfContext *m_pContext; - ITfContextOwnerServices *m_pContextOwnerServices; - CInputContextOwnerCallBack *m_pICOwnerCallback; - CTextEventSink *m_pTextEventSink; - CCompartmentEventSink *m_pCompEventSink1; - CCompartmentEventSink *m_pCompEventSink2; - CInputContextOwner *m_pInputContextOwner; - DWORD m_dwUnknown3[3]; - DWORD m_dwUnknown4[2]; - DWORD m_dwQueryPos; - DWORD m_dwUnknown5; - GUID m_guid; - DWORD m_dwUnknown6[11]; - BOOL m_bSelecting; - DWORD m_dwUnknown6_5; - LONG m_cCompLocks; - DWORD m_dwUnknown7[5]; - WORD m_cGuidAtoms; - WORD m_padding; - DWORD m_adwGuidAtoms[256]; - DWORD m_dwUnknown8[17]; - TfClientId m_clientId; - DWORD m_dwUnknown9; - -public: - CicInputContext( - _In_ TfClientId cliendId, - _Inout_ PCIC_LIBTHREAD pLibThread, - _In_ HIMC hIMC); - virtual ~CicInputContext() { } - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfCleanupContextSink interface - STDMETHODIMP OnCleanupContext(_In_ TfEditCookie ecWrite, _Inout_ ITfContext *pic) override; - - // ITfContextOwnerCompositionSink interface - STDMETHODIMP OnStartComposition(ITfCompositionView *pComposition, BOOL *pfOk) override; - STDMETHODIMP OnUpdateComposition(ITfCompositionView *pComposition, ITfRange *pRangeNew) override; - STDMETHODIMP OnEndComposition(ITfCompositionView *pComposition) override; - - // ITfCompositionSink interface - STDMETHODIMP OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) override; - - HRESULT - GetGuidAtom( - _Inout_ CicIMCLock& imcLock, - _In_ BYTE iAtom, - _Out_opt_ LPDWORD pdwGuidAtom); - - HRESULT CreateInputContext(_Inout_ ITfThreadMgr *pThreadMgr, _Inout_ CicIMCLock& imcLock); - HRESULT DestroyInputContext(); -}; - -/// @unimplemented -CicInputContext::CicInputContext( - _In_ TfClientId cliendId, - _Inout_ PCIC_LIBTHREAD pLibThread, - _In_ HIMC hIMC) -{ - m_hIMC = hIMC; - m_guid = GUID_NULL; - m_dwQueryPos = 0; - m_cRefs = 1; -} - -/// @implemented -STDMETHODIMP CicInputContext::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID(riid, IID_ITfContextOwnerCompositionSink)) - { - *ppvObj = static_cast<ITfContextOwnerCompositionSink*>(this); - AddRef(); - return S_OK; - } - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfCleanupContextSink)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CicInputContext::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CicInputContext::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -STDMETHODIMP -CicInputContext::OnStartComposition( - ITfCompositionView *pComposition, - BOOL *pfOk) -{ - if ((m_cCompLocks <= 0) || m_dwUnknown6_5) - { - *pfOk = TRUE; - ++m_cCompLocks; - } - else - { - *pfOk = FALSE; - } - return S_OK; -} - -/// @implemented -STDMETHODIMP -CicInputContext::OnUpdateComposition( - ITfCompositionView *pComposition, - ITfRange *pRangeNew) -{ - return S_OK; -} - -/// @implemented -STDMETHODIMP -CicInputContext::OnEndComposition( - ITfCompositionView *pComposition) -{ - --m_cCompLocks; - return S_OK; -} - -/// @implemented -HRESULT -CicInputContext::GetGuidAtom( - _Inout_ CicIMCLock& imcLock, - _In_ BYTE iAtom, - _Out_opt_ LPDWORD pdwGuidAtom) -{ - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); - HRESULT hr = imeContext.m_hr; - if (!imeContext) - hr = E_FAIL; - if (FAILED(hr)) - return hr; - - hr = E_FAIL; - if (iAtom < m_cGuidAtoms) - { - *pdwGuidAtom = m_adwGuidAtoms[iAtom]; - hr = S_OK; - } - - return hr; -} - -/// @unimplemented -HRESULT -CicInputContext::CreateInputContext( - _Inout_ ITfThreadMgr *pThreadMgr, - _Inout_ CicIMCLock& imcLock) -{ - //FIXME - return E_NOTIMPL; -} - -/// @unimplemented -HRESULT -CicInputContext::DestroyInputContext() -{ - ITfSourceSingle *pSource = NULL; - - if (m_pContext && m_pContext->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) - pSource->UnadviseSingleSink(m_clientId, IID_ITfCleanupContextSink); - - //FIXME: m_dwUnknown5 - - if (m_pTextEventSink) - { - m_pTextEventSink->_Unadvise(); - m_pTextEventSink->Release(); - m_pTextEventSink = NULL; - } - - if (m_pCompEventSink2) - { - m_pCompEventSink2->_Unadvise(); - m_pCompEventSink2->Release(); - m_pCompEventSink2 = NULL; - } - - if (m_pCompEventSink1) - { - m_pCompEventSink1->_Unadvise(); - m_pCompEventSink1->Release(); - m_pCompEventSink1 = NULL; - } - - //FIXME: m_pInputContextOwner - - if (m_pDocumentMgr) - m_pDocumentMgr->Pop(1); - - if (m_pContext) - { - ClearCompartment(m_clientId, m_pContext, GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0); - m_pContext->Release(); - m_pContext = NULL; - } - - if (m_pContextOwnerServices) - { - m_pContextOwnerServices->Release(); - m_pContextOwnerServices = NULL; - } - - // FIXME: m_pICOwnerCallback - - if (m_pDocumentMgr) - { - m_pDocumentMgr->Release(); - m_pDocumentMgr = NULL; - } - - if (pSource) - pSource->Release(); - - return S_OK; -} - -/// @implemented -STDMETHODIMP -CicInputContext::OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) -{ - return S_OK; -} - -/// 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; -} - -class TLS; - -typedef INT (CALLBACK *FN_INITDOCMGR)(UINT, ITfDocumentMgr *, ITfDocumentMgr *, LPVOID); -typedef INT (CALLBACK *FN_PUSHPOP)(UINT, ITfContext *, LPVOID); - -class CThreadMgrEventSink : public ITfThreadMgrEventSink -{ -protected: - ITfThreadMgr *m_pThreadMgr; - DWORD m_dwCookie; - FN_INITDOCMGR m_fnInit; - FN_PUSHPOP m_fnPushPop; - DWORD m_dw; - LPVOID m_pCallbackPV; - LONG m_cRefs; - -public: - CThreadMgrEventSink( - _In_ FN_INITDOCMGR fnInit, - _In_ FN_PUSHPOP fnPushPop = NULL, - _Inout_ LPVOID pvCallbackPV = NULL); - virtual ~CThreadMgrEventSink() { } - - void SetCallbackPV(_Inout_ LPVOID pv); - HRESULT _Advise(ITfThreadMgr *pThreadMgr); - HRESULT _Unadvise(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfThreadMgrEventSink interface - STDMETHODIMP OnInitDocumentMgr(ITfDocumentMgr *pdim) override; - STDMETHODIMP OnUninitDocumentMgr(ITfDocumentMgr *pdim) override; - STDMETHODIMP OnSetFocus(ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) override; - STDMETHODIMP OnPushContext(ITfContext *pic) override; - STDMETHODIMP OnPopContext(ITfContext *pic) override; - - static INT CALLBACK DIMCallback( - UINT nCode, - ITfDocumentMgr *pDocMgr1, - ITfDocumentMgr *pDocMgr2, - LPVOID pUserData); -}; - -/// @implemented -CThreadMgrEventSink::CThreadMgrEventSink( - _In_ FN_INITDOCMGR fnInit, - _In_ FN_PUSHPOP fnPushPop, - _Inout_ LPVOID pvCallbackPV) -{ - m_fnInit = fnInit; - m_fnPushPop = fnPushPop; - m_pCallbackPV = pvCallbackPV; - m_cRefs = 1; -} - -/// @implemented -STDMETHODIMP CThreadMgrEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfThreadMgrEventSink)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - *ppvObj = NULL; - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CThreadMgrEventSink::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CThreadMgrEventSink::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -INT CALLBACK -CThreadMgrEventSink::DIMCallback( - UINT nCode, - ITfDocumentMgr *pDocMgr1, - ITfDocumentMgr *pDocMgr2, - LPVOID pUserData) -{ - return E_NOTIMPL; -} - -STDMETHODIMP CThreadMgrEventSink::OnInitDocumentMgr(ITfDocumentMgr *pdim) -{ - if (!m_fnInit) - return S_OK; - return m_fnInit(0, pdim, NULL, m_pCallbackPV); -} - -STDMETHODIMP CThreadMgrEventSink::OnUninitDocumentMgr(ITfDocumentMgr *pdim) -{ - if (!m_fnInit) - return S_OK; - return m_fnInit(1, pdim, NULL, m_pCallbackPV); -} - -STDMETHODIMP -CThreadMgrEventSink::OnSetFocus(ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) -{ - if (!m_fnInit) - return S_OK; - return m_fnInit(2, pdimFocus, pdimPrevFocus, m_pCallbackPV); -} - -STDMETHODIMP CThreadMgrEventSink::OnPushContext(ITfContext *pic) -{ - if (!m_fnPushPop) - return S_OK; - return m_fnPushPop(3, pic, m_pCallbackPV); -} - -STDMETHODIMP CThreadMgrEventSink::OnPopContext(ITfContext *pic) -{ - if (!m_fnPushPop) - return S_OK; - return m_fnPushPop(4, pic, m_pCallbackPV); -} - -void CThreadMgrEventSink::SetCallbackPV(_Inout_ LPVOID pv) -{ - if (!m_pCallbackPV) - m_pCallbackPV = pv; -} - -HRESULT CThreadMgrEventSink::_Advise(ITfThreadMgr *pThreadMgr) -{ - m_pThreadMgr = NULL; - - HRESULT hr = E_FAIL; - ITfSource *pSource = NULL; - if (pThreadMgr->QueryInterface(IID_ITfSource, (void **)&pSource) == S_OK && - pSource->AdviseSink(IID_ITfThreadMgrEventSink, this, &m_dwCookie) == S_OK) - { - m_pThreadMgr = pThreadMgr; - pThreadMgr->AddRef(); - hr = S_OK; - } - - if (pSource) - pSource->Release(); - - return hr; -} - -HRESULT CThreadMgrEventSink::_Unadvise() -{ - HRESULT hr = E_FAIL; - ITfSource *pSource = NULL; - - if (m_pThreadMgr) - { - if (m_pThreadMgr->QueryInterface(IID_ITfSource, (void **)&pSource) == S_OK && - pSource->UnadviseSink(m_dwCookie) == S_OK) - { - hr = S_OK; - } - - if (pSource) - pSource->Release(); - } - - if (m_pThreadMgr) - { - m_pThreadMgr->Release(); - m_pThreadMgr = NULL; - } - - return hr; -} - -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); -}; - -/// @implemented -CFunctionProviderBase::CFunctionProviderBase(_In_ TfClientId clientId) -{ - m_clientId = clientId; - m_guid = GUID_NULL; - m_bstr = NULL; - m_cRefs = 1; -} - -/// @implemented -CFunctionProviderBase::~CFunctionProviderBase() -{ - if (!RtlDllShutdownInProgress()) - ::SysFreeString(m_bstr); -} - -/// @implemented -BOOL -CFunctionProviderBase::Init( - _In_ REFGUID rguid, - _In_ LPCWSTR psz) -{ - m_bstr = ::SysAllocString(psz); - m_guid = rguid; - return (m_bstr != NULL); -} - -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; -}; - -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; -} - -/// @unimplemented -STDMETHODIMP CFnDocFeed::DocFeed() -{ - return E_NOTIMPL; -} - -/// @unimplemented -STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() -{ - return E_NOTIMPL; -} - -/// @unimplemented -STDMETHODIMP CFnDocFeed::StartReconvert() -{ - return E_NOTIMPL; -} - -/// @unimplemented -STDMETHODIMP CFnDocFeed::StartUndoCompositionString() -{ - return E_NOTIMPL; -} - -/// @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); -} - -class CFunctionProvider : public CFunctionProviderBase -{ -public: - CFunctionProvider(_In_ TfClientId clientId); - - STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) override; -}; - -/// @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; -} - -/* FIXME */ -class CicBridge : public ITfSysHookSink -{ -protected: - LONG m_cRefs; - BOOL m_bImmxInited; - BOOL m_bUnknown1; - BOOL m_bDeactivating; - DWORD m_cActivateLocks; - ITfKeystrokeMgr *m_pKeystrokeMgr; - ITfDocumentMgr *m_pDocMgr; - CThreadMgrEventSink *m_pThreadMgrEventSink; - TfClientId m_cliendId; - CIC_LIBTHREAD m_LibThread; - BOOL m_bUnknown2; - - static BOOL CALLBACK EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam); - static BOOL CALLBACK EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam); - -public: - CicBridge(); - virtual ~CicBridge(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfSysHookSink interface - STDMETHODIMP OnPreFocusDIM(HWND hwnd) override; - STDMETHODIMP OnSysKeyboardProc(UINT, LONG) override; - STDMETHODIMP OnSysShellProc(INT, UINT, LONG) override; - - HRESULT InitIMMX(_Inout_ TLS *pTLS); - BOOL UnInitIMMX(_Inout_ TLS *pTLS); - HRESULT ActivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); - HRESULT DeactivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); - - HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); - HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); - ITfContext *GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext); - - HRESULT SelectEx( - _Inout_ TLS *pTLS, - _Inout_ ITfThreadMgr_P *pThreadMgr, - _In_ HIMC hIMC, - _In_ BOOL fSelect, - _In_ HKL hKL); - HRESULT OnSetOpenStatus( - TLS *pTLS, - ITfThreadMgr_P *pThreadMgr, - CicIMCLock& imcLock, - CicInputContext *pCicIC); - - void PostTransMsg(_In_ HWND hWnd, _In_ INT cTransMsgs, _In_ const TRANSMSG *pTransMsgs); - void GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext); - - HRESULT - ConfigureGeneral(_Inout_ TLS* pTLS, - _In_ ITfThreadMgr *pThreadMgr, - _In_ HKL hKL, - _In_ HWND hWnd); - HRESULT ConfigureRegisterWord( - _Inout_ TLS* pTLS, - _In_ ITfThreadMgr *pThreadMgr, - _In_ HKL hKL, - _In_ HWND hWnd, - _Inout_opt_ LPVOID lpData); -}; - -class CActiveLanguageProfileNotifySink : public ITfActiveLanguageProfileNotifySink -{ -protected: - typedef INT (CALLBACK *FN_COMPARE)(REFGUID rguid1, REFGUID rguid2, BOOL fActivated, LPVOID pUserData); - LONG m_cRefs; - ITfThreadMgr *m_pThreadMgr; - DWORD m_dwConnection; - FN_COMPARE m_fnCompare; - LPVOID m_pUserData; - -public: - CActiveLanguageProfileNotifySink(_In_ FN_COMPARE fnCompare, _Inout_opt_ void *pUserData); - virtual ~CActiveLanguageProfileNotifySink(); - - HRESULT _Advise(ITfThreadMgr *pThreadMgr); - HRESULT _Unadvise(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - // ITfActiveLanguageProfileNotifySink interface - STDMETHODIMP - OnActivated( - REFCLSID clsid, - REFGUID guidProfile, - BOOL fActivated) override; -}; - -/// @implemented -CActiveLanguageProfileNotifySink::CActiveLanguageProfileNotifySink( - _In_ FN_COMPARE fnCompare, - _Inout_opt_ void *pUserData) -{ - m_dwConnection = (DWORD)-1; - m_fnCompare = fnCompare; - m_cRefs = 1; - m_pUserData = pUserData; -} - -/// @implemented -CActiveLanguageProfileNotifySink::~CActiveLanguageProfileNotifySink() -{ -} - -/// @implemented -STDMETHODIMP CActiveLanguageProfileNotifySink::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfActiveLanguageProfileNotifySink)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - *ppvObj = NULL; - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CActiveLanguageProfileNotifySink::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CActiveLanguageProfileNotifySink::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -STDMETHODIMP -CActiveLanguageProfileNotifySink::OnActivated( - REFCLSID clsid, - REFGUID guidProfile, - BOOL fActivated) -{ - if (!m_fnCompare) - return 0; - - return m_fnCompare(clsid, guidProfile, fActivated, m_pUserData); -} - -/// @implemented -HRESULT -CActiveLanguageProfileNotifySink::_Advise( - ITfThreadMgr *pThreadMgr) -{ - m_pThreadMgr = NULL; - - ITfSource *pSource = NULL; - HRESULT hr = pThreadMgr->QueryInterface(IID_ITfSource, (void **)&pSource); - if (FAILED(hr)) - return E_FAIL; - - hr = pSource->AdviseSink(IID_ITfActiveLanguageProfileNotifySink, this, &m_dwConnection); - if (SUCCEEDED(hr)) - { - m_pThreadMgr = pThreadMgr; - pThreadMgr->AddRef(); - hr = S_OK; - } - else - { - hr = E_FAIL; - } - - if (pSource) - pSource->Release(); - - return hr; -} - -/// @implemented -HRESULT -CActiveLanguageProfileNotifySink::_Unadvise() -{ - if (!m_pThreadMgr) - return E_FAIL; - - ITfSource *pSource = NULL; - HRESULT hr = m_pThreadMgr->QueryInterface(IID_ITfSource, (void **)&pSource); - if (SUCCEEDED(hr)) - { - hr = pSource->UnadviseSink(m_dwConnection); - if (SUCCEEDED(hr)) - hr = S_OK; - } - - if (pSource) - pSource->Release(); - - if (m_pThreadMgr) - { - m_pThreadMgr->Release(); - m_pThreadMgr = NULL; - } - - return hr; -} - -/* FIXME */ -class CicProfile : public IUnknown -{ -protected: - ITfInputProcessorProfiles *m_pIPProfiles; - CActiveLanguageProfileNotifySink *m_pActiveLanguageProfileNotifySink; - LANGID m_LangID1; - WORD m_padding1; - DWORD m_dwFlags; - UINT m_nCodePage; - LANGID m_LangID2; - WORD m_padding2; - DWORD m_dwUnknown1; - LONG m_cRefs; - - static INT CALLBACK - ActiveLanguageProfileNotifySinkCallback( - REFGUID rguid1, - REFGUID rguid2, - BOOL fActivated, - LPVOID pUserData); - -public: - CicProfile(); - virtual ~CicProfile(); - - // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; - STDMETHODIMP_(ULONG) AddRef() override; - STDMETHODIMP_(ULONG) Release() override; - - HRESULT - GetActiveLanguageProfile( - _In_ HKL hKL, - _In_ REFGUID rguid, - _Out_ TF_LANGUAGEPROFILE *pProfile); - HRESULT GetLangId(_Out_ LANGID *pLangID); - HRESULT GetCodePageA(_Out_ UINT *puCodePage); - - HRESULT InitProfileInstance(_Inout_ TLS *pTLS); -}; - -/// @implemented -CicProfile::CicProfile() -{ - m_dwFlags &= 0xFFFFFFF0; - m_cRefs = 1; - m_pIPProfiles = NULL; - m_pActiveLanguageProfileNotifySink = NULL; - m_LangID1 = 0; - m_nCodePage = CP_ACP; - m_LangID2 = 0; - m_dwUnknown1 = 0; -} - -/// @implemented -CicProfile::~CicProfile() -{ - if (m_pIPProfiles) - { - if (m_LangID1) - m_pIPProfiles->ChangeCurrentLanguage(m_LangID1); - - m_pIPProfiles->Release(); - m_pIPProfiles = NULL; - } - - if (m_pActiveLanguageProfileNotifySink) - { - m_pActiveLanguageProfileNotifySink->_Unadvise(); - m_pActiveLanguageProfileNotifySink->Release(); - m_pActiveLanguageProfileNotifySink = NULL; - } -} - -/// @implemented -STDMETHODIMP CicProfile::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - *ppvObj = NULL; - return E_NOINTERFACE; -} - -/// @implemented -STDMETHODIMP_(ULONG) CicProfile::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CicProfile::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -INT CALLBACK -CicProfile::ActiveLanguageProfileNotifySinkCallback( - REFGUID rguid1, - REFGUID rguid2, - BOOL fActivated, - LPVOID pUserData) -{ - CicProfile *pThis = (CicProfile *)pUserData; - pThis->m_dwFlags &= ~0xE; - return 0; -} - -/// @implemented -HRESULT CicProfile::GetCodePageA(_Out_ UINT *puCodePage) -{ - if (!puCodePage) - return E_INVALIDARG; - - if (m_dwFlags & 2) - { - *puCodePage = m_nCodePage; - return S_OK; - } - - *puCodePage = 0; - - LANGID LangID; - HRESULT hr = GetLangId(&LangID); - if (FAILED(hr)) - return E_FAIL; - - WCHAR szBuff[12]; - INT cch = ::GetLocaleInfoW(LangID, LOCALE_IDEFAULTANSICODEPAGE, szBuff, _countof(szBuff)); - if (cch) - { - szBuff[cch] = 0; - m_nCodePage = *puCodePage = wcstoul(szBuff, NULL, 10); - m_dwFlags |= 2; - } - - return S_OK; -} - -/// @implemented -HRESULT CicProfile::GetLangId(_Out_ LANGID *pLangID) -{ - *pLangID = 0; - - if (!m_pIPProfiles) - return E_FAIL; - - if (m_dwFlags & 4) - { - *pLangID = m_LangID2; - return S_OK; - } - - HRESULT hr = m_pIPProfiles->GetCurrentLanguage(pLangID); - if (SUCCEEDED(hr)) - { - m_dwFlags |= 4; - m_LangID2 = *pLangID; - } - - return hr; -} - -class TLS -{ -public: - static DWORD s_dwTlsIndex; - - DWORD m_dwSystemInfoFlags; - CicBridge *m_pBridge; - CicProfile *m_pProfile; - ITfThreadMgr_P *m_pThreadMgr; - DWORD m_dwFlags1; - DWORD m_dwFlags2; - DWORD m_dwUnknown2; - BOOL m_bDestroyed; - DWORD m_dwNowOpening; - 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(); - } - - /** - * @implemented - */ - static TLS* PeekTLS() - { - return (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); - } - - static TLS* InternalAllocateTLS(); - static BOOL InternalDestroyTLS(); - -}; - -DWORD TLS::s_dwTlsIndex = (DWORD)-1; - -/// @implemented -TLS* TLS::InternalAllocateTLS() -{ - TLS *pTLS = TLS::PeekTLS(); - if (pTLS) - return pTLS; - - if (DllShutDownInProgress()) - return NULL; - - pTLS = (TLS *)cicMemAllocClear(sizeof(TLS)); - if (!pTLS) - return NULL; - - if (!::TlsSetValue(s_dwTlsIndex, pTLS)) - { - cicMemFree(pTLS); - return NULL; - } - - pTLS->m_dwFlags1 |= 1; - pTLS->m_dwUnknown2 |= 1; - return pTLS; -} - -/// @implemented -BOOL TLS::InternalDestroyTLS() -{ - TLS *pTLS = TLS::PeekTLS(); - if (!pTLS) - return FALSE; - - if (pTLS->m_pBridge) - pTLS->m_pBridge->Release(); - if (pTLS->m_pProfile) - pTLS->m_pProfile->Release(); - if (pTLS->m_pThreadMgr) - pTLS->m_pThreadMgr->Release(); - - cicMemFree(pTLS); - ::TlsSetValue(s_dwTlsIndex, NULL); - return TRUE; -} - -/// @implemented -HRESULT -CicProfile::InitProfileInstance(_Inout_ TLS *pTLS) -{ - HRESULT hr = TF_CreateInputProcessorProfiles(&m_pIPProfiles); - if (FAILED(hr)) - return hr; - - if (!m_pActiveLanguageProfileNotifySink) - { - CActiveLanguageProfileNotifySink *pSink = - new(cicNoThrow) CActiveLanguageProfileNotifySink( - CicProfile::ActiveLanguageProfileNotifySinkCallback, this); - if (!pSink) - { - m_pIPProfiles->Release(); - m_pIPProfiles = NULL; - return E_FAIL; - } - m_pActiveLanguageProfileNotifySink = pSink; - } - - if (pTLS->m_pThreadMgr) - m_pActiveLanguageProfileNotifySink->_Advise(pTLS->m_pThreadMgr); - - return hr; -} - -/// @implemented -STDMETHODIMP -CicInputContext::OnCleanupContext( - _In_ TfEditCookie ecWrite, - _Inout_ ITfContext *pic) -{ - TLS *pTLS = TLS::PeekTLS(); - if (!pTLS || !pTLS->m_pProfile) - return E_OUTOFMEMORY; - - LANGID LangID; - pTLS->m_pProfile->GetLangId(&LangID); - - IMEINFO IMEInfo; - WCHAR szPath[MAX_PATH]; - if (Inquire(&IMEInfo, szPath, 0, (HKL)UlongToHandle(LangID)) != S_OK) - return E_FAIL; - - ITfProperty *pProp = NULL; - if (!(IMEInfo.fdwProperty & IME_PROP_COMPLETE_ON_UNSELECT)) - return S_OK; - - HRESULT hr = pic->GetProperty(GUID_PROP_COMPOSING, &pProp); - if (FAILED(hr)) - return S_OK; - - IEnumTfRanges *pRanges = NULL; - hr = pProp->EnumRanges(ecWrite, &pRanges, NULL); - if (SUCCEEDED(hr)) - { - ITfRange *pRange = NULL; - while (pRanges->Next(1, &pRange, 0) == S_OK) - { - VARIANT vari; - V_VT(&vari) = VT_EMPTY; - pProp->GetValue(ecWrite, pRange, &vari); - if (V_VT(&vari) == VT_I4) - { - if (V_I4(&vari)) - pProp->Clear(ecWrite, pRange); - } - pRange->Release(); - pRange = NULL; - } - pRanges->Release(); - } - pProp->Release(); - - return S_OK; -} - -/*********************************************************************** - * CicBridge - */ - -CicBridge::CicBridge() -{ - m_bImmxInited = FALSE; - m_bUnknown1 = FALSE; - m_bDeactivating = FALSE; - m_bUnknown2 = FALSE; - m_pKeystrokeMgr = NULL; - m_pDocMgr = NULL; - m_pThreadMgrEventSink = NULL; - m_cliendId = 0; - m_cRefs = 1; -} - -/// @implemented -STDMETHODIMP CicBridge::QueryInterface(REFIID riid, LPVOID* ppvObj) -{ - *ppvObj = NULL; - - if (!IsEqualIID(riid, IID_ITfSysHookSink)) - return E_NOINTERFACE; - - *ppvObj = this; - AddRef(); - - return S_OK; -} - -/// @implemented -STDMETHODIMP_(ULONG) CicBridge::AddRef() -{ - return ::InterlockedIncrement(&m_cRefs); -} - -/// @implemented -STDMETHODIMP_(ULONG) CicBridge::Release() -{ - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; -} - -/// @implemented -CicBridge::~CicBridge() -{ - TLS *pTLS = TLS::PeekTLS(); - if (!pTLS || !pTLS->m_pThreadMgr) - return; - - if (SUCCEEDED(DeactivateIMMX(pTLS, pTLS->m_pThreadMgr))) - UnInitIMMX(pTLS); -} - -void 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; - } -} - -/// @unimplemented -HRESULT -CicBridge::CreateInputContext( - _Inout_ TLS *pTLS, - _In_ HIMC hIMC) -{ - CicIMCLock imcLock(hIMC); - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; - - if (!imcLock.get().hCtfImeContext) - { - HIMCC hCtfImeContext = ImmCreateIMCC(sizeof(CTFIMECONTEXT)); - if (!hCtfImeContext) - return E_OUTOFMEMORY; - imcLock.get().hCtfImeContext = hCtfImeContext; - } - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - 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.get().m_pCicIC = pCicIC; - } - - hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); - if (FAILED(hr)) - { - pCicIC->Release(); - imeContext.get().m_pCicIC = NULL; - } - else - { - if (imcLock.get().hWnd && imcLock.get().hWnd == ::GetFocus()) - { - GetDocumentManager(imeContext); - //FIXME - } - } - - return E_NOTIMPL; -} - -/// @implemented -HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) -{ - CicIMCLock imcLock(hIMC); - HRESULT hr = imcLock.m_hr; - if (!imcLock) - hr = E_FAIL; - if (FAILED(hr)) - return hr; - - hr = E_FAIL; - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (imeContext) - hr = imeContext.m_hr; - - if (SUCCEEDED(hr) && !(imeContext.get().m_dwCicFlags & 1)) - { - imeContext.get().m_dwCicFlags |= 1; - - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (pCicIC) - { - imeContext.get().m_pCicIC = NULL; - hr = pCicIC->DestroyInputContext(); - pCicIC->Release(); - imeContext.get().m_pCicIC = NULL; - } - } - - if (imcLock.get().hCtfImeContext) - { - ImmDestroyIMCC(imcLock.get().hCtfImeContext); - imcLock.get().hCtfImeContext = NULL; - hr = S_OK; - } - - return hr; -} - -ITfContext * -CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) -{ - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (!pCicIC) - return NULL; - return pCicIC->m_pContext; -} - -/// @unimplemented -HRESULT CicBridge::OnSetOpenStatus( - TLS *pTLS, - ITfThreadMgr_P *pThreadMgr, - CicIMCLock& imcLock, - CicInputContext *pCicIC) -{ - return E_NOTIMPL; -} - -/// Selects the IME context. -/// @implemented -HRESULT -CicBridge::SelectEx( - _Inout_ TLS *pTLS, - _Inout_ ITfThreadMgr_P *pThreadMgr, - _In_ HIMC hIMC, - _In_ BOOL fSelect, - _In_ HKL hKL) -{ - CicIMCLock imcLock(hIMC); - if (FAILED(imcLock.m_hr)) - return imcLock.m_hr; - - CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); - if (!imeContext) - imeContext.m_hr = E_FAIL; - if (FAILED(imeContext.m_hr)) - return imeContext.m_hr; - - CicInputContext *pCicIC = imeContext.get().m_pCicIC; - if (pCicIC) - pCicIC->m_bSelecting = TRUE; - - if (fSelect) - { - if (pCicIC) - pCicIC->m_dwUnknown6[1] &= ~1; - if (imcLock.get().fOpen) - OnSetOpenStatus(pTLS, pThreadMgr, imcLock, pCicIC); - } - else - { - ITfContext *pContext = GetInputContext(imeContext); - pThreadMgr->RequestPostponedLock(pContext); - if (pCicIC) - pCicIC->m_bSelecting = FALSE; - if (pContext) - pContext->Release(); - } - - return imeContext.m_hr; -} - -/// Used in CicBridge::EnumCreateInputContextCallback and -/// CicBridge::EnumDestroyInputContextCallback. -typedef struct ENUM_CREATE_DESTROY_IC -{ - TLS *m_pTLS; - CicBridge *m_pBridge; -} ENUM_CREATE_DESTROY_IC, *PENUM_CREATE_DESTROY_IC; - -/// Creates input context for the current thread. -/// @implemented -BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam) -{ - PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; - pData->m_pBridge->CreateInputContext(pData->m_pTLS, hIMC); - return TRUE; -} - -/// Destroys input context for the current thread. -/// @implemented -BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam) -{ - PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; - pData->m_pBridge->DestroyInputContext(pData->m_pTLS, hIMC); - return TRUE; -} - -/// @implemented -HRESULT -CicBridge::ActivateIMMX( - _Inout_ TLS *pTLS, - _Inout_ ITfThreadMgr_P *pThreadMgr) -{ - HRESULT hr = pThreadMgr->ActivateEx(&m_cliendId, 1); - if (hr != S_OK) - { - m_cliendId = 0; - return E_FAIL; - } - - if (m_cActivateLocks++ != 0) - return S_OK; - - ITfSourceSingle *pSource = NULL; - hr = pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void**)&pSource); - if (FAILED(hr)) - { - DeactivateIMMX(pTLS, pThreadMgr); - return hr; - } - - CFunctionProvider *pProvider = new(cicNoThrow) CFunctionProvider(m_cliendId); - if (!pProvider) - { - hr = E_FAIL; - goto Finish; - } - - pSource->AdviseSingleSink(m_cliendId, IID_ITfFunctionProvider, pProvider); - pProvider->Release(); - - if (!m_pDocMgr) - { - hr = pThreadMgr->CreateDocumentMgr(&m_pDocMgr); - if (FAILED(hr)) - { - hr = E_FAIL; - goto Finish; - } - - SetCompartmentDWORD(m_cliendId, m_pDocMgr, GUID_COMPARTMENT_CTFIME_DIMFLAGS, TRUE, FALSE); - } - - pThreadMgr->SetSysHookSink(this); - - hr = S_OK; - if (pTLS->m_bDestroyed) - { - ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; - ImmEnumInputContext(0, CicBridge::EnumCreateInputContextCallback, (LPARAM)&Data); - } - -Finish: - if (FAILED(hr)) - DeactivateIMMX(pTLS, pThreadMgr); - if (pSource) - pSource->Release(); - return hr; -} - -/// @implemented -HRESULT -CicBridge::DeactivateIMMX( - _Inout_ TLS *pTLS, - _Inout_ ITfThreadMgr_P *pThreadMgr) -{ - if (m_bDeactivating) - return TRUE; - - m_bDeactivating = TRUE; - - if (m_cliendId) - { - ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; - ImmEnumInputContext(0, CicBridge::EnumDestroyInputContextCallback, (LPARAM)&Data); - pTLS->m_bDestroyed = TRUE; - - ITfSourceSingle *pSource = NULL; - if (pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) - pSource->UnadviseSingleSink(m_cliendId, IID_ITfFunctionProvider); - - m_cliendId = 0; - - while (m_cActivateLocks > 0) - { - --m_cActivateLocks; - pThreadMgr->Deactivate(); - } - - if (pSource) - pSource->Release(); - } - - if (m_pDocMgr) - { - m_pDocMgr->Release(); - m_pDocMgr = NULL; - } - - pThreadMgr->SetSysHookSink(NULL); - - m_bDeactivating = FALSE; - - return S_OK; -} - -/// @implemented -HRESULT -CicBridge::InitIMMX(_Inout_ TLS *pTLS) -{ - if (m_bImmxInited) - return S_OK; - - HRESULT hr = S_OK; - if (!pTLS->m_pThreadMgr) - { - ITfThreadMgr *pThreadMgr = NULL; - hr = TF_CreateThreadMgr(&pThreadMgr); - if (FAILED(hr)) - return E_FAIL; - - hr = pThreadMgr->QueryInterface(IID_ITfThreadMgr_P, (void **)&pTLS->m_pThreadMgr); - if (pThreadMgr) - pThreadMgr->Release(); - if (FAILED(hr)) - return E_FAIL; - } - - if (!m_pThreadMgrEventSink) - { - m_pThreadMgrEventSink = - new(cicNoThrow) CThreadMgrEventSink(CThreadMgrEventSink::DIMCallback, NULL, NULL); - if (!m_pThreadMgrEventSink) - { - UnInitIMMX(pTLS); - return E_FAIL; - } - } - - m_pThreadMgrEventSink->SetCallbackPV(m_pThreadMgrEventSink); - m_pThreadMgrEventSink->_Advise(pTLS->m_pThreadMgr); - - if (!pTLS->m_pProfile) - { - pTLS->m_pProfile = new(cicNoThrow) CicProfile(); - if (!pTLS->m_pProfile) - return E_OUTOFMEMORY; - - hr = pTLS->m_pProfile->InitProfileInstance(pTLS); - if (FAILED(hr)) - { - UnInitIMMX(pTLS); - return E_FAIL; - } - } - - hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfKeystrokeMgr_P, (void **)&m_pKeystrokeMgr); - if (FAILED(hr)) - { - UnInitIMMX(pTLS); - return E_FAIL; - } - - hr = InitDisplayAttrbuteLib(&m_LibThread); - if (FAILED(hr)) - { - UnInitIMMX(pTLS); - return E_FAIL; - } - - m_bImmxInited = TRUE; - return S_OK; -} - -/// @implemented -BOOL CicBridge::UnInitIMMX(_Inout_ TLS *pTLS) -{ - UninitDisplayAttrbuteLib(&m_LibThread); - TFUninitLib_Thread(&m_LibThread); - - if (m_pKeystrokeMgr) - { - m_pKeystrokeMgr->Release(); - m_pKeystrokeMgr = NULL; - } - - if (pTLS->m_pProfile) - { - pTLS->m_pProfile->Release(); - pTLS->m_pProfile = NULL; - } - - if (m_pThreadMgrEventSink) - { - m_pThreadMgrEventSink->_Unadvise(); - m_pThreadMgrEventSink->Release(); - m_pThreadMgrEventSink = NULL; - } - - if (pTLS->m_pThreadMgr) - { - pTLS->m_pThreadMgr->Release(); - pTLS->m_pThreadMgr = NULL; - } - - m_bImmxInited = FALSE; - return TRUE; -} - -/// @implemented -STDMETHODIMP CicBridge::OnPreFocusDIM(HWND hwnd) -{ - return S_OK; -} - -/// @unimplemented -STDMETHODIMP CicBridge::OnSysKeyboardProc(UINT, LONG) -{ - return E_NOTIMPL; + return hr; } -/// @implemented -STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG) +HIMC GetActiveContext(VOID) { - return S_OK; + HWND hwndFocus = ::GetFocus(); + if (!hwndFocus) + hwndFocus = ::GetActiveWindow(); + return ::ImmGetContext(hwndFocus); } /// @implemented -void -CicBridge::PostTransMsg( - _In_ HWND hWnd, - _In_ INT cTransMsgs, - _In_ const TRANSMSG *pTransMsgs) +HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { - for (INT i = 0; i < cTransMsgs; ++i, ++pTransMsgs) + if (!pLibThread) + return E_FAIL; + + if (pLibThread->m_pDisplayAttrMgr) { - ::PostMessageW(hWnd, pTransMsgs->message, pTransMsgs->wParam, pTransMsgs->lParam); + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; } + + return S_OK; } +/// Gets the charset from a language ID. /// @implemented -HRESULT -CicBridge::ConfigureGeneral( - _Inout_ TLS* pTLS, - _In_ ITfThreadMgr *pThreadMgr, - _In_ HKL hKL, - _In_ HWND hWnd) +BYTE GetCharsetFromLangId(_In_ DWORD dwValue) { - CicProfile *pProfile = pTLS->m_pProfile; - if (!pProfile) - return E_OUTOFMEMORY; - - TF_LANGUAGEPROFILE profile; - HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); - if (FAILED(hr)) - return hr; - - ITfFunctionProvider *pProvider = NULL; - hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); - if (FAILED(hr)) - return hr; - - ITfFnConfigure *pFnConfigure = NULL; - hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigure, (IUnknown**)&pFnConfigure); - if (FAILED(hr)) - { - pProvider->Release(); - return hr; - } - - hr = pFnConfigure->Show(hWnd, profile.langid, profile.guidProfile); - - pFnConfigure->Release(); - pProvider->Release(); - return hr; + CHARSETINFO info; + if (!::TranslateCharsetInfo((DWORD*)(DWORD_PTR)dwValue, &info, TCI_SRCLOCALE)) + return 0; + return info.ciCharset; } +/// Selects or unselects the input context. /// @implemented HRESULT -CicBridge::ConfigureRegisterWord( - _Inout_ TLS* pTLS, - _In_ ITfThreadMgr *pThreadMgr, - _In_ HKL hKL, - _In_ HWND hWnd, - _Inout_opt_ LPVOID lpData) +InternalSelectEx( + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ LANGID LangID) { - CicProfile *pProfile = pTLS->m_pProfile; - if (!pProfile) - return E_OUTOFMEMORY; - - TF_LANGUAGEPROFILE profile; - HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); - if (FAILED(hr)) - return hr; + CicIMCLock imcLock(hIMC); + if (!imcLock) + imcLock.m_hr = E_FAIL; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; - ITfFunctionProvider *pProvider = NULL; - hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); - if (FAILED(hr)) - return hr; + if (PRIMARYLANGID(LangID) == LANG_CHINESE) + { + imcLock.get().cfCandForm[0].dwStyle = 0; + imcLock.get().cfCandForm[0].dwIndex = (DWORD)-1; + } - ITfFnConfigureRegisterWord *pFunction = NULL; - hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigureRegisterWord, (IUnknown**)&pFunction); - if (FAILED(hr)) + if (!fSelect) { - pProvider->Release(); - return hr; + imcLock.get().fdwInit &= ~INIT_GUIDMAP; + return imcLock.m_hr; } - REGISTERWORDW* pRegWord = (REGISTERWORDW*)lpData; - if (pRegWord) + if (!imcLock.ClearCand()) + return imcLock.m_hr; + + // Populate conversion mode + if (!(imcLock.get().fdwInit & INIT_CONVERSION)) { - if (pRegWord->lpWord) + DWORD dwConv = (imcLock.get().fdwConversion & IME_CMODE_SOFTKBD); + if (LangID) { - hr = E_OUTOFMEMORY; - BSTR bstrWord = SysAllocString(pRegWord->lpWord); - if (bstrWord) + if (PRIMARYLANGID(LangID) == LANG_JAPANESE) { - hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, bstrWord); - SysFreeString(bstrWord); + dwConv |= IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; + } + else if (PRIMARYLANGID(LangID) != LANG_KOREAN) + { + dwConv |= IME_CMODE_NATIVE; } } - else - { - hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, NULL); - } + imcLock.get().fdwConversion |= dwConv; + imcLock.get().fdwInit |= INIT_CONVERSION; } - pProvider->Release(); - pFunction->Release(); - return hr; -} + // Populate sentence mode + imcLock.get().fdwSentence |= IME_SMODE_PHRASEPREDICT; -/*********************************************************************** - * CicProfile - */ + // Populate LOGFONT + if (!(imcLock.get().fdwInit & INIT_LOGFONT)) + { + // Get logical font + LOGFONTW lf; + HDC hDC = ::GetDC(imcLock.get().hWnd); + HGDIOBJ hFont = GetCurrentObject(hDC, OBJ_FONT); + ::GetObjectW(hFont, sizeof(LOGFONTW), &lf); + ::ReleaseDC(imcLock.get().hWnd, hDC); -/// @unimplemented -HRESULT -CicProfile::GetActiveLanguageProfile( - _In_ HKL hKL, - _In_ REFGUID rguid, - _Out_ TF_LANGUAGEPROFILE *pProfile) -{ - return E_NOTIMPL; + imcLock.get().lfFont.W = lf; + imcLock.get().fdwInit |= INIT_LOGFONT; + } + imcLock.get().lfFont.W.lfCharSet = GetCharsetFromLangId(LangID); + + imcLock.InitContext(); + + return imcLock.m_hr; } +class TLS; + /*********************************************************************** * ImeInquire (MSCTFIME.@) * @@ -3332,367 +858,6 @@ CtfImeThreadDetach(VOID) return S_OK; } -/*********************************************************************** - * UIComposition - */ -struct UIComposition -{ - void OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd); - void OnImeCompositionUpdate(CicIMCLock& imcLock); - void OnImeEndComposition(); - void OnImeSetContext(CicIMCLock& imcLock, HWND hUIWnd, WPARAM wParam, LPARAM lParam); - void OnPaintTheme(WPARAM wParam); - void OnDestroy(); - - static LRESULT CALLBACK CompWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -}; - -/// @unimplemented -void UIComposition::OnImeStartComposition(CicIMCLock& imcLock, HWND hUIWnd) -{ - //FIXME -} - -/// @unimplemented -void UIComposition::OnImeCompositionUpdate(CicIMCLock& imcLock) -{ - //FIXME -} - -/// @unimplemented -void UIComposition::OnImeEndComposition() -{ - //FIXME -} - -/// @unimplemented -void UIComposition::OnImeSetContext(CicIMCLock& imcLock, HWND hUIWnd, WPARAM wParam, LPARAM lParam) -{ - //FIXME -} - -/// @unimplemented -void UIComposition::OnPaintTheme(WPARAM wParam) -{ - //FIXME -} - -/// @unimplemented -void UIComposition::OnDestroy() -{ - //FIXME -} - -/// @unimplemented -LRESULT CALLBACK -UIComposition::CompWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (uMsg == WM_CREATE) - return -1; // FIXME - return 0; -} - -/*********************************************************************** - * UI - */ -struct UI -{ - HWND m_hWnd; - UIComposition *m_pComp; - - UI(HWND hWnd); - virtual ~UI(); - - HRESULT _Create(); - void _Destroy(); - - static void OnCreate(HWND hWnd); - static void OnDestroy(HWND hWnd); - void OnImeSetContext(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam); -}; - -// For GetWindowLongPtr/SetWindowLongPtr -#define UIGWLP_HIMC 0 -#define UIGWLP_UI sizeof(HIMC) -#define UIGWLP_SIZE (UIGWLP_UI + sizeof(UI*)) - -/// @implemented -UI::UI(HWND hWnd) : m_hWnd(hWnd) -{ -} - -/// @implemented -UI::~UI() -{ - delete m_pComp; -} - -/// @unimplemented -HRESULT UI::_Create() -{ - m_pComp = new(cicNoThrow) UIComposition(); - if (!m_pComp) - return E_OUTOFMEMORY; - - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, (LONG_PTR)this); - //FIXME - return S_OK; -} - -/// @implemented -void UI::_Destroy() -{ - m_pComp->OnDestroy(); - SetWindowLongPtrW(m_hWnd, UIGWLP_UI, 0); -} - -/// @implemented -void UI::OnCreate(HWND hWnd) -{ - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); - if (pUI) - return; - pUI = new(cicNoThrow) UI(hWnd); - if (pUI) - pUI->_Create(); -} - -/// @implemented -void UI::OnDestroy(HWND hWnd) -{ - UI *pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); - if (!pUI) - return; - - pUI->_Destroy(); - delete pUI; -} - -/// @implemented -void UI::OnImeSetContext(CicIMCLock& imcLock, WPARAM wParam, LPARAM lParam) -{ - m_pComp->OnImeSetContext(imcLock, m_hWnd, wParam, lParam); -} - -/*********************************************************************** - * CIMEUIWindowHandler - */ - -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 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); -}; - -/// @unimplemented -LRESULT CALLBACK -CIMEUIWindowHandler::ImeUIMsImeMouseHandler(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - return 0; //FIXME -} - -/// @unimplemented -LRESULT CALLBACK -CIMEUIWindowHandler::ImeUIMsImeModeBiasHandler(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - return 0; //FIXME -} - -/// @unimplemented -LRESULT CALLBACK -CIMEUIWindowHandler::ImeUIMsImeReconvertRequest(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - return 0; //FIXME -} - -/// @implemented -LRESULT CALLBACK -CIMEUIWindowHandler::ImeUIMsImeHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (uMsg == WM_MSIME_MOUSE) - return ImeUIMsImeMouseHandler(hWnd, wParam, lParam); - if (uMsg == WM_MSIME_MODEBIAS) - return ImeUIMsImeModeBiasHandler(hWnd, wParam, lParam); - if (uMsg == WM_MSIME_RECONVERTREQUEST) - return ImeUIMsImeReconvertRequest(hWnd, wParam, lParam); - if (uMsg == WM_MSIME_SERVICE) - { - TLS *pTLS = TLS::GetTLS(); - if (pTLS && pTLS->m_pProfile) - { - LANGID LangID; - pTLS->m_pProfile->GetLangId(&LangID); - if (PRIMARYLANGID(LangID) == LANG_KOREAN) - return FALSE; - } - return TRUE; - } - return 0; -} - -/// @unimplemented -LRESULT CALLBACK -CIMEUIWindowHandler::ImeUIWndProcWorker(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TLS *pTLS = TLS::GetTLS(); - if (pTLS && (pTLS->m_dwSystemInfoFlags & IME_SYSINFO_WINLOGON)) - { - if (uMsg == WM_CREATE) - return -1; - return DefWindowProcW(hWnd, uMsg, wParam, lParam); - } - - switch (uMsg) - { - case WM_CREATE: - { - UI::OnCreate(hWnd); - break; - } - case WM_DESTROY: - case WM_ENDSESSION: - { - UI::OnDestroy(hWnd); - break; - } - case WM_IME_STARTCOMPOSITION: - case WM_IME_COMPOSITION: - case WM_IME_ENDCOMPOSITION: - case WM_IME_SETCONTEXT: - case WM_IME_NOTIFY: - case WM_IME_SELECT: - case WM_TIMER: - { - HIMC hIMC = (HIMC)GetWindowLongPtrW(hWnd, UIGWLP_HIMC); - UI* pUI = (UI*)GetWindowLongPtrW(hWnd, UIGWLP_UI); - CicIMCLock imcLock(hIMC); - switch (uMsg) - { - case WM_IME_STARTCOMPOSITION: - { - pUI->m_pComp->OnImeStartComposition(imcLock, pUI->m_hWnd); - break; - } - case WM_IME_COMPOSITION: - { - if (lParam & GCS_COMPSTR) - { - pUI->m_pComp->OnImeCompositionUpdate(imcLock); - ::SetTimer(hWnd, 0, 10, NULL); - //FIXME - } - break; - } - case WM_IME_ENDCOMPOSITION: - { - ::KillTimer(hWnd, 0); - pUI->m_pComp->OnImeEndComposition(); - break; - } - case WM_IME_SETCONTEXT: - { - pUI->OnImeSetContext(imcLock, wParam, lParam); - ::KillTimer(hWnd, 1); - ::SetTimer(hWnd, 1, 300, NULL); - break; - } - case WM_TIMER: - { - //FIXME - ::KillTimer(hWnd, wParam); - break; - } - case WM_IME_NOTIFY: - case WM_IME_SELECT: - default: - { - pUI->m_pComp->OnPaintTheme(wParam); - break; - } - } - break; - } - default: - { - if (IsMsImeMessage(uMsg)) - return CIMEUIWindowHandler::ImeUIMsImeHandler(hWnd, uMsg, wParam, lParam); - return DefWindowProcW(hWnd, uMsg, wParam, lParam); - } - } - - return 0; -} - -/// @implemented -EXTERN_C LRESULT CALLBACK -UIWndProc( - _In_ HWND hWnd, - _In_ UINT uMsg, - _In_ WPARAM wParam, - _In_ LPARAM lParam) -{ - return CIMEUIWindowHandler::ImeUIWndProcWorker(hWnd, uMsg, wParam, lParam); -} - -/// @unimplemented -BOOL RegisterImeClass(VOID) -{ - WNDCLASSEXW wcx; - - if (!GetClassInfoExW(g_hInst, L"MSCTFIME UI", &wcx)) - { - ZeroMemory(&wcx, sizeof(wcx)); - wcx.cbSize = sizeof(WNDCLASSEXW); - wcx.cbWndExtra = UIGWLP_SIZE; - wcx.hIcon = LoadIconW(0, (LPCWSTR)IDC_ARROW); - wcx.hInstance = g_hInst; - wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - wcx.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); - wcx.style = CS_IME | CS_GLOBALCLASS; - wcx.lpfnWndProc = UIWndProc; - wcx.lpszClassName = L"MSCTFIME UI"; - if (!RegisterClassExW(&wcx)) - return FALSE; - } - - if (!GetClassInfoExW(g_hInst, L"MSCTFIME Composition", &wcx)) - { - ZeroMemory(&wcx, sizeof(wcx)); - wcx.cbSize = sizeof(WNDCLASSEXW); - wcx.cbWndExtra = sizeof(DWORD); - wcx.hIcon = NULL; - wcx.hInstance = g_hInst; - wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_IBEAM); - wcx.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); - wcx.style = CS_IME | CS_HREDRAW | CS_VREDRAW; - wcx.lpfnWndProc = UIComposition::CompWndProc; - wcx.lpszClassName = L"MSCTFIME Composition"; - if (!RegisterClassExW(&wcx)) - return FALSE; - } - - return TRUE; -} - -/// @implemented -VOID UnregisterImeClass(VOID) -{ - WNDCLASSEXW wcx; - - GetClassInfoExW(g_hInst, L"MSCTFIME UI", &wcx); - UnregisterClassW(L"MSCTFIME UI", g_hInst); - DestroyIcon(wcx.hIcon); - DestroyIcon(wcx.hIconSm); - - GetClassInfoExW(g_hInst, L"MSCTFIME Composition", &wcx); - UnregisterClassW(L"MSCTFIME Composition", g_hInst); - DestroyIcon(wcx.hIcon); - DestroyIcon(wcx.hIconSm); -} - /// @implemented BOOL AttachIME(VOID) { diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 040ecc11c96..f7ada8fbd6e 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -34,6 +34,23 @@ #include <wine/debug.h> +EXTERN_C BOOLEAN WINAPI DllShutdownInProgress(VOID); + +HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); +HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread); + +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); + #include "resource.h" +#include "bridge.h" +#include "compartment.h" +#include "functions.h" +#include "inputcontext.h" +#include "profile.h" +#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 new file mode 100644 index 00000000000..9ec7cd12ff3 --- /dev/null +++ b/dll/ime/msctfime/profile.cpp @@ -0,0 +1,173 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Profile of msctfime.ime + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +/// @implemented +CicProfile::CicProfile() +{ + m_dwFlags &= 0xFFFFFFF0; + m_cRefs = 1; + m_pIPProfiles = NULL; + m_pActiveLanguageProfileNotifySink = NULL; + m_LangID1 = 0; + m_nCodePage = CP_ACP; + m_LangID2 = 0; + m_dwUnknown1 = 0; +} + +/// @implemented +CicProfile::~CicProfile() +{ + if (m_pIPProfiles) + { + if (m_LangID1) + m_pIPProfiles->ChangeCurrentLanguage(m_LangID1); + + m_pIPProfiles->Release(); + m_pIPProfiles = NULL; + } + + if (m_pActiveLanguageProfileNotifySink) + { + m_pActiveLanguageProfileNotifySink->_Unadvise(); + m_pActiveLanguageProfileNotifySink->Release(); + m_pActiveLanguageProfileNotifySink = NULL; + } +} + +/// @implemented +STDMETHODIMP CicProfile::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + *ppvObj = NULL; + return E_NOINTERFACE; +} + +/// @implemented +STDMETHODIMP_(ULONG) CicProfile::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/// @implemented +STDMETHODIMP_(ULONG) CicProfile::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/// @implemented +INT CALLBACK +CicProfile::ActiveLanguageProfileNotifySinkCallback( + REFGUID rguid1, + REFGUID rguid2, + BOOL fActivated, + LPVOID pUserData) +{ + CicProfile *pThis = (CicProfile *)pUserData; + pThis->m_dwFlags &= ~0xE; + return 0; +} + +/// @implemented +HRESULT CicProfile::GetCodePageA(_Out_ UINT *puCodePage) +{ + if (!puCodePage) + return E_INVALIDARG; + + if (m_dwFlags & 2) + { + *puCodePage = m_nCodePage; + return S_OK; + } + + *puCodePage = 0; + + LANGID LangID; + HRESULT hr = GetLangId(&LangID); + if (FAILED(hr)) + return E_FAIL; + + WCHAR szBuff[12]; + INT cch = ::GetLocaleInfoW(LangID, LOCALE_IDEFAULTANSICODEPAGE, szBuff, _countof(szBuff)); + if (cch) + { + szBuff[cch] = 0; + m_nCodePage = *puCodePage = wcstoul(szBuff, NULL, 10); + m_dwFlags |= 2; + } + + return S_OK; +} + +/// @implemented +HRESULT CicProfile::GetLangId(_Out_ LANGID *pLangID) +{ + *pLangID = 0; + + if (!m_pIPProfiles) + return E_FAIL; + + if (m_dwFlags & 4) + { + *pLangID = m_LangID2; + return S_OK; + } + + HRESULT hr = m_pIPProfiles->GetCurrentLanguage(pLangID); + if (SUCCEEDED(hr)) + { + m_dwFlags |= 4; + m_LangID2 = *pLangID; + } + + return hr; +} + +/// @implemented +HRESULT +CicProfile::InitProfileInstance(_Inout_ TLS *pTLS) +{ + HRESULT hr = TF_CreateInputProcessorProfiles(&m_pIPProfiles); + if (FAILED(hr)) + return hr; + + if (!m_pActiveLanguageProfileNotifySink) + { + CActiveLanguageProfileNotifySink *pSink = + new(cicNoThrow) CActiveLanguageProfileNotifySink( + CicProfile::ActiveLanguageProfileNotifySinkCallback, this); + if (!pSink) + { + m_pIPProfiles->Release(); + m_pIPProfiles = NULL; + return E_FAIL; + } + m_pActiveLanguageProfileNotifySink = pSink; + } + + if (pTLS->m_pThreadMgr) + m_pActiveLanguageProfileNotifySink->_Advise(pTLS->m_pThreadMgr); + + return hr; +} + +/// @unimplemented +HRESULT +CicProfile::GetActiveLanguageProfile( + _In_ HKL hKL, + _In_ REFGUID rguid, + _Out_ TF_LANGUAGEPROFILE *pProfile) +{ + return E_NOTIMPL; +} diff --git a/dll/ime/msctfime/profile.h b/dll/ime/msctfime/profile.h new file mode 100644 index 00000000000..2943750ad46 --- /dev/null +++ b/dll/ime/msctfime/profile.h @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Profile of msctfime.ime + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "sinks.h" + +class CicProfile : public IUnknown +{ +protected: + ITfInputProcessorProfiles *m_pIPProfiles; + CActiveLanguageProfileNotifySink *m_pActiveLanguageProfileNotifySink; + LANGID m_LangID1; + WORD m_padding1; + DWORD m_dwFlags; + UINT m_nCodePage; + LANGID m_LangID2; + WORD m_padding2; + DWORD m_dwUnknown1; + LONG m_cRefs; + + static INT CALLBACK + ActiveLanguageProfileNotifySinkCallback( + REFGUID rguid1, + REFGUID rguid2, + BOOL fActivated, + LPVOID pUserData); + +public: + CicProfile(); + virtual ~CicProfile(); + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + HRESULT + GetActiveLanguageProfile( + _In_ HKL hKL, + _In_ REFGUID rguid, + _Out_ TF_LANGUAGEPROFILE *pProfile); + HRESULT GetLangId(_Out_ LANGID *pLangID); + HRESULT GetCodePageA(_Out_ UINT *puCodePage); + + HRESULT InitProfileInstance(_Inout_ TLS *pTLS); +}; diff --git a/dll/ime/msctfime/sinks.cpp b/dll/ime/msctfime/sinks.cpp new file mode 100644 index 00000000000..235079c4d94 --- /dev/null +++ b/dll/ime/msctfime/sinks.cpp @@ -0,0 +1,539 @@ +/* ... 1325 lines suppressed ...

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