[PATCH 1/3] msctf: Add ITfThreadMgrEx stub.

Matteo Bruni mbruni at codeweavers.com
Wed Oct 28 16:27:25 CDT 2015


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
This avoids a crash on exit with World of Warships when the OS version
is set to Windows 7.

 dlls/msctf/threadmgr.c | 145 ++++++++++++++++++++++++++++---------------------
 include/msctf.idl      |  14 +++++
 2 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
index 960548c..b56d558 100644
--- a/dlls/msctf/threadmgr.c
+++ b/dlls/msctf/threadmgr.c
@@ -79,7 +79,7 @@ typedef struct tagAssociatedWindow
 } AssociatedWindow;
 
 typedef struct tagACLMulti {
-    ITfThreadMgr ITfThreadMgr_iface;
+    ITfThreadMgrEx ITfThreadMgrEx_iface;
     ITfSource ITfSource_iface;
     ITfKeystrokeMgr ITfKeystrokeMgr_iface;
     ITfMessagePump ITfMessagePump_iface;
@@ -127,9 +127,9 @@ typedef struct tagEnumTfDocumentMgr {
 
 static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut);
 
-static inline ThreadMgr *impl_from_ITfThreadMgr(ITfThreadMgr *iface)
+static inline ThreadMgr *impl_from_ITfThreadMgrEx(ITfThreadMgrEx *iface)
 {
-    return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgr_iface);
+    return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgrEx_iface);
 }
 
 static inline ThreadMgr *impl_from_ITfSource(ITfSource *iface)
@@ -252,14 +252,15 @@ static void ThreadMgr_Destructor(ThreadMgr *This)
     HeapFree(GetProcessHeap(),0,This);
 }
 
-static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, LPVOID *ppvOut)
+static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgrEx *iface, REFIID iid, LPVOID *ppvOut)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     *ppvOut = NULL;
 
-    if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgr))
+    if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgr)
+        || IsEqualIID(iid, &IID_ITfThreadMgrEx))
     {
-        *ppvOut = &This->ITfThreadMgr_iface;
+        *ppvOut = &This->ITfThreadMgrEx_iface;
     }
     else if (IsEqualIID(iid, &IID_ITfSource))
     {
@@ -288,7 +289,7 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid,
 
     if (*ppvOut)
     {
-        ITfThreadMgr_AddRef(iface);
+        ITfThreadMgrEx_AddRef(iface);
         return S_OK;
     }
 
@@ -296,15 +297,15 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid,
     return E_NOINTERFACE;
 }
 
-static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgr *iface)
+static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgrEx *iface)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     return InterlockedIncrement(&This->refCount);
 }
 
-static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface)
+static ULONG WINAPI ThreadMgr_Release(ITfThreadMgrEx *iface)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     ULONG ret;
 
     ret = InterlockedDecrement(&This->refCount);
@@ -317,9 +318,9 @@ static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface)
  * ITfThreadMgr functions
  *****************************************************/
 
-static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid)
+static HRESULT WINAPI ThreadMgr_fnActivate(ITfThreadMgrEx *iface, TfClientId *ptid)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
 
     TRACE("(%p) %p\n",This, ptid);
 
@@ -333,15 +334,15 @@ static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *pti
         ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId);
     }
 
-    activate_textservices(iface);
+    activate_textservices((ITfThreadMgr *)iface);
     This->activationCount++;
     *ptid = processId;
     return S_OK;
 }
 
-static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface)
+static HRESULT WINAPI ThreadMgr_fnDeactivate(ITfThreadMgrEx *iface)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     TRACE("(%p)\n",This);
 
     if (This->activationCount == 0)
@@ -364,9 +365,9 @@ static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface)
     return S_OK;
 }
 
-static HRESULT WINAPI ThreadMgr_CreateDocumentMgr(ITfThreadMgr* iface, ITfDocumentMgr **ppdim)
+static HRESULT WINAPI ThreadMgr_CreateDocumentMgr(ITfThreadMgrEx *iface, ITfDocumentMgr **ppdim)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     DocumentMgrEntry *mgrentry;
     HRESULT hr;
 
@@ -388,9 +389,9 @@ static HRESULT WINAPI ThreadMgr_CreateDocumentMgr(ITfThreadMgr* iface, ITfDocume
     return hr;
 }
 
-static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs **ppEnum)
+static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs(ITfThreadMgrEx *iface, IEnumTfDocumentMgrs **ppEnum)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     TRACE("(%p) %p\n",This,ppEnum);
 
     if (!ppEnum)
@@ -399,10 +400,9 @@ static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDo
     return EnumTfDocumentMgr_Constructor(&This->CreatedDocumentMgrs, ppEnum);
 }
 
-static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr
-**ppdimFocus)
+static HRESULT WINAPI ThreadMgr_GetFocus(ITfThreadMgrEx *iface, ITfDocumentMgr **ppdimFocus)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     TRACE("(%p)\n",This);
 
     if (!ppdimFocus)
@@ -420,9 +420,9 @@ static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr
     return S_OK;
 }
 
-static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *pdimFocus)
+static HRESULT WINAPI ThreadMgr_SetFocus(ITfThreadMgrEx *iface, ITfDocumentMgr *pdimFocus)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     ITfDocumentMgr *check;
 
     TRACE("(%p) %p\n",This,pdimFocus);
@@ -468,7 +468,7 @@ static LRESULT CALLBACK ThreadFocusHookProc(int nCode, WPARAM wParam, LPARAM lPa
             {
                 TRACE("Triggering Associated window focus\n");
                 if (This->focus != wnd->docmgr)
-                    ThreadMgr_SetFocus((ITfThreadMgr*)This, wnd->docmgr);
+                    ThreadMgr_SetFocus(&This->ITfThreadMgrEx_iface, wnd->docmgr);
                 break;
             }
         }
@@ -493,10 +493,10 @@ static HRESULT SetupWindowsHook(ThreadMgr *This)
     return S_FALSE;
 }
 
-static HRESULT WINAPI ThreadMgr_AssociateFocus( ITfThreadMgr* iface, HWND hwnd,
+static HRESULT WINAPI ThreadMgr_AssociateFocus(ITfThreadMgrEx *iface, HWND hwnd,
 ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     struct list *cursor, *cursor2;
     AssociatedWindow *wnd;
 
@@ -535,9 +535,9 @@ ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev)
     return S_OK;
 }
 
-static HRESULT WINAPI ThreadMgr_IsThreadFocus( ITfThreadMgr* iface, BOOL *pfThreadFocus)
+static HRESULT WINAPI ThreadMgr_IsThreadFocus(ITfThreadMgrEx *iface, BOOL *pfThreadFocus)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     HWND focus;
 
     TRACE("(%p) %p\n",This,pfThreadFocus);
@@ -546,26 +546,26 @@ static HRESULT WINAPI ThreadMgr_IsThreadFocus( ITfThreadMgr* iface, BOOL *pfThre
     return S_OK;
 }
 
-static HRESULT WINAPI ThreadMgr_GetFunctionProvider( ITfThreadMgr* iface, REFCLSID clsid,
+static HRESULT WINAPI ThreadMgr_GetFunctionProvider(ITfThreadMgrEx *iface, REFCLSID clsid,
 ITfFunctionProvider **ppFuncProv)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     FIXME("STUB:(%p)\n",This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ThreadMgr_EnumFunctionProviders( ITfThreadMgr* iface,
+static HRESULT WINAPI ThreadMgr_EnumFunctionProviders(ITfThreadMgrEx *iface,
 IEnumTfFunctionProviders **ppEnum)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     FIXME("STUB:(%p)\n",This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ThreadMgr_GetGlobalCompartment( ITfThreadMgr* iface,
+static HRESULT WINAPI ThreadMgr_GetGlobalCompartment(ITfThreadMgrEx *iface,
 ITfCompartmentMgr **ppCompMgr)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
     HRESULT hr;
     TRACE("(%p) %p\n",This, ppCompMgr);
 
@@ -584,7 +584,23 @@ ITfCompartmentMgr **ppCompMgr)
     return S_OK;
 }
 
-static const ITfThreadMgrVtbl ThreadMgrVtbl =
+static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id, DWORD flags)
+{
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
+
+    FIXME("STUB:(%p)\n", This);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ThreadMgr_GetActiveFlags(ITfThreadMgrEx *iface, DWORD *flags)
+{
+    ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
+
+    FIXME("STUB:(%p)\n", This);
+    return E_NOTIMPL;
+}
+
+static const ITfThreadMgrExVtbl ThreadMgrExVtbl =
 {
     ThreadMgr_QueryInterface,
     ThreadMgr_AddRef,
@@ -599,25 +615,28 @@ static const ITfThreadMgrVtbl ThreadMgrVtbl =
     ThreadMgr_IsThreadFocus,
     ThreadMgr_GetFunctionProvider,
     ThreadMgr_EnumFunctionProviders,
-    ThreadMgr_GetGlobalCompartment
+    ThreadMgr_GetGlobalCompartment,
+
+    ThreadMgr_ActivateEx,
+    ThreadMgr_GetActiveFlags
 };
 
 static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfSource(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI Source_AddRef(ITfSource *iface)
 {
     ThreadMgr *This = impl_from_ITfSource(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI Source_Release(ITfSource *iface)
 {
     ThreadMgr *This = impl_from_ITfSource(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 /*****************************************************
@@ -694,19 +713,19 @@ static const ITfSourceVtbl ThreadMgrSourceVtbl =
 static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface)
 {
     ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI KeystrokeMgr_Release(ITfKeystrokeMgr *iface)
 {
     ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface,
@@ -986,19 +1005,19 @@ static const ITfKeystrokeMgrVtbl KeystrokeMgrVtbl =
 static HRESULT WINAPI MessagePump_QueryInterface(ITfMessagePump *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfMessagePump(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI MessagePump_AddRef(ITfMessagePump *iface)
 {
     ThreadMgr *This = impl_from_ITfMessagePump(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI MessagePump_Release(ITfMessagePump *iface)
 {
     ThreadMgr *This = impl_from_ITfMessagePump(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 static HRESULT WINAPI MessagePump_PeekMessageA(ITfMessagePump *iface,
@@ -1059,19 +1078,19 @@ static const ITfMessagePumpVtbl MessagePumpVtbl =
 static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfClientId(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI ClientId_AddRef(ITfClientId *iface)
 {
     ThreadMgr *This = impl_from_ITfClientId(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI ClientId_Release(ITfClientId *iface)
 {
     ThreadMgr *This = impl_from_ITfClientId(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 static HRESULT WINAPI ClientId_GetClientId(ITfClientId *iface,
@@ -1105,19 +1124,19 @@ static const ITfClientIdVtbl ClientIdVtbl =
 static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface)
 {
     ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface)
 {
     ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 
@@ -1225,19 +1244,19 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSinkVtbl =
 static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut)
 {
     ThreadMgr *This = impl_from_ITfSourceSingle(iface);
-    return ITfThreadMgr_QueryInterface(&This->ITfThreadMgr_iface, iid, ppvOut);
+    return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
 }
 
 static ULONG WINAPI ThreadMgrSourceSingle_AddRef(ITfSourceSingle *iface)
 {
     ThreadMgr *This = impl_from_ITfSourceSingle(iface);
-    return ITfThreadMgr_AddRef(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
 }
 
 static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface)
 {
     ThreadMgr *This = impl_from_ITfSourceSingle(iface);
-    return ITfThreadMgr_Release(&This->ITfThreadMgr_iface);
+    return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
 }
 
 static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface,
@@ -1275,8 +1294,8 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
     This = TlsGetValue(tlsIndex);
     if (This)
     {
-        ThreadMgr_AddRef(&This->ITfThreadMgr_iface);
-        *ppOut = (IUnknown*)&This->ITfThreadMgr_iface;
+        ThreadMgr_AddRef(&This->ITfThreadMgrEx_iface);
+        *ppOut = (IUnknown*)&This->ITfThreadMgrEx_iface;
         return S_OK;
     }
 
@@ -1284,9 +1303,9 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
     if (This == NULL)
         return E_OUTOFMEMORY;
 
-    This->ITfThreadMgr_iface.lpVtbl= &ThreadMgrVtbl;
+    This->ITfThreadMgrEx_iface.lpVtbl = &ThreadMgrExVtbl;
     This->ITfSource_iface.lpVtbl = &ThreadMgrSourceVtbl;
-    This->ITfKeystrokeMgr_iface.lpVtbl= &KeystrokeMgrVtbl;
+    This->ITfKeystrokeMgr_iface.lpVtbl = &KeystrokeMgrVtbl;
     This->ITfMessagePump_iface.lpVtbl = &MessagePumpVtbl;
     This->ITfClientId_iface.lpVtbl = &ClientIdVtbl;
     This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSinkVtbl;
@@ -1308,7 +1327,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
     list_init(&This->ThreadMgrEventSink);
 
     TRACE("returning %p\n", This);
-    *ppOut = (IUnknown *)&This->ITfThreadMgr_iface;
+    *ppOut = (IUnknown *)&This->ITfThreadMgrEx_iface;
     return S_OK;
 }
 
@@ -1459,7 +1478,7 @@ static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentM
 
 void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr)
 {
-    ThreadMgr *This = impl_from_ITfThreadMgr(iface);
+    ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface);
     struct list *cursor;
     LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs)
     {
diff --git a/include/msctf.idl b/include/msctf.idl
index db82709..0fe2d71 100644
--- a/include/msctf.idl
+++ b/include/msctf.idl
@@ -214,6 +214,20 @@ interface ITfThreadMgr: IUnknown
 
 [
     object,
+    uuid(3e90ade3-7594-4cb0-bb58-69628f5f458c),
+    pointer_default(unique)
+]
+interface ITfThreadMgrEx : ITfThreadMgr
+{
+    HRESULT ActivateEx(
+        [out] TfClientId *id,
+        [in] DWORD flags);
+    HRESULT GetActiveFlags(
+        [out] DWORD *flags);
+}
+
+[
+    object,
     uuid(d7540241-f9a1-4364-befc-dbcd2c4395b7),
     pointer_default(unique)
 ]
-- 
2.4.10




More information about the wine-patches mailing list