msctf: Use generic sinks in Compartment object.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7c1c94c258
commit
40cdfd2a6a
|
@ -66,15 +66,6 @@ typedef struct tagCompartmentEnumGuid {
|
||||||
struct list *cursor;
|
struct list *cursor;
|
||||||
} CompartmentEnumGuid;
|
} CompartmentEnumGuid;
|
||||||
|
|
||||||
|
|
||||||
typedef struct tagCompartmentSink {
|
|
||||||
struct list entry;
|
|
||||||
union {
|
|
||||||
IUnknown *pIUnknown;
|
|
||||||
ITfCompartmentEventSink *pITfCompartmentEventSink;
|
|
||||||
} interfaces;
|
|
||||||
} CompartmentSink;
|
|
||||||
|
|
||||||
typedef struct tagCompartment {
|
typedef struct tagCompartment {
|
||||||
ITfCompartment ITfCompartment_iface;
|
ITfCompartment ITfCompartment_iface;
|
||||||
ITfSource ITfSource_iface;
|
ITfSource ITfSource_iface;
|
||||||
|
@ -443,23 +434,11 @@ static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID **
|
||||||
/**************************************************
|
/**************************************************
|
||||||
* ITfCompartment
|
* ITfCompartment
|
||||||
**************************************************/
|
**************************************************/
|
||||||
static void free_sink(CompartmentSink *sink)
|
|
||||||
{
|
|
||||||
IUnknown_Release(sink->interfaces.pIUnknown);
|
|
||||||
HeapFree(GetProcessHeap(),0,sink);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Compartment_Destructor(Compartment *This)
|
static void Compartment_Destructor(Compartment *This)
|
||||||
{
|
{
|
||||||
struct list *cursor, *cursor2;
|
|
||||||
TRACE("destroying %p\n", This);
|
TRACE("destroying %p\n", This);
|
||||||
VariantClear(&This->variant);
|
VariantClear(&This->variant);
|
||||||
LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CompartmentEventSink)
|
free_sinks(&This->CompartmentEventSink);
|
||||||
{
|
|
||||||
CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry);
|
|
||||||
list_remove(cursor);
|
|
||||||
free_sink(sink);
|
|
||||||
}
|
|
||||||
HeapFree(GetProcessHeap(),0,This);
|
HeapFree(GetProcessHeap(),0,This);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -509,6 +488,7 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface,
|
||||||
TfClientId tid, const VARIANT *pvarValue)
|
TfClientId tid, const VARIANT *pvarValue)
|
||||||
{
|
{
|
||||||
Compartment *This = impl_from_ITfCompartment(iface);
|
Compartment *This = impl_from_ITfCompartment(iface);
|
||||||
|
ITfCompartmentEventSink *sink;
|
||||||
struct list *cursor;
|
struct list *cursor;
|
||||||
|
|
||||||
TRACE("(%p) %i %p\n",This,tid,pvarValue);
|
TRACE("(%p) %i %p\n",This,tid,pvarValue);
|
||||||
|
@ -534,10 +514,9 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface,
|
||||||
else if (V_VT(pvarValue) == VT_UNKNOWN)
|
else if (V_VT(pvarValue) == VT_UNKNOWN)
|
||||||
IUnknown_AddRef(V_UNKNOWN(&This->variant));
|
IUnknown_AddRef(V_UNKNOWN(&This->variant));
|
||||||
|
|
||||||
LIST_FOR_EACH(cursor, &This->CompartmentEventSink)
|
SINK_FOR_EACH(cursor, &This->CompartmentEventSink, ITfCompartmentEventSink, sink)
|
||||||
{
|
{
|
||||||
CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry);
|
ITfCompartmentEventSink_OnChange(sink, &This->valueData->guid);
|
||||||
ITfCompartmentEventSink_OnChange(sink->interfaces.pITfCompartmentEventSink,&This->valueData->guid);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
@ -592,7 +571,6 @@ static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface,
|
||||||
REFIID riid, IUnknown *punk, DWORD *pdwCookie)
|
REFIID riid, IUnknown *punk, DWORD *pdwCookie)
|
||||||
{
|
{
|
||||||
Compartment *This = impl_from_ITfSource(iface);
|
Compartment *This = impl_from_ITfSource(iface);
|
||||||
CompartmentSink *cs;
|
|
||||||
|
|
||||||
TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie);
|
TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie);
|
||||||
|
|
||||||
|
@ -600,47 +578,23 @@ static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface,
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (IsEqualIID(riid, &IID_ITfCompartmentEventSink))
|
if (IsEqualIID(riid, &IID_ITfCompartmentEventSink))
|
||||||
{
|
return advise_sink(&This->CompartmentEventSink, &IID_ITfCompartmentEventSink,
|
||||||
cs = HeapAlloc(GetProcessHeap(),0,sizeof(CompartmentSink));
|
COOKIE_MAGIC_COMPARTMENTSINK, punk, pdwCookie);
|
||||||
if (!cs)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&cs->interfaces.pITfCompartmentEventSink)))
|
|
||||||
{
|
|
||||||
HeapFree(GetProcessHeap(),0,cs);
|
|
||||||
return CONNECT_E_CANNOTCONNECT;
|
|
||||||
}
|
|
||||||
list_add_head(&This->CompartmentEventSink,&cs->entry);
|
|
||||||
*pdwCookie = generate_Cookie(COOKIE_MAGIC_COMPARTMENTSINK , cs);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));
|
|
||||||
return E_NOTIMPL;
|
|
||||||
}
|
|
||||||
|
|
||||||
TRACE("cookie %x\n",*pdwCookie);
|
FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));
|
||||||
|
return E_NOTIMPL;
|
||||||
return S_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
|
static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
|
||||||
{
|
{
|
||||||
Compartment *This = impl_from_ITfSource(iface);
|
Compartment *This = impl_from_ITfSource(iface);
|
||||||
CompartmentSink *sink;
|
|
||||||
|
|
||||||
TRACE("(%p) %x\n",This,pdwCookie);
|
TRACE("(%p) %x\n",This,pdwCookie);
|
||||||
|
|
||||||
if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK)
|
if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
sink = remove_Cookie(pdwCookie);
|
return unadvise_sink(pdwCookie);
|
||||||
if (!sink)
|
|
||||||
return CONNECT_E_NOCONNECTION;
|
|
||||||
|
|
||||||
list_remove(&sink->entry);
|
|
||||||
free_sink(sink);
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const ITfSourceVtbl CompartmentSourceVtbl =
|
static const ITfSourceVtbl CompartmentSourceVtbl =
|
||||||
|
|
|
@ -72,6 +72,7 @@ typedef struct {
|
||||||
union {
|
union {
|
||||||
IUnknown *pIUnknown;
|
IUnknown *pIUnknown;
|
||||||
ITfThreadMgrEventSink *pITfThreadMgrEventSink;
|
ITfThreadMgrEventSink *pITfThreadMgrEventSink;
|
||||||
|
ITfCompartmentEventSink *pITfCompartmentEventSink;
|
||||||
} interfaces;
|
} interfaces;
|
||||||
} Sink;
|
} Sink;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue