lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-20 19:16:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MSCTF] Support TF_CreateCategoryMgr etc. (#8260)

Browse Source 
Implementing missing features...
JIRA issue: CORE-19361
- Implement TF_CreateCategoryMgr
  and TF_CreateDisplayAttributeMgr.
- Rename g_tlsIndex as g_dwTLSIndex.
- Use ProcessAttach and
  ProcessDetach in DllMain.
This commit is contained in:
Katayama Hirofumi MZ
2025-07-17 21:17:28 +09:00
committed by GitHub
parent a5ab400689
commit 519232df78
4 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
base/ctf/msctf/threadmgr.cpp
View File

@@ -308,7 +308,7 @@ CThreadMgr::~CThreadMgr()
if (m_focusHook)
UnhookWindowsHookEx(m_focusHook);
TlsSetValue(g_tlsIndex, NULL);
TlsSetValue(g_dwTLSIndex, NULL);
TRACE("destroying %p\n", this);
if (m_focus)
@@ -527,7 +527,7 @@ LRESULT CThreadMgr::_ThreadFocusHookProc(INT nCode, WPARAM wParam, LPARAM lParam
LRESULT CALLBACK CThreadMgr::ThreadFocusHookProc(INT nCode, WPARAM wParam, LPARAM lParam)
{
CThreadMgr *This = (CThreadMgr *)TlsGetValue(g_tlsIndex);
CThreadMgr *This = (CThreadMgr *)TlsGetValue(g_dwTLSIndex);
if (!This)
{
ERR("Hook proc but no ThreadMgr for this thread. Serious Error\n");
@@ -1215,7 +1215,7 @@ HRESULT CThreadMgr::CreateInstance(IUnknown *pUnkOuter, CThreadMgr **ppOut)
return CLASS_E_NOAGGREGATION;
/* Only 1 ThreadMgr is created per thread */
CThreadMgr *This = (CThreadMgr *)TlsGetValue(g_tlsIndex);
CThreadMgr *This = (CThreadMgr *)TlsGetValue(g_dwTLSIndex);
if (This)
{
This->AddRef();
@@ -1227,7 +1227,7 @@ HRESULT CThreadMgr::CreateInstance(IUnknown *pUnkOuter, CThreadMgr **ppOut)
if (!This)
return E_OUTOFMEMORY;
TlsSetValue(g_tlsIndex, This);
TlsSetValue(g_dwTLSIndex, This);
ITfCompartmentMgr *pCompMgr = NULL;
CompartmentMgr_Constructor(static_cast<ITfThreadMgrEx *>(This), IID_IUnknown, (IUnknown **)&pCompMgr);