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

Jacek Caban : msctf: Use generic sink type for thread manager sinks.
by Alexandre Julliard May 5, 2016

May 5, 2016

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: 2fff4d0343842d9e9efc8e61f6e9021f1d73e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff4d0343842d9e9efc8e61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 4 22:23:45 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index f6968af..a78a280 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-14 19:13+0300\n" +"PO-Revision-Date: 2016-05-04 22:10+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11650,7 +11650,7 @@ msgstr "reg: не удалось завершить операцию. Произ #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Поиск завершён. Найдено совпадений: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Andrew Eikum : winmm: Restrict some MCI actions to the creating thread.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: d7cc002566e375ccea62777befe3a67554ad6c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7cc002566e375ccea62777be… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 4 12:42:53 2016 -0500 winmm: Restrict some MCI actions to the creating thread. This reverts commit 46d5973961fe2266074ac2855368c3fcf987c1b5 and fixes bug 38241 another way. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 199 +++++++++++------------------------------ dlls/mciqtz32/mciqtz_private.h | 13 --- dlls/winmm/mci.c | 6 ++ dlls/winmm/tests/mci.c | 41 +++++++++ 4 files changed, 97 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7cc002566e375ccea627…

1 0

Ken Thomases : winemac: Use floor() rather than truncation when converting Cocoa event positions to integers.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: 3d73f62f0161af7e34b90bae9dba6613e72d9880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73f62f0161af7e34b90bae9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 4 10:11:04 2016 -0500 winemac: Use floor() rather than truncation when converting Cocoa event positions to integers. This is so negative coordinates are adjusted in the same direction as positive ones (left and up). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 12 ++++++------ dlls/winemac.drv/cocoa_window.m | 8 ++++---- dlls/winemac.drv/mouse.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 176d35c..97d13e2 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1592,8 +1592,8 @@ static NSString* WineLocalizedString(unsigned int stringID) [self clipCursorLocation:&point]; event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); - event->mouse_moved.x = point.x; - event->mouse_moved.y = point.y; + event->mouse_moved.x = floor(point.x); + event->mouse_moved.y = floor(point.y); mouseMoveDeltaX = 0; mouseMoveDeltaY = 0; @@ -1733,8 +1733,8 @@ static NSString* WineLocalizedString(unsigned int stringID) event = macdrv_create_event(MOUSE_BUTTON, window); event->mouse_button.button = [theEvent buttonNumber]; event->mouse_button.pressed = pressed; - event->mouse_button.x = pt.x; - event->mouse_button.y = pt.y; + event->mouse_button.x = floor(pt.x); + event->mouse_button.y = floor(pt.y); event->mouse_button.time_ms = [self ticksForEventTime:[theEvent timestamp]]; [window.queue postEvent:event]; @@ -1812,8 +1812,8 @@ static NSString* WineLocalizedString(unsigned int stringID) BOOL continuous = FALSE; event = macdrv_create_event(MOUSE_SCROLL, window); - event->mouse_scroll.x = pt.x; - event->mouse_scroll.y = pt.y; + event->mouse_scroll.x = floor(pt.x); + event->mouse_scroll.y = floor(pt.y); event->mouse_scroll.time_ms = [self ticksForEventTime:[theEvent timestamp]]; if (CGEventGetIntegerValueField(cgevent, kCGScrollWheelEventIsContinuous)) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3012118..1b0b655 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2630,8 +2630,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_query* query = macdrv_create_query(); query->type = QUERY_DRAG_OPERATION; query->window = (macdrv_window)[self retain]; - query->drag_operation.x = pt.x; - query->drag_operation.y = pt.y; + query->drag_operation.x = floor(pt.x); + query->drag_operation.y = floor(pt.y); query->drag_operation.offered_ops = [sender draggingSourceOperationMask]; query->drag_operation.accepted_op = NSDragOperationNone; query->drag_operation.pasteboard = (CFTypeRef)[pb retain]; @@ -2652,8 +2652,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_query* query = macdrv_create_query(); query->type = QUERY_DRAG_DROP; query->window = (macdrv_window)[self retain]; - query->drag_drop.x = pt.x; - query->drag_drop.y = pt.y; + query->drag_drop.x = floor(pt.x); + query->drag_drop.y = floor(pt.y); query->drag_drop.op = [sender draggingSourceOperationMask]; query->drag_drop.pasteboard = (CFTypeRef)[pb retain]; diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index f9130c0..f25b06d 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -697,8 +697,8 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) if (ret) { TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); - pos->x = pt.x; - pos->y = pt.y; + pos->x = floor(pt.x); + pos->y = floor(pt.y); } return ret; }

1 0

Alistair Leslie-Hughes : inetcomm: Improve IMimeMessage SetOption.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: dcb659f03228fa9364cdcccda5a5ca0f6e17369d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb659f03228fa9364cdcccda… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 09:17:36 2016 +0000 inetcomm: Improve IMimeMessage SetOption. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++++---- dlls/inetcomm/tests/mimeole.c | 13 ++++++++++--- include/mimeole.idl | 4 ++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 96eab81..c653555 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2305,27 +2305,35 @@ static HRESULT WINAPI MimeMessage_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - HRESULT hr = E_NOTIMPL; + HRESULT hr = S_OK; TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + /* Message ID is checked before type. + * OID 0x4D -> 0x56 and 0x58 aren't defined but will filtered out later. + */ + if(TYPEDID_ID(oid) < TYPEDID_ID(OID_ALLOW_8BIT_HEADER) || TYPEDID_ID(oid) > TYPEDID_ID(OID_SECURITY_2KEY_CERT_BAG_64)) + { + WARN("oid (%08x) out of range\n", oid); + return MIME_E_INVALID_OPTION_ID; + } + if(pValue->vt != TYPEDID_TYPE(oid)) { WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); - return E_INVALIDARG; + return S_OK; } switch(oid) { case OID_HIDE_TNEF_ATTACHMENTS: FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->u.boolVal); - hr = S_OK; break; case OID_SHOW_MACBINARY: FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); - hr = S_OK; break; default: FIXME("Unhandled oid %08x\n", oid); + hr = MIME_E_INVALID_OPTION_ID; } return hr; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 498bbb7..f0fac08 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -412,7 +412,7 @@ static void test_MessageOptions(void) prop.u.pszVal = CoTaskMemAlloc(strlen(string)+1); strcpy(prop.u.pszVal, string); hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); - todo_wine ok(hr == S_OK, "ret %08x\n", hr); + ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); @@ -426,7 +426,7 @@ static void test_MessageOptions(void) prop.u.pszVal = CoTaskMemAlloc(strlen(zero)+1); strcpy(prop.u.pszVal, zero); hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); - todo_wine ok(hr == S_OK, "ret %08x\n", hr); + ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); @@ -439,7 +439,14 @@ static void test_MessageOptions(void) prop.vt = VT_BOOL; prop.u.boolVal = TRUE; hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); - todo_wine ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + PropVariantClear(&prop); + + /* Out of range before type. */ + prop.vt = VT_I4; + prop.u.lVal = 1; + hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); + ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); PropVariantClear(&prop); IMimeMessage_Release(msg); diff --git a/include/mimeole.idl b/include/mimeole.idl index 5990c29..4a0d86c 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -153,6 +153,7 @@ cpp_quote(" PID_ATT_ACCOUNTNAME = 78,") cpp_quote(" PID_LAST = 79,") cpp_quote("} MIMEPROPID;") +cpp_quote("#define TYPEDID_ID(_typedid) (((ULONG)(_typedid))>>16)") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") @@ -177,6 +178,9 @@ cpp_quote("#define OID_CAN_INLINE_TEXT_BODIES (0x00380000 | VT_BOOL)") cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") cpp_quote("#define OID_SAVEBODY_KEEPBOUNDARY (0x00400000 | VT_BOOL)") +cpp_quote("#define OID_SECURITY_2KEY_CERT_BAG (0x00590000 | VT_VECTOR | VT_UI4)") +cpp_quote("#define OID_SECURITY_2KEY_CERT_BAG_64 (0x00590000 | VT_VECTOR | VT_UI8)") + [ uuid(e4b28371-83b0-11d0-8259-00c04fd85ab4), version(1.0)

1 0

Jacek Caban : msctf: Added document manager' s AdviseSink and UnadviseSink implementation.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: a9d4b0344b90e090a3a533082b50c7a398994ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d4b0344b90e090a3a533082… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Jacek Caban : msctf: Use generic sinks in InputProcessorProfiles object.
by Alexandre Julliard May 5, 2016

May 5, 2016

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

Daniel Lehman : ntdll: Remove stub from trace.
by Alexandre Julliard May 5, 2016

May 5, 2016

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: Added a helper macro for interating sink list.
by Alexandre Julliard May 5, 2016

May 5, 2016

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: Moved thread manager' s UnadviseSink implementation into a more generic helper.
by Alexandre Julliard May 5, 2016

May 5, 2016

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