* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
#include "msctf_internal.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
typedef struct tagThreadMgrSink {
struct list entry;
union {
} AssociatedWindow;
typedef struct tagACLMulti {
- const ITfThreadMgrVtbl *ThreadMgrVtbl;
- const ITfSourceVtbl *SourceVtbl;
- const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl;
- const ITfMessagePumpVtbl *MessagePumpVtbl;
- const ITfClientIdVtbl *ClientIdVtbl;
+ ITfThreadMgrEx ITfThreadMgrEx_iface;
+ ITfSource ITfSource_iface;
+ ITfKeystrokeMgr ITfKeystrokeMgr_iface;
+ ITfMessagePump ITfMessagePump_iface;
+ ITfClientId ITfClientId_iface;
/* const ITfThreadMgrExVtbl *ThreadMgrExVtbl; */
/* const ITfConfigureSystemKeystrokeFeedVtbl *ConfigureSystemKeystrokeFeedVtbl; */
/* const ITfLangBarItemMgrVtbl *LangBarItemMgrVtbl; */
- /* const ITfUIElementMgrVtbl *UIElementMgrVtbl; */
- const ITfSourceSingleVtbl *SourceSingleVtbl;
+ ITfUIElementMgr ITfUIElementMgr_iface;
+ ITfSourceSingle ITfSourceSingle_iface;
LONG refCount;
/* Aggregation */
ITfCompartmentMgr *CompartmentMgr;
- const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */
+ ITfThreadMgrEventSink ITfThreadMgrEventSink_iface; /* internal */
ITfDocumentMgr *focus;
LONG activationCount;
} ThreadMgr;
typedef struct tagEnumTfDocumentMgr {
- const IEnumTfDocumentMgrsVtbl *Vtbl;
+ IEnumTfDocumentMgrs IEnumTfDocumentMgrs_iface;
LONG refCount;
struct list *index;
static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut);
-static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface)
+static inline ThreadMgr *impl_from_ITfThreadMgrEx(ITfThreadMgrEx *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgrEx_iface);
}
-static inline ThreadMgr *impl_from_ITfKeystrokeMgrVtbl(ITfKeystrokeMgr *iface)
+static inline ThreadMgr *impl_from_ITfSource(ITfSource *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfSource_iface);
}
-static inline ThreadMgr *impl_from_ITfMessagePumpVtbl(ITfMessagePump *iface)
+static inline ThreadMgr *impl_from_ITfKeystrokeMgr(ITfKeystrokeMgr *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,MessagePumpVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfKeystrokeMgr_iface);
}
-static inline ThreadMgr *impl_from_ITfClientIdVtbl(ITfClientId *iface)
+static inline ThreadMgr *impl_from_ITfMessagePump(ITfMessagePump *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ClientIdVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfMessagePump_iface);
+}
+
+static inline ThreadMgr *impl_from_ITfClientId(ITfClientId *iface)
+{
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfClientId_iface);
}
static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgrEventSink_iface);
}
-static inline ThreadMgr *impl_from_ITfSourceSingleVtbl(ITfSourceSingle* iface)
+static inline ThreadMgr *impl_from_ITfUIElementMgr(ITfUIElementMgr *iface)
+{
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfUIElementMgr_iface);
+}
+static inline ThreadMgr *impl_from_ITfSourceSingle(ITfSourceSingle *iface)
{
- return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceSingleVtbl));
+ return CONTAINING_RECORD(iface, ThreadMgr, ITfSourceSingle_iface);
+}
+
+static inline EnumTfDocumentMgr *impl_from_IEnumTfDocumentMgrs(IEnumTfDocumentMgrs *iface)
+{
+ return CONTAINING_RECORD(iface, EnumTfDocumentMgr, IEnumTfDocumentMgrs_iface);
}
static void free_sink(ThreadMgrSink *sink)
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 = (ThreadMgr *)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;
+ *ppvOut = &This->ITfThreadMgrEx_iface;
}
else if (IsEqualIID(iid, &IID_ITfSource))
{
- *ppvOut = &This->SourceVtbl;
+ *ppvOut = &This->ITfSource_iface;
}
else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr))
{
- *ppvOut = &This->KeystrokeMgrVtbl;
+ *ppvOut = &This->ITfKeystrokeMgr_iface;
}
else if (IsEqualIID(iid, &IID_ITfMessagePump))
{
- *ppvOut = &This->MessagePumpVtbl;
+ *ppvOut = &This->ITfMessagePump_iface;
}
else if (IsEqualIID(iid, &IID_ITfClientId))
{
- *ppvOut = &This->ClientIdVtbl;
+ *ppvOut = &This->ITfClientId_iface;
}
else if (IsEqualIID(iid, &IID_ITfCompartmentMgr))
{
*ppvOut = This->CompartmentMgr;
}
+ else if (IsEqualIID(iid, &IID_ITfUIElementMgr))
+ {
+ *ppvOut = &This->ITfUIElementMgr_iface;
+ }
else if (IsEqualIID(iid, &IID_ITfSourceSingle))
{
- *ppvOut = &This->SourceSingleVtbl;
+ *ppvOut = &This->ITfSourceSingle_iface;
}
if (*ppvOut)
{
- ITfThreadMgr_AddRef(iface);
+ ITfThreadMgrEx_AddRef(iface);
return S_OK;
}
return E_NOINTERFACE;
}
-static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgr *iface)
+static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgrEx *iface)
{
- ThreadMgr *This = (ThreadMgr *)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 = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
ULONG ret;
ret = InterlockedDecrement(&This->refCount);
* ITfThreadMgr functions
*****************************************************/
-static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid)
+static HRESULT WINAPI ThreadMgr_Activate(ITfThreadMgrEx *iface, TfClientId *id)
{
- ThreadMgr *This = (ThreadMgr *)iface;
-
- TRACE("(%p) %p\n",This, ptid);
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
- if (!ptid)
- return E_INVALIDARG;
-
- if (!processId)
- {
- GUID guid;
- CoCreateGuid(&guid);
- ITfClientId_GetClientId((ITfClientId*)&This->ClientIdVtbl,&guid,&processId);
- }
-
- activate_textservices(iface);
- This->activationCount++;
- *ptid = processId;
- return S_OK;
+ TRACE("(%p) %p\n", This, id);
+ return ITfThreadMgrEx_ActivateEx(iface, id, 0);
}
-static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface)
+static HRESULT WINAPI ThreadMgr_Deactivate(ITfThreadMgrEx *iface)
{
- ThreadMgr *This = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
TRACE("(%p)\n",This);
if (This->activationCount == 0)
{
if (This->focus)
{
- ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus);
+ ITfThreadMgrEventSink_OnSetFocus(&This->ITfThreadMgrEventSink_iface, 0, This->focus);
ITfDocumentMgr_Release(This->focus);
This->focus = 0;
}
return S_OK;
}
-static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr
-**ppdim)
+static HRESULT WINAPI ThreadMgr_CreateDocumentMgr(ITfThreadMgrEx *iface, ITfDocumentMgr **ppdim)
{
- ThreadMgr *This = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
DocumentMgrEntry *mgrentry;
HRESULT hr;
if (mgrentry == NULL)
return E_OUTOFMEMORY;
- hr = DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim);
+ hr = DocumentMgr_Constructor(&This->ITfThreadMgrEventSink_iface, ppdim);
if (SUCCEEDED(hr))
{
return hr;
}
-static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs
-**ppEnum)
+static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs(ITfThreadMgrEx *iface, IEnumTfDocumentMgrs **ppEnum)
{
- ThreadMgr *This = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
TRACE("(%p) %p\n",This,ppEnum);
if (!ppEnum)
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 = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
TRACE("(%p)\n",This);
if (!ppdimFocus)
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_ITfThreadMgrEx(iface);
ITfDocumentMgr *check;
- ThreadMgr *This = (ThreadMgr *)iface;
TRACE("(%p) %p\n",This,pdimFocus);
else if (FAILED(ITfDocumentMgr_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check)))
return E_INVALIDARG;
- ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus);
+ ITfThreadMgrEventSink_OnSetFocus(&This->ITfThreadMgrEventSink_iface, check, This->focus);
if (This->focus)
ITfDocumentMgr_Release(This->focus);
{
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;
}
}
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_ITfThreadMgrEx(iface);
struct list *cursor, *cursor2;
- ThreadMgr *This = (ThreadMgr *)iface;
AssociatedWindow *wnd;
TRACE("(%p) %p %p %p\n",This,hwnd,pdimNew,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_ITfThreadMgrEx(iface);
HWND focus;
- ThreadMgr *This = (ThreadMgr *)iface;
+
TRACE("(%p) %p\n",This,pfThreadFocus);
focus = GetFocus();
*pfThreadFocus = (focus == NULL);
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 = (ThreadMgr *)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 = (ThreadMgr *)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 = (ThreadMgr *)iface;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
HRESULT hr;
TRACE("(%p) %p\n",This, ppCompMgr);
return S_OK;
}
-static const ITfThreadMgrVtbl ThreadMgr_ThreadMgrVtbl =
+static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id, DWORD flags)
+{
+ ThreadMgr *This = impl_from_ITfThreadMgrEx(iface);
+
+ TRACE("(%p) %p, %#x\n", This, id, flags);
+
+ if (!id)
+ return E_INVALIDARG;
+
+ if (flags)
+ FIXME("Unimplemented flags %#x\n", flags);
+
+ if (!processId)
+ {
+ GUID guid;
+ CoCreateGuid(&guid);
+ ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId);
+ }
+
+ activate_textservices((ITfThreadMgr *)iface);
+ This->activationCount++;
+ *id = processId;
+ return S_OK;
+}
+
+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,
ThreadMgr_Release,
-
- ThreadMgr_fnActivate,
- ThreadMgr_fnDeactivate,
+ ThreadMgr_Activate,
+ ThreadMgr_Deactivate,
ThreadMgr_CreateDocumentMgr,
ThreadMgr_EnumDocumentMgrs,
ThreadMgr_GetFocus,
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_ITfSourceVtbl(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ ThreadMgr *This = impl_from_ITfSource(iface);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI Source_AddRef(ITfSource *iface)
{
- ThreadMgr *This = impl_from_ITfSourceVtbl(iface);
- return ThreadMgr_AddRef((ITfThreadMgr*)This);
+ ThreadMgr *This = impl_from_ITfSource(iface);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI Source_Release(ITfSource *iface)
{
- ThreadMgr *This = impl_from_ITfSourceVtbl(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfSource(iface);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
/*****************************************************
static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface,
REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{
+ ThreadMgr *This = impl_from_ITfSource(iface);
ThreadMgrSink *tms;
- ThreadMgr *This = impl_from_ITfSourceVtbl(iface);
TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie);
static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{
+ ThreadMgr *This = impl_from_ITfSource(iface);
ThreadMgrSink *sink;
- ThreadMgr *This = impl_from_ITfSourceVtbl(iface);
TRACE("(%p) %x\n",This,pdwCookie);
return S_OK;
}
-static const ITfSourceVtbl ThreadMgr_SourceVtbl =
+static const ITfSourceVtbl ThreadMgrSourceVtbl =
{
Source_QueryInterface,
Source_AddRef,
Source_Release,
-
ThreadMgrSource_AdviseSink,
ThreadMgrSource_UnadviseSink,
};
static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
- return ThreadMgr_AddRef((ITfThreadMgr*)This);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI KeystrokeMgr_Release(ITfKeystrokeMgr *iface)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface,
TfClientId tid, ITfKeyEventSink *pSink, BOOL fForeground)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
CLSID textservice;
ITfKeyEventSink *check = NULL;
static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface,
TfClientId tid)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
CLSID textservice;
ITfKeyEventSink *check = NULL;
TRACE("(%p) %x\n",This,tid);
static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface,
CLSID *pclsid)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
TRACE("(%p) %p\n",This,pclsid);
if (!pclsid)
return E_INVALIDARG;
static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface,
WPARAM wParam, LPARAM lParam, BOOL *pfEaten)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface,
WPARAM wParam, LPARAM lParam, BOOL *pfEaten)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface,
WPARAM wParam, LPARAM lParam, BOOL *pfEaten)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_KeyUp(ITfKeystrokeMgr *iface,
WPARAM wParam, LPARAM lParam, BOOL *pfEaten)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_GetPreservedKey(ITfKeystrokeMgr *iface,
ITfContext *pic, const TF_PRESERVEDKEY *pprekey, GUID *pguid)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface,
REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
struct list *cursor;
TRACE("(%p) %s (%x %x) %p\n",This,debugstr_guid(rguid), (pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0, pfRegistered);
TfClientId tid, REFGUID rguid, const TF_PRESERVEDKEY *prekey,
const WCHAR *pchDesc, ULONG cchDesc)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
struct list *cursor;
PreservedKey *newkey;
static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface,
REFGUID rguid, const TF_PRESERVEDKEY *pprekey)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
PreservedKey* key = NULL;
struct list *cursor;
TRACE("(%p) %s (%x %x)\n",This,debugstr_guid(rguid),(pprekey)?pprekey->uVKey:0, (pprekey)?pprekey->uModifiers:0);
static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface,
REFGUID rguid, const WCHAR *pchDesc, ULONG cchDesc)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_GetPreservedKeyDescription(ITfKeystrokeMgr *iface,
REFGUID rguid, BSTR *pbstrDesc)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
static HRESULT WINAPI KeystrokeMgr_SimulatePreservedKey(ITfKeystrokeMgr *iface,
ITfContext *pic, REFGUID rguid, BOOL *pfEaten)
{
- ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface);
+ ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface);
FIXME("STUB:(%p)\n",This);
return E_NOTIMPL;
}
-static const ITfKeystrokeMgrVtbl ThreadMgr_KeystrokeMgrVtbl =
+static const ITfKeystrokeMgrVtbl KeystrokeMgrVtbl =
{
KeystrokeMgr_QueryInterface,
KeystrokeMgr_AddRef,
KeystrokeMgr_Release,
-
KeystrokeMgr_AdviseKeyEventSink,
KeystrokeMgr_UnadviseKeyEventSink,
KeystrokeMgr_GetForeground,
static HRESULT WINAPI MessagePump_QueryInterface(ITfMessagePump *iface, REFIID iid, LPVOID *ppvOut)
{
- ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ ThreadMgr *This = impl_from_ITfMessagePump(iface);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI MessagePump_AddRef(ITfMessagePump *iface)
{
- ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface);
- return ThreadMgr_AddRef((ITfThreadMgr*)This);
+ ThreadMgr *This = impl_from_ITfMessagePump(iface);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI MessagePump_Release(ITfMessagePump *iface)
{
- ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfMessagePump(iface);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
static HRESULT WINAPI MessagePump_PeekMessageA(ITfMessagePump *iface,
return S_OK;
}
-static const ITfMessagePumpVtbl ThreadMgr_MessagePumpVtbl =
+static const ITfMessagePumpVtbl MessagePumpVtbl =
{
MessagePump_QueryInterface,
MessagePump_AddRef,
MessagePump_Release,
-
MessagePump_PeekMessageA,
MessagePump_GetMessageA,
MessagePump_PeekMessageW,
static HRESULT WINAPI ClientId_QueryInterface(ITfClientId *iface, REFIID iid, LPVOID *ppvOut)
{
- ThreadMgr *This = impl_from_ITfClientIdVtbl(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ ThreadMgr *This = impl_from_ITfClientId(iface);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI ClientId_AddRef(ITfClientId *iface)
{
- ThreadMgr *This = impl_from_ITfClientIdVtbl(iface);
- return ThreadMgr_AddRef((ITfThreadMgr*)This);
+ ThreadMgr *This = impl_from_ITfClientId(iface);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI ClientId_Release(ITfClientId *iface)
{
- ThreadMgr *This = impl_from_ITfClientIdVtbl(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfClientId(iface);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
static HRESULT WINAPI ClientId_GetClientId(ITfClientId *iface,
REFCLSID rclsid, TfClientId *ptid)
{
+ ThreadMgr *This = impl_from_ITfClientId(iface);
HRESULT hr;
ITfCategoryMgr *catmgr;
- ThreadMgr *This = impl_from_ITfClientIdVtbl(iface);
TRACE("(%p) %s\n",This,debugstr_guid(rclsid));
return hr;
}
-static const ITfClientIdVtbl ThreadMgr_ClientIdVtbl =
+static const ITfClientIdVtbl ClientIdVtbl =
{
ClientId_QueryInterface,
ClientId_AddRef,
ClientId_Release,
-
ClientId_GetClientId
};
static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut)
{
ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface)
{
ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
- return ThreadMgr_AddRef((ITfThreadMgr*)This);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface)
{
ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
return S_OK;
}
-static const ITfThreadMgrEventSinkVtbl ThreadMgr_ThreadMgrEventSinkVtbl =
+static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSinkVtbl =
{
ThreadMgrEventSink_QueryInterface,
ThreadMgrEventSink_AddRef,
ThreadMgrEventSink_Release,
-
ThreadMgrEventSink_OnInitDocumentMgr,
ThreadMgrEventSink_OnUninitDocumentMgr,
ThreadMgrEventSink_OnSetFocus,
ThreadMgrEventSink_OnPopContext
};
+/*****************************************************
+ * ITfUIElementMgr functions
+ *****************************************************/
+static HRESULT WINAPI UIElementMgr_QueryInterface(ITfUIElementMgr *iface, REFIID iid, void **ppvOut)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut);
+}
+
+static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
+}
+
+static ULONG WINAPI UIElementMgr_Release(ITfUIElementMgr *iface)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
+}
+
+static HRESULT WINAPI UIElementMgr_BeginUIElement(ITfUIElementMgr *iface, ITfUIElement *element,
+ BOOL *show, DWORD *id)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ FIXME("STUB:(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI UIElementMgr_UpdateUIElement(ITfUIElementMgr *iface, DWORD id)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ FIXME("STUB:(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI UIElementMgr_EndUIElement(ITfUIElementMgr *iface, DWORD id)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ FIXME("STUB:(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI UIElementMgr_GetUIElement(ITfUIElementMgr *iface, DWORD id,
+ ITfUIElement **element)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ FIXME("STUB:(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI UIElementMgr_EnumUIElements(ITfUIElementMgr *iface,
+ IEnumTfUIElements **enum_elements)
+{
+ ThreadMgr *This = impl_from_ITfUIElementMgr(iface);
+
+ FIXME("STUB:(%p)\n", This);
+ return E_NOTIMPL;
+}
+
+static const ITfUIElementMgrVtbl ThreadMgrUIElementMgrVtbl =
+{
+ UIElementMgr_QueryInterface,
+ UIElementMgr_AddRef,
+ UIElementMgr_Release,
+
+ UIElementMgr_BeginUIElement,
+ UIElementMgr_UpdateUIElement,
+ UIElementMgr_EndUIElement,
+ UIElementMgr_GetUIElement,
+ UIElementMgr_EnumUIElements
+};
+
/*****************************************************
* ITfSourceSingle functions
*****************************************************/
static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut)
{
- ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
- return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut);
+ ThreadMgr *This = impl_from_ITfSourceSingle(iface);
+ return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut);
}
static ULONG WINAPI ThreadMgrSourceSingle_AddRef(ITfSourceSingle *iface)
{
- ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
- return ThreadMgr_AddRef((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfSourceSingle(iface);
+ return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface);
}
static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface)
{
- ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
- return ThreadMgr_Release((ITfThreadMgr *)This);
+ ThreadMgr *This = impl_from_ITfSourceSingle(iface);
+ return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface);
}
static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid, IUnknown *punk)
{
- ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
+ ThreadMgr *This = impl_from_ITfSourceSingle(iface);
FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk);
return E_NOTIMPL;
}
static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid)
{
- ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
+ ThreadMgr *This = impl_from_ITfSourceSingle(iface);
FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid));
return E_NOTIMPL;
}
-static const ITfSourceSingleVtbl ThreadMgr_SourceSingleVtbl =
+static const ITfSourceSingleVtbl SourceSingleVtbl =
{
ThreadMgrSourceSingle_QueryInterface,
ThreadMgrSourceSingle_AddRef,
ThreadMgrSourceSingle_Release,
-
ThreadMgrSourceSingle_AdviseSingleSink,
- ThreadMgrSourceSingle_UnadviseSingleSink,
+ ThreadMgrSourceSingle_UnadviseSingleSink
};
HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
This = TlsGetValue(tlsIndex);
if (This)
{
- ThreadMgr_AddRef((ITfThreadMgr*)This);
- *ppOut = (IUnknown*)This;
+ ThreadMgr_AddRef(&This->ITfThreadMgrEx_iface);
+ *ppOut = (IUnknown*)&This->ITfThreadMgrEx_iface;
return S_OK;
}
if (This == NULL)
return E_OUTOFMEMORY;
- This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl;
- This->SourceVtbl = &ThreadMgr_SourceVtbl;
- This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl;
- This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl;
- This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl;
- This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl;
- This->SourceSingleVtbl = &ThreadMgr_SourceSingleVtbl;
+ This->ITfThreadMgrEx_iface.lpVtbl = &ThreadMgrExVtbl;
+ This->ITfSource_iface.lpVtbl = &ThreadMgrSourceVtbl;
+ This->ITfKeystrokeMgr_iface.lpVtbl = &KeystrokeMgrVtbl;
+ This->ITfMessagePump_iface.lpVtbl = &MessagePumpVtbl;
+ This->ITfClientId_iface.lpVtbl = &ClientIdVtbl;
+ This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSinkVtbl;
+ This->ITfUIElementMgr_iface.lpVtbl = &ThreadMgrUIElementMgrVtbl;
+ This->ITfSourceSingle_iface.lpVtbl = &SourceSingleVtbl;
This->refCount = 1;
TlsSetValue(tlsIndex,This);
list_init(&This->ThreadMgrEventSink);
TRACE("returning %p\n", This);
- *ppOut = (IUnknown *)This;
+ *ppOut = (IUnknown *)&This->ITfThreadMgrEx_iface;
return S_OK;
}
static HRESULT WINAPI EnumTfDocumentMgr_QueryInterface(IEnumTfDocumentMgrs *iface, REFIID iid, LPVOID *ppvOut)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
*ppvOut = NULL;
if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumTfDocumentMgrs))
{
- *ppvOut = This;
+ *ppvOut = &This->IEnumTfDocumentMgrs_iface;
}
if (*ppvOut)
static ULONG WINAPI EnumTfDocumentMgr_AddRef(IEnumTfDocumentMgrs *iface)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr*)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
return InterlockedIncrement(&This->refCount);
}
static ULONG WINAPI EnumTfDocumentMgr_Release(IEnumTfDocumentMgrs *iface)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
ULONG ret;
ret = InterlockedDecrement(&This->refCount);
static HRESULT WINAPI EnumTfDocumentMgr_Next(IEnumTfDocumentMgrs *iface,
ULONG ulCount, ITfDocumentMgr **rgDocumentMgr, ULONG *pcFetched)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
ULONG fetched = 0;
TRACE("(%p)\n",This);
static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt)
{
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
ULONG i;
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+
TRACE("(%p)\n",This);
for(i = 0; i < celt && This->index != NULL; i++)
This->index = list_next(This->head, This->index);
static HRESULT WINAPI EnumTfDocumentMgr_Reset( IEnumTfDocumentMgrs* iface)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
TRACE("(%p)\n",This);
This->index = list_head(This->head);
return S_OK;
static HRESULT WINAPI EnumTfDocumentMgr_Clone( IEnumTfDocumentMgrs *iface,
IEnumTfDocumentMgrs **ppenum)
{
- EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
+ EnumTfDocumentMgr *This = impl_from_IEnumTfDocumentMgrs(iface);
HRESULT res;
TRACE("(%p)\n",This);
res = EnumTfDocumentMgr_Constructor(This->head, ppenum);
if (SUCCEEDED(res))
{
- EnumTfDocumentMgr *new_This = (EnumTfDocumentMgr *)*ppenum;
+ EnumTfDocumentMgr *new_This = impl_from_IEnumTfDocumentMgrs(*ppenum);
new_This->index = This->index;
}
return res;
}
-static const IEnumTfDocumentMgrsVtbl IEnumTfDocumentMgrs_Vtbl ={
+static const IEnumTfDocumentMgrsVtbl EnumTfDocumentMgrsVtbl =
+{
EnumTfDocumentMgr_QueryInterface,
EnumTfDocumentMgr_AddRef,
EnumTfDocumentMgr_Release,
-
EnumTfDocumentMgr_Clone,
EnumTfDocumentMgr_Next,
EnumTfDocumentMgr_Reset,
if (This == NULL)
return E_OUTOFMEMORY;
- This->Vtbl= &IEnumTfDocumentMgrs_Vtbl;
+ This->IEnumTfDocumentMgrs_iface.lpVtbl= &EnumTfDocumentMgrsVtbl;
This->refCount = 1;
This->head = head;
This->index = list_head(This->head);
return S_OK;
}
-void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr)
+void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr)
{
- ThreadMgr *This = (ThreadMgr *)tm;
+ ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface);
struct list *cursor;
LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs)
{
projects / reactos.git / blobdiff