Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IDL] Revert commit c03899fc

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92942fbbd8cd9c3eba288… commit 92942fbbd8cd9c3eba288dce83071ff840b7429f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Dec 20 15:13:40 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 20 15:13:40 2023 +0100 [IDL] Revert commit c03899fc --- sdk/include/reactos/idl/pnp.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index 52c47ab2ffc..efe320e3e63 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -53,7 +53,7 @@ typedef enum _PNP_VETO_TYPE { PNP_VetoNonDisableable = 10, PNP_VetoLegacyDriver = 11, PNP_VetoInsufficientRights = 12, -} *PPNP_VETO_TYPE; +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; cpp_quote("#endif")

1 year, 6 months

[reactos] 01/01: [IDL] Add missing PNP_VETO_TYPE

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c03899fc7f0b7d85af7ca… commit c03899fc7f0b7d85af7ca4702d83d41bb0ac2e9c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Dec 20 15:09:03 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 20 15:09:03 2023 +0100 [IDL] Add missing PNP_VETO_TYPE --- sdk/include/reactos/idl/pnp.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index efe320e3e63..52c47ab2ffc 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -53,7 +53,7 @@ typedef enum _PNP_VETO_TYPE { PNP_VetoNonDisableable = 10, PNP_VetoLegacyDriver = 11, PNP_VetoInsufficientRights = 12, -} PNP_VETO_TYPE, *PPNP_VETO_TYPE; +} *PPNP_VETO_TYPE; cpp_quote("#endif")

1 year, 6 months

[reactos] 01/01: [IDL][SETUPAPI][UMPNPMGR] Improve PNP_RegisterNotification

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71df39b027f9d08276fd0… commit 71df39b027f9d08276fd06f2dadfc9162abcf859 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Dec 20 14:49:30 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 20 14:49:30 2023 +0100 [IDL][SETUPAPI][UMPNPMGR] Improve PNP_RegisterNotification - The 2nd parameter is the handle to the recipient. - The 8th parameter is the callers process id. --- base/services/umpnpmgr/rpcserver.c | 8 ++++---- dll/win32/setupapi/cfgmgr.c | 2 +- sdk/include/reactos/idl/pnp.idl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 4e57e261e13..f493f181d5e 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -4689,13 +4689,13 @@ DWORD WINAPI PNP_RegisterNotification( handle_t hBinding, - DWORD ulUnknown2, + DWORD_PTR hRecipient, LPWSTR pszName, BYTE *pNotificationFilter, DWORD ulNotificationFilterSize, DWORD ulFlags, PNP_NOTIFY_HANDLE *pNotifyHandle, - DWORD ulUnknown8, + DWORD ulProcessId, DWORD *pulUnknown9) { PDEV_BROADCAST_DEVICEINTERFACE_W pBroadcastDeviceInterface; @@ -4703,8 +4703,8 @@ PNP_RegisterNotification( PNOTIFY_ENTRY pNotifyData = NULL; DPRINT1("PNP_RegisterNotification(%p %lx '%S' %p %lu 0x%lx %p %lx %p)\n", - hBinding, ulUnknown2, pszName, pNotificationFilter, - ulNotificationFilterSize, ulFlags, pNotifyHandle, ulUnknown8, pulUnknown9); + hBinding, hRecipient, pszName, pNotificationFilter, + ulNotificationFilterSize, ulFlags, pNotifyHandle, ulProcessId, pulUnknown9); if (pNotifyHandle == NULL) return CR_INVALID_POINTER; diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 7fd00b122e8..b292a3c391d 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -670,7 +670,7 @@ CMP_RegisterNotification( RpcTryExcept { ret = PNP_RegisterNotification(BindingHandle, - 0, /* ??? */ + (DWORD_PTR)hRecipient, szNameBuffer, (BYTE*)lpvNotificationFilter, ((DEV_BROADCAST_HDR*)lpvNotificationFilter)->dbch_size, diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index 0a75c523f05..efe320e3e63 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -878,7 +878,7 @@ interface pnp __stdcall PNP_RegisterNotification( [in] handle_t hBinding, - [in] DWORD ulUnknown2, + [in] DWORD_PTR hRecipient, [in, string, ref] LPWSTR pszName, [in, size_is(ulNotificationFilterSize)] BYTE *pNotificationFilter, [in] DWORD ulNotificationFilterSize,

1 year, 6 months

[reactos] 01/01: [MSCTFIME][SDK] Implement CCompartmentEventSink (#6205)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=954598037fc4ddd76078e… commit 954598037fc4ddd76078e5159329a7594434d2c9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 20 22:01:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 20 22:01:39 2023 +0900 [MSCTFIME][SDK] Implement CCompartmentEventSink (#6205) - Modify <cicero/cicbase.h> and <cicero/cicarray.h>. - Add CCompartmentEventSink class. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 152 ++++++++++++++++++++++++++++++++++ dll/ime/msctfime/msctfime.h | 1 + sdk/include/reactos/cicero/cicarray.h | 20 +++-- sdk/include/reactos/cicero/cicbase.h | 14 ++++ 4 files changed, 178 insertions(+), 9 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 044a6bc8cb2..5a3e8c94830 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -164,6 +164,10 @@ void TFUninitLib_Thread(PLIBTHREAD pLibThread) } } +/*********************************************************************** + * Compartment + */ + HRESULT GetCompartment( IUnknown *pUnknown, @@ -304,6 +308,154 @@ ClearCompartment( 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 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, ITfCompartment *pComp); + 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; +}; + +CCompartmentEventSink::CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData) + : m_array(8) + , m_cRefs(1) + , m_fnEventSink(fnEventSink) + , m_pUserData(pUserData) +{ +} + +CCompartmentEventSink::~CCompartmentEventSink() +{ +} + +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; +} + +STDMETHODIMP_(ULONG) CCompartmentEventSink::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +STDMETHODIMP_(ULONG) CCompartmentEventSink::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +STDMETHODIMP CCompartmentEventSink::OnChange(REFGUID rguid) +{ + return m_fnEventSink(m_pUserData, rguid); +} + +HRESULT +CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, ITfCompartment *pComp) +{ + CESMAP *pCesMap = (CESMAP *)m_array.Append(1); + if (!pCesMap) + return E_OUTOFMEMORY; + + ITfSource *pSource = NULL; + + HRESULT hr = GetCompartment(pUnknown, rguid, &pCesMap->m_pComp, !!pComp); + 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.m_cItems - 1, 1); + } + else + { + hr = S_OK; + } + } + } + + if (pSource) + pSource->Release(); + + return hr; +} + +HRESULT CCompartmentEventSink::_Unadvise() +{ + CESMAP *pCesMap = (CESMAP *)m_array.m_pb; + if (!m_array.m_cItems) + return S_OK; + + INT cItems = m_array.m_cItems; + 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; +} + +/*********************************************************************** + * CicInputContext + */ + /* FIXME */ class CicInputContext : public ITfContextOwnerCompositionSink { diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 892bd76ef26..daa9f74c66f 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -23,6 +23,7 @@ #include <strsafe.h> #include <cicero/cicbase.h> +#include <cicero/cicarray.h> #include <cicero/osinfo.h> #include <cicero/CModulePath.h> #include <cicero/imclock.h> diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index 8767ac727f9..9ce7cfa6b76 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -11,18 +11,17 @@ class CicArray { - LPVOID lpVtbl; +public: LPBYTE m_pb; INT m_cItems; INT m_cbItem; INT m_cCapacity; -public: CicArray(INT cbItem); - virtual CicArray(); + virtual ~CicArray(); - void Insert(INT iItem, INT cGrow); - void Append(INT cGrow); + BOOL Insert(INT iItem, INT cGrow); + LPVOID Append(INT cGrow); void Remove(INT iItem, INT cRemove); }; @@ -40,12 +39,14 @@ inline CicArray::~CicArray() cicMemFree(m_pb); } -inline void CicArray::Append(INT cGrow) +inline LPVOID CicArray::Append(INT cGrow) { - Insert(m_cItems, cGrow); + if (!Insert(m_cItems, cGrow)) + return NULL; + return &m_pb[(m_cItems - cGrow) * m_cbItem]; } -inline void CicArray::Insert(INT iItem, INT cGrow) +inline BOOL CicArray::Insert(INT iItem, INT cGrow) { INT cNewCapacity = m_cItems + cGrow; if (m_cCapacity < cNewCapacity) @@ -60,7 +61,7 @@ inline void CicArray::Insert(INT iItem, INT cGrow) pbNew = (BYTE *)cicMemAlloc(cNewCapacity * m_cbItem); if (!pbNew) - return; + return FALSE; m_pb = pbNew; m_cCapacity = cNewCapacity; @@ -74,6 +75,7 @@ inline void CicArray::Insert(INT iItem, INT cGrow) } m_cItems += cGrow; + return TRUE; } inline void CicArray::Remove(INT iItem, INT cRemove) diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 9048dcb865a..3e4184ac7fc 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -5,11 +5,25 @@ * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ +#pragma once + +static inline LPVOID cicMemAlloc(SIZE_T size) +{ + return LocalAlloc(0, size); +} + static inline LPVOID cicMemAllocClear(SIZE_T size) { return LocalAlloc(LMEM_ZEROINIT, size); } +static inline LPVOID cicMemReAlloc(LPVOID ptr, SIZE_T newSize) +{ + if (!ptr) + return LocalAlloc(LMEM_ZEROINIT, newSize); + return LocalReAlloc(ptr, newSize, LMEM_ZEROINIT); +} + static inline void cicMemFree(LPVOID ptr) { if (ptr)

1 year, 6 months

[reactos] 01/01: [SDK] Add <cicero/cicarray.h> and <cicero/cicreg.h>

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=209e9a7c1daa6a5962022… commit 209e9a7c1daa6a596202287a67799baefc73ff21 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 20 20:49:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Dec 20 20:49:21 2023 +0900 [SDK] Add <cicero/cicarray.h> and <cicero/cicreg.h> CORE-19360 --- sdk/include/reactos/cicero/cicarray.h | 100 +++++++++++++++++++++++++++ sdk/include/reactos/cicero/cicreg.h | 126 ++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+) diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h new file mode 100644 index 00000000000..8767ac727f9 --- /dev/null +++ b/sdk/include/reactos/cicero/cicarray.h @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero dynamic array + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "cicbase.h" + +class CicArray +{ + LPVOID lpVtbl; + LPBYTE m_pb; + INT m_cItems; + INT m_cbItem; + INT m_cCapacity; + +public: + CicArray(INT cbItem); + virtual CicArray(); + + void Insert(INT iItem, INT cGrow); + void Append(INT cGrow); + void Remove(INT iItem, INT cRemove); +}; + +/******************************************************************************/ + +inline CicArray::CicArray(INT cbItem) +{ + m_cbItem = cbItem; + m_pb = NULL; + m_cItems = m_cCapacity = 0; +} + +inline CicArray::~CicArray() +{ + cicMemFree(m_pb); +} + +inline void CicArray::Append(INT cGrow) +{ + Insert(m_cItems, cGrow); +} + +inline void CicArray::Insert(INT iItem, INT cGrow) +{ + INT cNewCapacity = m_cItems + cGrow; + if (m_cCapacity < cNewCapacity) + { + if (cNewCapacity <= m_cItems + m_cItems / 2) + cNewCapacity = m_cItems + m_cItems / 2; + + BYTE *pbNew; + if (m_pb) + pbNew = (BYTE *)cicMemReAlloc(m_pb, cNewCapacity * m_cbItem); + else + pbNew = (BYTE *)cicMemAlloc(cNewCapacity * m_cbItem); + + if (!pbNew) + return; + + m_pb = pbNew; + m_cCapacity = cNewCapacity; + } + + if (iItem < m_cItems) + { + MoveMemory(&m_pb[(cGrow + iItem) * m_cbItem], + &m_pb[iItem * m_cbItem], + (m_cItems - iItem) * m_cbItem); + } + + m_cItems += cGrow; +} + +inline void CicArray::Remove(INT iItem, INT cRemove) +{ + if (iItem + cRemove < m_cItems) + { + MoveMemory(&m_pb[iItem * m_cbItem], + &m_pb[(iItem + cRemove) * m_cbItem], + (m_cItems - iItem - cRemove) * m_cbItem); + } + + m_cItems -= cRemove; + + INT cHalfCapacity = m_cCapacity / 2; + if (cHalfCapacity > m_cItems) + { + BYTE *pb = (BYTE *)cicMemReAlloc(m_pb, cHalfCapacity * m_cbItem); + if (pb) + { + m_pb = pb; + m_cCapacity = cHalfCapacity; + } + } +} diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h new file mode 100644 index 00000000000..674d1d27ed2 --- /dev/null +++ b/sdk/include/reactos/cicero/cicreg.h @@ -0,0 +1,126 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero registry handling + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "cicbase.h" + +class CicRegKey +{ +public: + HKEY m_hKey; + + CicRegKey() : m_hKey(NULL) { } + ~CicRegKey() { Close(); } + + operator HKEY() { return m_hKey; } + + void Close(); + + LSTATUS Open( + HKEY hKey, + LPCWSTR lpSubKey, + REGSAM samDesired = KEY_READ); + + LSTATUS Create( + HKEY hKey, + LPCWSTR lpSubKey, + LPWSTR lpClass = NULL, + DWORD dwOptions = REG_OPTION_NON_VOLATILE, + REGSAM samDesired = KEY_ALL_ACCESS, + LPSECURITY_ATTRIBUTES lpSecurityAttributes = NULL, + LPDWORD pdwDisposition = NULL); + + LSTATUS QueryDword(LPCWSTR pszValueName, LPDWORD pdwValue) + { + DWORD cbData = sizeof(DWORD); + return ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, (LPBYTE)pdwValue, &cbData); + } + + LSTATUS SetDword(LPCWSTR pszValueName, DWORD dwValue) + { + return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_DWORD, &dwValue, sizeof(dwValue)); + } + + LSTATUS QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); + + LSTATUS SetSz(LPCWSTR pszValueName, LPCWSTR pszValue) + { + DWORD cbValue = (lstrlenW(pszValue) + 1) * sizeof(WCHAR); + return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); + } +}; + +/******************************************************************************/ + +inline void +CicRegKey::Close() +{ + if (!m_hKey) + return; + + ::RegCloseKey(m_hKey); + m_hKey = NULL; +} + +inline LSTATUS +CicRegKey::Open( + HKEY hKey, + LPCWSTR lpSubKey, + REGSAM samDesired) +{ + HKEY hNewKey = NULL; + LSTATUS error = ::RegOpenKeyExW(hKey, lpSubKey, 0, samDesired, &hNewKey); + if (error != ERROR_SUCCESS) + return error; + + Close(); + m_hKey = hNewKey; + return error; +} + +inline LSTATUS +CicRegKey::Create( + HKEY hKey, + LPCWSTR lpSubKey, + LPWSTR lpClass, + DWORD dwOptions, + REGSAM samDesired, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + LPDWORD pdwDisposition) +{ + HKEY hNewKey = NULL; + LSTATUS error = ::RegCreateKeyExW(hKey, + lpSubKey, + 0, + lpClass, + dwOptions, + samDesired, + lpSecurityAttributes, + &hNewKey, + pdwDisposition); + if (error != ERROR_SUCCESS) + return error; + + Close(); + m_hKey = hNewKey; + return error; +} + +inline LSTATUS +CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) +{ + DWORD cchSaveMax = cchValueMax; + + cchValueMax *= sizeof(WCHAR); + LSTATUS error = ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, + (LPBYTE)pszValue, &cchValueMax); + if (cchSaveMax > 0) + pszValue[(error == ERROR_SUCCESS) ? (cchSaveMax - 1) : 0] = UNICODE_NULL; + + return error; +}

1 year, 6 months

[reactos] 01/01: [MSCTFIME][MSCTF][SDK] Add compartment helper functions (#6202)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d495475f027ad64a70d6… commit 9d495475f027ad64a70d619284db31a7c6d242bc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 20 17:51:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 20 17:51:37 2023 +0900 [MSCTFIME][MSCTF][SDK] Add compartment helper functions (#6202) - Implement GetCompartment, SetCompartmentDWORD, GetCompartmentDWORD, SetCompartmentUnknown, and ClearCompartment helper functions. - Add TF_DllDetachInOther prototype to "msctf.idl". CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 144 +++++++++++++++++++++++++++++++++++++++++- dll/win32/msctf/msctf.spec | 2 +- sdk/include/psdk/msctf.idl | 1 + 3 files changed, 144 insertions(+), 3 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index db9c0fe352b..044a6bc8cb2 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -164,6 +164,146 @@ void TFUninitLib_Thread(PLIBTHREAD pLibThread) } } +HRESULT +GetCompartment( + IUnknown *pUnknown, + REFGUID rguid, + ITfCompartment **ppComp, + BOOL bThread) +{ + ITfThreadMgr *pThreadMgr = NULL; + ITfCompartmentMgr *pCompMgr = NULL; + + *ppComp = 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)) + { + if (pCompMgr) + hr = pCompMgr->GetCompartment(rguid, ppComp); + else + hr = E_FAIL; + } + + if (pThreadMgr) + pThreadMgr->Release(); + + return hr; +} + +HRESULT +SetCompartmentDWORD( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + VARTYPE type, + BOOL bThread) +{ + ITfCompartment *pComp = NULL; + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); + if (FAILED(hr)) + return hr; + + VARIANT vari; + V_I4(&vari) = type; + V_VT(&vari) = VT_I4; + hr = pComp->SetValue(cookie, &vari); + pComp->Release(); + + return hr; +} + +HRESULT +GetCompartmentDWORD( + IUnknown *pUnknown, + REFGUID rguid, + ITfCompartment *pComp, + BOOL bThread) +{ + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); + if (FAILED(hr)) + return hr; + + VARIANT vari; + hr = pComp->GetValue(&vari); + pComp->Release(); + + return hr; +} + +HRESULT +SetCompartmentUnknown( + TfEditCookie cookie, + IUnknown *pUnknown, + REFGUID rguid, + IUnknown *pUnknown2) +{ + ITfCompartment *pComp = NULL; + HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, FALSE); + if (FAILED(hr)) + return hr; + + VARIANT vari; + V_UNKNOWN(&vari) = pUnknown2; + V_VT(&vari) = VT_UNKNOWN; + hr = pComp->SetValue(cookie, &vari); + pComp->Release(); + + return hr; +} + +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; +} + /* FIXME */ class CicInputContext : public ITfContextOwnerCompositionSink { @@ -2155,7 +2295,7 @@ VOID ProcessDetach(HINSTANCE hinstDLL) } /** - * @unimplemented + * @implemented */ EXTERN_C BOOL WINAPI DllMain( @@ -2182,7 +2322,7 @@ DllMain( } case DLL_THREAD_DETACH: { - // FIXME + TF_DllDetachInOther(); CtfImeThreadDetach(); TLS::InternalDestroyTLS(); break; diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 779ef12c79f..a38e8d7da2b 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -15,7 +15,7 @@ @ stdcall TF_CreateLangBarItemMgr(ptr) @ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) -@ stub TF_DllDetachInOther +@ stdcall -stub TF_DllDetachInOther() @ stdcall -stub TF_GetGlobalCompartment(ptr) @ stub TF_GetInputScope @ stub TF_GetLangIcon diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index ea487273a5b..4a4425f95fb 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -40,6 +40,7 @@ cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateLangBarItemMgr(_Out_ ITfLangBarItemM cpp_quote("EXTERN_C HANDLE WINAPI TF_CreateCicLoadMutex(_Out_ LPBOOL pfWinLogon);") cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCache(VOID);") cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(VOID);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_DllDetachInOther(VOID);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("EXTERN_C const GUID GUID_PROP_ATTRIBUTE;")

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Implemenet CicBridge::InitIMMX/UnInitIMMX (#6201)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d8e6e781c43be1770eba… commit 0d8e6e781c43be1770eba8a762a6b0a3cfcbc9be Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 20 16:12:57 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 20 16:12:57 2023 +0900 [MSCTFIME] Implemenet CicBridge::InitIMMX/UnInitIMMX (#6201) - Define LIBTHREAD structure. - Add InitDisplayAttrbuteLib and UninitDisplayAttrbuteLib helper functions. - Define CThreadMgrEventSink class. - Strengthen CicBridge class. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 416 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 372 insertions(+), 44 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index b2a0b979bbb..db9c0fe352b 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -26,6 +26,9 @@ UINT WM_MSIME_SHOWIMEPAD = 0; UINT WM_MSIME_MOUSE = 0; UINT WM_MSIME_KEYMAP = 0; +/** + * @implemented + */ BOOL IsMsImeMessage(UINT uMsg) { return (uMsg == WM_MSIME_SERVICE || @@ -40,6 +43,33 @@ BOOL IsMsImeMessage(UINT uMsg) uMsg == WM_MSIME_KEYMAP); } +/** + * @implemented + */ +BOOL RegisterMSIMEMessage(VOID) +{ + WM_MSIME_SERVICE = RegisterWindowMessageW(L"MSIMEService"); + WM_MSIME_UIREADY = RegisterWindowMessageW(L"MSIMEUIReady"); + WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageW(L"MSIMEReconvertRequest"); + WM_MSIME_RECONVERT = RegisterWindowMessageW(L"MSIMEReconvert"); + WM_MSIME_DOCUMENTFEED = RegisterWindowMessageW(L"MSIMEDocumentFeed"); + WM_MSIME_QUERYPOSITION = RegisterWindowMessageW(L"MSIMEQueryPosition"); + WM_MSIME_MODEBIAS = RegisterWindowMessageW(L"MSIMEModeBias"); + WM_MSIME_SHOWIMEPAD = RegisterWindowMessageW(L"MSIMEShowImePad"); + WM_MSIME_MOUSE = RegisterWindowMessageW(L"MSIMEMouseOperation"); + WM_MSIME_KEYMAP = RegisterWindowMessageW(L"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); EXTERN_C BOOLEAN WINAPI @@ -82,6 +112,58 @@ IsInteractiveUserLogon(VOID) return bOK && IsMember; } +typedef struct LIBTHREAD +{ + IUnknown *m_pUnknown1; + ITfDisplayAttributeMgr *m_pDisplayAttrMgr; +} LIBTHREAD, *PLIBTHREAD; + +HRESULT InitDisplayAttrbuteLib(PLIBTHREAD pLibThread) +{ + if (!pLibThread) + return E_FAIL; + + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } + + //FIXME + return E_NOTIMPL; +} + +HRESULT UninitDisplayAttrbuteLib(PLIBTHREAD pLibThread) +{ + if (!pLibThread) + return E_FAIL; + + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } + + return S_OK; +} + +void TFUninitLib_Thread(PLIBTHREAD pLibThread) +{ + if (!pLibThread) + return; + + if (pLibThread->m_pUnknown1) + { + pLibThread->m_pUnknown1->Release(); + pLibThread->m_pUnknown1 = NULL; + } + if (pLibThread->m_pDisplayAttrMgr) + { + pLibThread->m_pDisplayAttrMgr->Release(); + pLibThread->m_pDisplayAttrMgr = NULL; + } +} + /* FIXME */ class CicInputContext : public ITfContextOwnerCompositionSink { @@ -305,21 +387,222 @@ struct ITfSysHookSink : IUnknown 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( + FN_INITDOCMGR fnInit, + FN_PUSHPOP fnPushPop = NULL, + LPVOID pvCallbackPV = NULL); + virtual ~CThreadMgrEventSink() { } + + void SetCallbackPV(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( + FN_INITDOCMGR fnInit, + FN_PUSHPOP fnPushPop, + 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(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; +} + /* FIXME */ class CicBridge : public ITfSysHookSink { protected: LONG m_cRefs; DWORD m_dwImmxInit; - DWORD m_dwUnknown[10]; + DWORD m_dw[3]; + ITfKeystrokeMgr *m_pKeystrokeMgr; + ITfDocumentMgr *m_pDocMgr; + CThreadMgrEventSink *m_pThreadMgrEventSink; + TfClientId m_cliendId; + LIBTHREAD m_LibThread; + DWORD m_dw21; 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; @@ -822,13 +1105,13 @@ CicProfile::InitProfileInstance(TLS *pTLS) CicBridge::CicBridge() { m_dwImmxInit &= ~1; - m_dwUnknown[0] &= ~1; - m_dwUnknown[1] &= ~1; - m_dwUnknown[9] &= ~1; - m_dwUnknown[3] = 0; - m_dwUnknown[4] = 0; - m_dwUnknown[5] = 0; - m_dwUnknown[6] = 0; + m_dw[0] &= ~1; + m_dw[1] &= ~1; + m_dw21 &= ~1; + m_pKeystrokeMgr = NULL; + m_pDocMgr = NULL; + m_pThreadMgrEventSink = NULL; + m_cliendId = 0; m_cRefs = 1; } @@ -926,7 +1209,7 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) /** * @unimplemented */ -HRESULT CicBridge::InitIMMX(TLS *pTLS) +HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) { return E_NOTIMPL; } @@ -934,25 +1217,93 @@ HRESULT CicBridge::InitIMMX(TLS *pTLS) /** * @unimplemented */ -HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) +HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) { return E_NOTIMPL; } /** - * @unimplemented + * @implemented */ -HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) +HRESULT CicBridge::InitIMMX(TLS *pTLS) { - return E_NOTIMPL; + if (m_dwImmxInit & 1) + return S_OK; + + HRESULT hr; + if (!pTLS->m_pThreadMgr) + { + hr = TF_CreateThreadMgr(&pTLS->m_pThreadMgr); + if (FAILED(hr)) + return E_FAIL; + + hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfThreadMgr, (void **)&pTLS->m_pThreadMgr); + if (FAILED(hr)) + { + pTLS->m_pThreadMgr->Release(); + pTLS->m_pThreadMgr = NULL; + return E_FAIL; + } + } + + if (!m_pThreadMgrEventSink) + { + m_pThreadMgrEventSink = + new 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 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, (void **)&m_pKeystrokeMgr); + if (FAILED(hr)) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + + hr = InitDisplayAttrbuteLib(&m_LibThread); + if (FAILED(hr)) + { + UnInitIMMX(pTLS); + return E_FAIL; + } + + m_dwImmxInit |= 1; + return S_OK; } /** - * @unimplemented + * @implemented */ BOOL CicBridge::UnInitIMMX(TLS *pTLS) { - //FIXME + UninitDisplayAttrbuteLib(&m_LibThread); + TFUninitLib_Thread(&m_LibThread); + + if (m_pKeystrokeMgr) + { + m_pKeystrokeMgr->Release(); + m_pKeystrokeMgr = NULL; + } if (pTLS->m_pProfile) { @@ -960,7 +1311,12 @@ BOOL CicBridge::UnInitIMMX(TLS *pTLS) pTLS->m_pProfile = NULL; } - //FIXME + if (m_pThreadMgrEventSink) + { + m_pThreadMgrEventSink->_Unadvise(); + m_pThreadMgrEventSink->Release(); + m_pThreadMgrEventSink = NULL; + } if (pTLS->m_pThreadMgr) { @@ -969,7 +1325,6 @@ BOOL CicBridge::UnInitIMMX(TLS *pTLS) } m_dwImmxInit &= ~1; - return TRUE; } @@ -1746,33 +2101,6 @@ VOID UnregisterImeClass(VOID) DestroyIcon(wcx.hIconSm); } -/** - * @implemented - */ -BOOL RegisterMSIMEMessage(VOID) -{ - WM_MSIME_SERVICE = RegisterWindowMessageW(L"MSIMEService"); - WM_MSIME_UIREADY = RegisterWindowMessageW(L"MSIMEUIReady"); - WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageW(L"MSIMEReconvertRequest"); - WM_MSIME_RECONVERT = RegisterWindowMessageW(L"MSIMEReconvert"); - WM_MSIME_DOCUMENTFEED = RegisterWindowMessageW(L"MSIMEDocumentFeed"); - WM_MSIME_QUERYPOSITION = RegisterWindowMessageW(L"MSIMEQueryPosition"); - WM_MSIME_MODEBIAS = RegisterWindowMessageW(L"MSIMEModeBias"); - WM_MSIME_SHOWIMEPAD = RegisterWindowMessageW(L"MSIMEShowImePad"); - WM_MSIME_MOUSE = RegisterWindowMessageW(L"MSIMEMouseOperation"); - WM_MSIME_KEYMAP = RegisterWindowMessageW(L"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); -} - /** * @implemented */

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Implement CActiveLanguageProfileNotifySink (#6200)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b7405abf20e33caaf944… commit 0b7405abf20e33caaf944560483f7247e80d3558 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 20 12:29:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 20 12:29:03 2023 +0900 [MSCTFIME] Implement CActiveLanguageProfileNotifySink (#6200) - Add link to msctf.dll. - Implement CActiveLanguageProfileNotifySink class. - Strengthen CicProfile class. CORE-19360 --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/msctfime.cpp | 368 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 368 insertions(+), 2 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index db81c3f65e6..72e89de4e9c 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -17,5 +17,5 @@ add_library(msctfime MODULE set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid) -add_importlibs(msctfime oleaut32 imm32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(msctfime msctf oleaut32 imm32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 8ada6608e6c..b2a0b979bbb 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -334,12 +334,348 @@ public: HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd, 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(FN_COMPARE fnCompare, 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( + FN_COMPARE fnCompare, + 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 */ -struct CicProfile : IUnknown +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_dw3[1]; + 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(HKL hKL, REFGUID rguid, TF_LANGUAGEPROFILE *pProfile); + HRESULT GetLangId(LANGID *pLangID); + HRESULT GetCodePageA(UINT *puCodePage); + + HRESULT InitProfileInstance(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_dw3[0] = 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(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(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: @@ -449,6 +785,36 @@ BOOL TLS::InternalDestroyTLS() return TRUE; } +/** + * @implemented + */ +HRESULT +CicProfile::InitProfileInstance(TLS *pTLS) +{ + HRESULT hr = TF_CreateInputProcessorProfiles(&m_pIPProfiles); + if (FAILED(hr)) + return hr; + + if (!m_pActiveLanguageProfileNotifySink) + { + CActiveLanguageProfileNotifySink *pSink = + new 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; +} + /*********************************************************************** * CicBridge */

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Fix build of #6197 (6c438e4) Part 2

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f889c29af691e0e956c8d… commit f889c29af691e0e956c8d3bae08f7b647c9ff643 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 20:10:53 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 19 20:10:53 2023 +0900 [MSCTFIME] Fix build of #6197 (6c438e4) Part 2 Add link to oleaut32.dll. CORE-19360 --- dll/ime/msctfime/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 3dea866e674..db81c3f65e6 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -17,5 +17,5 @@ add_library(msctfime MODULE set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid) -add_importlibs(msctfime imm32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(msctfime oleaut32 imm32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all)

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Fix build of #6197 (6c438e4)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4491256924ef73f3a228… commit a4491256924ef73f3a228fb5816ac158b768b4a6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 19:36:53 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 19 19:36:53 2023 +0900 [MSCTFIME] Fix build of #6197 (6c438e4) CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 1fcdf3363a4..8ada6608e6c 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -684,13 +684,13 @@ CicBridge::ConfigureRegisterWord( if (FAILED(hr)) return hr; - ITfFunctionProvider *pProvider; + ITfFunctionProvider *pProvider = NULL; hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); if (FAILED(hr)) return hr; - ITfFnConfigureRegisterWord *pFunction; - hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigureRegisterWord, (IUnknown**)pFunction); + ITfFnConfigureRegisterWord *pFunction = NULL; + hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigureRegisterWord, (IUnknown**)&pFunction); if (FAILED(hr)) { pProvider->Release();

1 year, 6 months

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