Jacek Caban : msctf: Added document manager' s AdviseSink and UnadviseSink implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 5 10:29:33 CDT 2016
Module: wine
Branch: master
Commit: a9d4b0344b90e090a3a533082b50c7a398994ec9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d4b0344b90e090a3a533082b50c7a398994ec9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed May 4 19:42:19 2016 +0200
msctf: Added document manager's AdviseSink and UnadviseSink implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msctf/documentmgr.c | 28 +++++++++++++++++++++++++---
dlls/msctf/msctf_internal.h | 2 ++
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c
index d9ba057..cf4c601 100644
--- a/dlls/msctf/documentmgr.c
+++ b/dlls/msctf/documentmgr.c
@@ -50,6 +50,8 @@ typedef struct tagDocumentMgr {
ITfContext* contextStack[2]; /* limit of 2 contexts */
ITfThreadMgrEventSink* ThreadMgrSink;
+
+ struct list TransitoryExtensionSink;
} DocumentMgr;
typedef struct tagEnumTfContext {
@@ -89,6 +91,7 @@ static void DocumentMgr_Destructor(DocumentMgr *This)
ITfContext_Release(This->contextStack[0]);
if (This->contextStack[1])
ITfContext_Release(This->contextStack[1]);
+ free_sinks(&This->TransitoryExtensionSink);
CompartmentMgr_Destructor(This->CompartmentMgr);
HeapFree(GetProcessHeap(),0,This);
}
@@ -298,15 +301,33 @@ static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface,
REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{
DocumentMgr *This = impl_from_ITfSource(iface);
- FIXME("STUB:(%p)\n",This);
+
+ TRACE("(%p) %s %p %p\n", This, debugstr_guid(riid), punk, pdwCookie);
+
+ if (!riid || !punk || !pdwCookie)
+ return E_INVALIDARG;
+
+ if (IsEqualIID(riid, &IID_ITfTransitoryExtensionSink))
+ {
+ WARN("semi-stub for ITfTransitoryExtensionSink: callback won't be used.\n");
+ return advise_sink(&This->TransitoryExtensionSink, &IID_ITfTransitoryExtensionSink,
+ COOKIE_MAGIC_DMSINK, punk, pdwCookie);
+ }
+
+ FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));
return E_NOTIMPL;
}
static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{
DocumentMgr *This = impl_from_ITfSource(iface);
- FIXME("STUB:(%p)\n",This);
- return E_NOTIMPL;
+
+ TRACE("(%p) %x\n",This,pdwCookie);
+
+ if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_DMSINK)
+ return E_INVALIDARG;
+
+ return unadvise_sink(pdwCookie);
}
static const ITfSourceVtbl DocumentMgrSourceVtbl =
@@ -330,6 +351,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen
This->ITfSource_iface.lpVtbl = &DocumentMgrSourceVtbl;
This->refCount = 1;
This->ThreadMgrSink = ThreadMgrSink;
+ list_init(&This->TransitoryExtensionSink);
CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr);
diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h
index 181c4fd..ed42b54 100644
--- a/dlls/msctf/msctf_internal.h
+++ b/dlls/msctf/msctf_internal.h
@@ -29,6 +29,7 @@
#define COOKIE_MAGIC_IPPSINK 0x0040
#define COOKIE_MAGIC_EDITCOOKIE 0x0050
#define COOKIE_MAGIC_COMPARTMENTSINK 0x0060
+#define COOKIE_MAGIC_DMSINK 0x0070
extern DWORD tlsIndex DECLSPEC_HIDDEN;
extern TfClientId processId DECLSPEC_HIDDEN;
@@ -75,6 +76,7 @@ typedef struct {
ITfCompartmentEventSink *pITfCompartmentEventSink;
ITfTextEditSink *pITfTextEditSink;
ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink;
+ ITfTransitoryExtensionSink *pITfTransitoryExtensionSink;
} interfaces;
} Sink;
More information about the wine-cvs
mailing list