May 2016 - Wine-commits - list.winehq.org

Daniel Lehman : ntdll: Remove stub from trace.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 4c89d567f6d9705b528bd9905399ee0b71a475a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c89d567f6d9705b528bd9905… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 4 20:33:07 2016 -0700 ntdll: Remove stub from trace. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 74f7779..bef85a8 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -856,7 +856,7 @@ NTSTATUS WINAPI NtSetTimer(IN HANDLE handle, { NTSTATUS status = STATUS_SUCCESS; - TRACE("(%p,%p,%p,%p,%08x,0x%08x,%p) stub\n", + TRACE("(%p,%p,%p,%p,%08x,0x%08x,%p)\n", handle, when, callback, callback_arg, resume, period, state); SERVER_START_REQ( set_timer )

1 0

Jacek Caban : msctf.idl: Added ITfTransitoryExtensionSink declaration.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 8f91f7403e24952e40c72d2e36fbc05374f55c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f91f7403e24952e40c72d2e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:40:18 2016 +0200 msctf.idl: Added ITfTransitoryExtensionSink declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msctf.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index 62dc0d6..0b96faa 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1845,3 +1845,19 @@ interface ITfMouseTrackerACP : IUnknown HRESULT UnadviseMouseSink([in] DWORD dwCookie); } + +[ + object, + local, + uuid(a615096f-1c57-4813-8a15-55ee6e5a839c), + pointer_default(unique) +] +interface ITfTransitoryExtensionSink : IUnknown +{ + HRESULT OnTransitoryExtensionUpdated( + [in] ITfContext *pic, + [in] TfEditCookie ecReadOnly, + [in] ITfRange *pResultRange, + [in] ITfRange *pCompositionRange, + [out] BOOL *pfDeleteResultRange); +}

1 0

Jacek Caban : msctf: Use generic sink type for thread manager sinks.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 0b912fecf6e9b6fcf022d0533952ce42d9841add URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b912fecf6e9b6fcf022d0533… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:40:29 2016 +0200 msctf: Use generic sink type for thread manager sinks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/compartmentmgr.c | 1 - dlls/msctf/context.c | 1 - dlls/msctf/inputprocessor.c | 1 - dlls/msctf/msctf.c | 1 - dlls/msctf/msctf_internal.h | 10 ++++++++++ dlls/msctf/threadmgr.c | 45 +++++++++++++++------------------------------ 6 files changed, 25 insertions(+), 34 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 8182679..c39f194 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -36,7 +36,6 @@ #include "olectl.h" #include "wine/unicode.h" -#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5a45466..fd23c2a 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -35,7 +35,6 @@ #include "olectl.h" #include "wine/unicode.h" -#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 01af325..08e51fd 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -35,7 +35,6 @@ #include "olectl.h" #include "wine/unicode.h" -#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index a5cfc35..83eaab9 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -26,7 +26,6 @@ #define COBJMACROS #include "wine/debug.h" -#include "wine/list.h" #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 06244ea..8923c60 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -21,6 +21,8 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H +#include "wine/list.h" + #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 #define COOKIE_MAGIC_GUIDATOM 0x0030 @@ -65,6 +67,14 @@ extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN; extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN; +typedef struct { + struct list entry; + union { + IUnknown *pIUnknown; + ITfThreadMgrEventSink *pITfThreadMgrEventSink; + } interfaces; +} Sink; + extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index ac47545..44e8c87 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -35,27 +35,12 @@ #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 { - /* ThreadMgr Sinks */ - IUnknown *pIUnknown; - /* ITfActiveLanguageProfileNotifySink *pITfActiveLanguageProfileNotifySink; */ - /* ITfDisplayAttributeNotifySink *pITfDisplayAttributeNotifySink; */ - /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ - /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ - /* ITfThreadFocusSink *pITfThreadFocusSink; */ - ITfThreadMgrEventSink *pITfThreadMgrEventSink; - } interfaces; -} ThreadMgrSink; - typedef struct tagPreservedKey { struct list entry; @@ -172,7 +157,7 @@ static inline EnumTfDocumentMgr *impl_from_IEnumTfDocumentMgrs(IEnumTfDocumentMg return CONTAINING_RECORD(iface, EnumTfDocumentMgr, IEnumTfDocumentMgrs_iface); } -static void free_sink(ThreadMgrSink *sink) +static void free_sink(Sink *sink) { IUnknown_Release(sink->interfaces.pIUnknown); HeapFree(GetProcessHeap(),0,sink); @@ -194,37 +179,37 @@ static void ThreadMgr_Destructor(ThreadMgr *This) /* free sinks */ LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); list_remove(cursor); free_sink(sink); } @@ -658,7 +643,7 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - ThreadMgrSink *tms; + Sink *tms; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -667,7 +652,7 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) { - tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); + tms = HeapAlloc(GetProcessHeap(),0,sizeof(*tms)); if (!tms) return E_OUTOFMEMORY; if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) @@ -692,7 +677,7 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - ThreadMgrSink *sink; + Sink *sink; TRACE("(%p) %x\n",This,pdwCookie); @@ -1164,7 +1149,7 @@ static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); ITfThreadMgrEventSink_OnInitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); } @@ -1181,7 +1166,7 @@ static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); ITfThreadMgrEventSink_OnUninitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); } @@ -1199,7 +1184,7 @@ static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); ITfThreadMgrEventSink_OnSetFocus(sink->interfaces.pITfThreadMgrEventSink, pdimFocus, pdimPrevFocus); } @@ -1216,7 +1201,7 @@ static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); ITfThreadMgrEventSink_OnPushContext(sink->interfaces.pITfThreadMgrEventSink,pic); } @@ -1233,7 +1218,7 @@ static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + Sink* sink = LIST_ENTRY(cursor,Sink,entry); ITfThreadMgrEventSink_OnPopContext(sink->interfaces.pITfThreadMgrEventSink,pic); }

1 0

Jacek Caban : msctf: Moved thread manager' s AdviseSink implementation into a more generic helper.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: c0efd074b2fc9bec2a520d8a80bdbd74c8d562dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0efd074b2fc9bec2a520d8a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:40:47 2016 +0200 msctf: Moved thread manager's AdviseSink implementation into a more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 21 +++++++++++++++++++++ dlls/msctf/msctf_internal.h | 2 ++ dlls/msctf/threadmgr.c | 24 +++--------------------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 83eaab9..23845d4 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -32,6 +32,7 @@ #include "shlwapi.h" #include "shlguid.h" #include "comcat.h" +#include "olectl.h" #include "rpcproxy.h" #include "msctf.h" #include "inputscope.h" @@ -283,6 +284,26 @@ DWORD enumerate_Cookie(DWORD magic, DWORD *index) return 0x0; } +HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) +{ + Sink *sink; + + sink = HeapAlloc(GetProcessHeap(), 0, sizeof(*sink)); + if (!sink) + return E_OUTOFMEMORY; + + if (FAILED(IUnknown_QueryInterface(unk, riid, (void**)&sink->interfaces.pIUnknown))) + { + HeapFree(GetProcessHeap(), 0, sink); + return CONNECT_E_CANNOTCONNECT; + } + + list_add_head(sink_list, &sink->entry); + *cookie = generate_Cookie(cookie_magic, sink); + TRACE("cookie %x\n", *cookie); + return S_OK; +} + /***************************************************************************** * Active Text Service Management *****************************************************************************/ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 8923c60..1f7e7df 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -75,6 +75,8 @@ typedef struct { } interfaces; } Sink; +HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; + extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 44e8c87..c6a227c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -643,7 +643,6 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - Sink *tms; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -651,27 +650,10 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) - { - tms = HeapAlloc(GetProcessHeap(),0,sizeof(*tms)); - if (!tms) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) - { - HeapFree(GetProcessHeap(),0,tms); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->ThreadMgrEventSink,&tms->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_TMSINK, tms); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); + return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); - return S_OK; + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)

1 0

Jacek Caban : msctf: Moved thread manager' s UnadviseSink implementation into a more generic helper.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 0374ee290d25f85abb06aa40f4d61950c44e98a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0374ee290d25f85abb06aa40f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:40:59 2016 +0200 msctf: Moved thread manager's UnadviseSink implementation into a more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 19 +++++++++++++++++++ dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 10 +--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 23845d4..81f01dc 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -304,6 +304,25 @@ HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUn return S_OK; } +static void free_sink(Sink *sink) +{ + list_remove(&sink->entry); + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(), 0, sink); +} + +HRESULT unadvise_sink(DWORD cookie) +{ + Sink *sink; + + sink = remove_Cookie(cookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + + free_sink(sink); + return S_OK; +} + /***************************************************************************** * Active Text Service Management *****************************************************************************/ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 1f7e7df..fc41de5 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -76,6 +76,7 @@ typedef struct { } Sink; HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; +HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN; extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index c6a227c..bface5d 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -659,21 +659,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - Sink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl ThreadMgrSourceVtbl =

1 0

Jacek Caban : msctf: Moved thread manager' s sink list destructor implementation into a more generic helper.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: a27da35b0540bd6a45adb27c880d89c16b8df2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27da35b0540bd6a45adb27c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:41:13 2016 +0200 msctf: Moved thread manager's sink list destructor implementation into a more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 49 ++++++--------------------------------------- 3 files changed, 16 insertions(+), 43 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 81f01dc..a47f16c 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -323,6 +323,15 @@ HRESULT unadvise_sink(DWORD cookie) return S_OK; } +void free_sinks(struct list *sink_list) +{ + while(!list_empty(sink_list)) + { + Sink* sink = LIST_ENTRY(sink_list->next, Sink, entry); + free_sink(sink); + } +} + /***************************************************************************** * Active Text Service Management *****************************************************************************/ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index fc41de5..e4da480 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -77,6 +77,7 @@ typedef struct { HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN; +void free_sinks(struct list *sink_list) DECLSPEC_HIDDEN; extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index bface5d..62508b9 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -157,12 +157,6 @@ static inline EnumTfDocumentMgr *impl_from_IEnumTfDocumentMgrs(IEnumTfDocumentMg return CONTAINING_RECORD(iface, EnumTfDocumentMgr, IEnumTfDocumentMgrs_iface); } -static void free_sink(Sink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void ThreadMgr_Destructor(ThreadMgr *This) { struct list *cursor, *cursor2; @@ -176,43 +170,12 @@ static void ThreadMgr_Destructor(ThreadMgr *This) if (This->focus) ITfDocumentMgr_Release(This->focus); - /* free sinks */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) - { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->ActiveLanguageProfileNotifySink); + free_sinks(&This->DisplayAttributeNotifySink); + free_sinks(&This->KeyTraceEventSink); + free_sinks(&This->PreservedKeyNotifySink); + free_sinks(&This->ThreadFocusSink); + free_sinks(&This->ThreadMgrEventSink); LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) {

1 0

Jacek Caban : msctf: Added a helper macro for interating sink list.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 7c1c94c25848e569dc106f2cd65377040bbc4074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1c94c25848e569dc106f2cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:41:29 2016 +0200 msctf: Added a helper macro for interating sink list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 6 ++++++ dlls/msctf/threadmgr.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index e4da480..3467f1c 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -75,6 +75,12 @@ typedef struct { } interfaces; } Sink; +#define SINK_ENTRY(cursor,type) (LIST_ENTRY(cursor,Sink,entry)->interfaces.p##type) +#define SINK_FOR_EACH(cursor,list,type,elem) \ + for ((cursor) = (list)->next, elem = SINK_ENTRY(cursor,type); \ + (cursor) != (list); \ + (cursor) = (cursor)->next, elem = SINK_ENTRY(cursor,type)) + HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN; void free_sinks(struct list *sink_list) DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 62508b9..e645619 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1079,15 +1079,15 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) { - struct list *cursor; ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; + struct list *cursor; TRACE("(%p) %p\n",This,pdim); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - ITfThreadMgrEventSink_OnInitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + ITfThreadMgrEventSink_OnInitDocumentMgr(sink, pdim); } return S_OK; @@ -1096,15 +1096,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { - struct list *cursor; ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; + struct list *cursor; TRACE("(%p) %p\n",This,pdim); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - ITfThreadMgrEventSink_OnUninitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + ITfThreadMgrEventSink_OnUninitDocumentMgr(sink, pdim); } return S_OK; @@ -1114,15 +1114,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { - struct list *cursor; ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; + struct list *cursor; TRACE("(%p) %p %p\n",This,pdimFocus, pdimPrevFocus); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - ITfThreadMgrEventSink_OnSetFocus(sink->interfaces.pITfThreadMgrEventSink, pdimFocus, pdimPrevFocus); + ITfThreadMgrEventSink_OnSetFocus(sink, pdimFocus, pdimPrevFocus); } return S_OK; @@ -1131,15 +1131,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { - struct list *cursor; ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; + struct list *cursor; TRACE("(%p) %p\n",This,pic); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - ITfThreadMgrEventSink_OnPushContext(sink->interfaces.pITfThreadMgrEventSink,pic); + ITfThreadMgrEventSink_OnPushContext(sink, pic); } return S_OK; @@ -1148,15 +1148,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { - struct list *cursor; ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; + struct list *cursor; TRACE("(%p) %p\n",This,pic); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) { - Sink* sink = LIST_ENTRY(cursor,Sink,entry); - ITfThreadMgrEventSink_OnPopContext(sink->interfaces.pITfThreadMgrEventSink,pic); + ITfThreadMgrEventSink_OnPopContext(sink, pic); } return S_OK;

1 0

Jacek Caban : msctf: Use generic sinks in Compartment object.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 40cdfd2a6a8ac050bb2ad3cbc8bf25eecb6f8423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cdfd2a6a8ac050bb2ad3cbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:41:41 2016 +0200 msctf: Use generic sinks in Compartment object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/compartmentmgr.c | 64 +++++++-------------------------------------- dlls/msctf/msctf_internal.h | 1 + 2 files changed, 10 insertions(+), 55 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index c39f194..4fe7b82 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -66,15 +66,6 @@ typedef struct tagCompartmentEnumGuid { struct list *cursor; } CompartmentEnumGuid; - -typedef struct tagCompartmentSink { - struct list entry; - union { - IUnknown *pIUnknown; - ITfCompartmentEventSink *pITfCompartmentEventSink; - } interfaces; -} CompartmentSink; - typedef struct tagCompartment { ITfCompartment ITfCompartment_iface; ITfSource ITfSource_iface; @@ -443,23 +434,11 @@ static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID ** /************************************************** * ITfCompartment **************************************************/ -static void free_sink(CompartmentSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void Compartment_Destructor(Compartment *This) { - struct list *cursor, *cursor2; TRACE("destroying %p\n", This); VariantClear(&This->variant); - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CompartmentEventSink) - { - CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->CompartmentEventSink); HeapFree(GetProcessHeap(),0,This); } @@ -509,6 +488,7 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, TfClientId tid, const VARIANT *pvarValue) { Compartment *This = impl_from_ITfCompartment(iface); + ITfCompartmentEventSink *sink; struct list *cursor; 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) 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->interfaces.pITfCompartmentEventSink,&This->valueData->guid); + ITfCompartmentEventSink_OnChange(sink, &This->valueData->guid); } return S_OK; @@ -592,7 +571,6 @@ static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { Compartment *This = impl_from_ITfSource(iface); - CompartmentSink *cs; 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; if (IsEqualIID(riid, &IID_ITfCompartmentEventSink)) - { - cs = HeapAlloc(GetProcessHeap(),0,sizeof(CompartmentSink)); - 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; - } + return advise_sink(&This->CompartmentEventSink, &IID_ITfCompartmentEventSink, + COOKIE_MAGIC_COMPARTMENTSINK, punk, pdwCookie); - TRACE("cookie %x\n",*pdwCookie); - - return S_OK; + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { Compartment *This = impl_from_ITfSource(iface); - CompartmentSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl CompartmentSourceVtbl = diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 3467f1c..740d68a 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -72,6 +72,7 @@ typedef struct { union { IUnknown *pIUnknown; ITfThreadMgrEventSink *pITfThreadMgrEventSink; + ITfCompartmentEventSink *pITfCompartmentEventSink; } interfaces; } Sink;

1 0

Jacek Caban : msctf: Use generic sinks in Context object.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: c80a96504ee46a4e2d47065c23aa0abfc6db107a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80a96504ee46a4e2d47065c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:41:52 2016 +0200 msctf: Use generic sinks in Context object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 96 ++++++--------------------------------------- dlls/msctf/msctf_internal.h | 1 + 2 files changed, 14 insertions(+), 83 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index fd23c2a..597706e 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -41,19 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); -typedef struct tagContextSink { - struct list entry; - union { - /* Context Sinks */ - IUnknown *pIUnknown; - /* ITfContextKeyEventSink *pITfContextKeyEventSink; */ - /* ITfEditTransactionSink *pITfEditTransactionSink; */ - /* ITfStatusSink *pITfStatusSink; */ - ITfTextEditSink *pITfTextEditSink; - /* ITfTextLayoutSink *pITfTextLayoutSink; */ - } interfaces; -} ContextSink; - typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; @@ -126,15 +113,8 @@ static inline Context *impl_from_ITextStoreACPServices(ITextStoreACPServices *if return CONTAINING_RECORD(iface, Context, ITextStoreACPServices_iface); } -static void free_sink(ContextSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void Context_Destructor(Context *This) { - struct list *cursor, *cursor2; EditCookie *cookie; TRACE("destroying %p\n", This); @@ -154,36 +134,11 @@ static void Context_Destructor(Context *This) This->defaultCookie = 0; } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pEditTransactionSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pStatusSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextEditSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextLayoutSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->pContextKeyEventSink); + free_sinks(&This->pEditTransactionSink); + free_sinks(&This->pStatusSink); + free_sinks(&This->pTextEditSink); + free_sinks(&This->pTextLayoutSink); CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); @@ -603,53 +558,29 @@ static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { Context *This = impl_from_ITfSource(iface); - ContextSink *es; + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); if (!riid || !punk || !pdwCookie) return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfTextEditSink)) - { - es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); - if (!es) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&es->interfaces.pITfTextEditSink))) - { - HeapFree(GetProcessHeap(),0,es); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->pTextEditSink ,&es->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_CONTEXTSINK, es); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } + return advise_sink(&This->pTextEditSink, &IID_ITfTextEditSink, COOKIE_MAGIC_CONTEXTSINK, punk, pdwCookie); - TRACE("cookie %x\n",*pdwCookie); - return S_OK; + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { Context *This = impl_from_ITfSource(iface); - ContextSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl ContextSourceVtbl = @@ -914,6 +845,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, if ((dwLockFlags&TS_LF_READWRITE) == TS_LF_READWRITE) { + ITfTextEditSink *sink; TfEditCookie sc; sinkcookie->lockType = TS_LF_READ; @@ -921,11 +853,9 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, sc = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, sinkcookie); /*TODO: implement ITfEditRecord */ - LIST_FOR_EACH(cursor, &This->pTextEditSink) + SINK_FOR_EACH(cursor, &This->pTextEditSink, ITfTextEditSink, sink) { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - ITfTextEditSink_OnEndEdit(sink->interfaces.pITfTextEditSink, - (ITfContext*) &This->ITfContext_iface, sc, NULL); + ITfTextEditSink_OnEndEdit(sink, (ITfContext*) &This->ITfContext_iface, sc, NULL); } sinkcookie = remove_Cookie(sc); } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 740d68a..f272465 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -73,6 +73,7 @@ typedef struct { IUnknown *pIUnknown; ITfThreadMgrEventSink *pITfThreadMgrEventSink; ITfCompartmentEventSink *pITfCompartmentEventSink; + ITfTextEditSink *pITfTextEditSink; } interfaces; } Sink;

1 0

Jacek Caban : msctf: Use generic sinks in InputProcessorProfiles object.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 361f0690f62ad57c576673211fc4f5af4ccbdbec URL: http://source.winehq.org/git/wine.git/?a=commit;h=361f0690f62ad57c576673211… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:42:07 2016 +0200 msctf: Use generic sinks in InputProcessorProfiles object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/inputprocessor.c | 68 +++++++-------------------------------------- dlls/msctf/msctf_internal.h | 1 + 2 files changed, 11 insertions(+), 58 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 08e51fd..0e8ad22 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -51,15 +51,6 @@ static const WCHAR szwDefault[] = {'D','e','f','a','u','l','t',0}; static const WCHAR szwProfile[] = {'P','r','o','f','i','l','e',0}; static const WCHAR szwDefaultFmt[] = {'%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; -typedef struct tagInputProcessorProfilesSink { - struct list entry; - union { - /* InputProcessorProfile Sinks */ - IUnknown *pIUnknown; - ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; - } interfaces; -} InputProcessorProfilesSink; - typedef struct tagInputProcessorProfiles { ITfInputProcessorProfiles ITfInputProcessorProfiles_iface; ITfSource ITfSource_iface; @@ -217,25 +208,11 @@ static inline EnumTfLanguageProfiles *impl_from_IEnumTfLanguageProfiles(IEnumTfL return CONTAINING_RECORD(iface, EnumTfLanguageProfiles, IEnumTfLanguageProfiles_iface); } -static void free_sink(InputProcessorProfilesSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) { - struct list *cursor, *cursor2; TRACE("destroying %p\n", This); - /* free sinks */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->LanguageProfileNotifySink) - { - InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); - list_remove(cursor); - free_sink(sink); - } - + free_sinks(&This->LanguageProfileNotifySink); HeapFree(GetProcessHeap(),0,This); } @@ -605,18 +582,18 @@ static HRESULT WINAPI InputProcessorProfiles_ChangeCurrentLanguage( ITfInputProcessorProfiles *iface, LANGID langid) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); + ITfLanguageProfileNotifySink *sink; struct list *cursor; BOOL accept; FIXME("STUB:(%p)\n",This); - LIST_FOR_EACH(cursor, &This->LanguageProfileNotifySink) + SINK_FOR_EACH(cursor, &This->LanguageProfileNotifySink, ITfLanguageProfileNotifySink, sink) { - InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); accept = TRUE; - ITfLanguageProfileNotifySink_OnLanguageChange(sink->interfaces.pITfLanguageProfileNotifySink, langid, &accept); + ITfLanguageProfileNotifySink_OnLanguageChange(sink, langid, &accept); if (!accept) - return E_FAIL; + return E_FAIL; } /* TODO: On successful language change call OnLanguageChanged sink */ @@ -928,7 +905,6 @@ static HRESULT WINAPI IPPSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { InputProcessorProfiles *This = impl_from_ITfSource(iface); - InputProcessorProfilesSink *ipps; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -936,47 +912,23 @@ static HRESULT WINAPI IPPSource_AdviseSink(ITfSource *iface, return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfLanguageProfileNotifySink)) - { - ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); - if (!ipps) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&ipps->interfaces.pITfLanguageProfileNotifySink))) - { - HeapFree(GetProcessHeap(),0,ipps); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->LanguageProfileNotifySink,&ipps->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_IPPSINK, ipps); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); + return advise_sink(&This->LanguageProfileNotifySink, &IID_ITfLanguageProfileNotifySink, + COOKIE_MAGIC_IPPSINK, punk, pdwCookie); - return S_OK; + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { InputProcessorProfiles *This = impl_from_ITfSource(iface); - InputProcessorProfilesSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl InputProcessorProfilesSourceVtbl = diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index f272465..181c4fd 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -74,6 +74,7 @@ typedef struct { ITfThreadMgrEventSink *pITfThreadMgrEventSink; ITfCompartmentEventSink *pITfCompartmentEventSink; ITfTextEditSink *pITfTextEditSink; + ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; } interfaces; } Sink;

1 0