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

Nikolay Sivov : dwrite: Implement IDWriteFontFamily1::GetFontFaceReference ().
by Alexandre Julliard May 6, 2016

May 6, 2016

Module: wine Branch: master Commit: c5259f72e3a385e95f26dc1ad9ddcc5fd6a21408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5259f72e3a385e95f26dc1ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 00:34:03 2016 +0300 dwrite: Implement IDWriteFontFamily1::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 17 ++++++++++++++--- dlls/dwrite/tests/font.c | 12 ++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bf79412..e68da0d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1994,13 +1994,24 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily1 *iface, UINT3 } static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily1 *iface, UINT32 index, - IDWriteFontFaceReference **ref) + IDWriteFontFaceReference **reference) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); + IDWriteFont3 *font; + HRESULT hr; - FIXME("(%p)->(%u %p): stub\n", This, index, ref); + TRACE("(%p)->(%u %p)\n", This, index, reference); - return E_NOTIMPL; + *reference = NULL; + + hr = IDWriteFontFamily1_GetFont(iface, index, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont3_GetFontFaceReference(font, reference); + IDWriteFont3_Release(font); + + return hr; } static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index baef637..aa57d81 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1265,6 +1265,7 @@ if (0) /* crashes on native */ hr = IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily1, (void**)&family1); if (hr == S_OK) { + IDWriteFontFaceReference *ref, *ref1; IDWriteFontList *fontlist; IDWriteFont3 *font3; IDWriteFont1 *font1; @@ -1293,6 +1294,17 @@ if (0) /* crashes on native */ IDWriteFontList_Release(fontlist); IDWriteFont3_Release(font3); + + hr = IDWriteFontFamily1_GetFontFaceReference(family1, 0, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily1_GetFontFaceReference(family1, 0, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref != ref1, "got %p, %p\n", ref, ref1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + IDWriteFontFamily1_Release(family1); } else

1 0

Nikolay Sivov : dwrite/tests: A test for references returned from IDWriteFontFace3.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: ca99107daa82287305c92f5f952648f62393bdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca99107daa82287305c92f5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:22 2016 +0300 dwrite/tests: A test for references returned from IDWriteFontFace3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0ae3251..99572ed 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5956,6 +5956,30 @@ todo_wine IDWriteFontFaceReference_Release(ref); IDWriteFontFaceReference_Release(ref1); + + /* references returned from IDWriteFontFace3 */ + hr = IDWriteFont3_CreateFontFace(font3, &fontface); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref == ref1, "got %p, %p\n", ref1, ref); + + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + + IDWriteFontFace3_Release(fontface); +} IDWriteFont3_Release(font3); IDWriteFactory3_Release(factory3);

1 0

Nikolay Sivov : dwrite: Validate simulation flags and fail face/ reference creation.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: 890312ccfd0f54ece6bd330355183cc84a3a97ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=890312ccfd0f54ece6bd33035… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:24 2016 +0300 dwrite: Validate simulation flags and fail face/reference creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 6 ++++++ dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 3 +++ dlls/dwrite/tests/font.c | 13 ++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 05b73df..61409c8 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -111,6 +111,12 @@ static inline FLOAT get_scaled_advance_width(INT32 advance, FLOAT emSize, const return (FLOAT)advance * emSize / (FLOAT)metrics->designUnitsPerEm; } +static inline BOOL is_simulation_valid(DWRITE_FONT_SIMULATIONS simulations) +{ + return (simulations & ~(DWRITE_FONT_SIMULATIONS_NONE | DWRITE_FONT_SIMULATIONS_BOLD | + DWRITE_FONT_SIMULATIONS_OBLIQUE)) == 0; +} + struct gdiinterop { IDWriteGdiInterop1 IDWriteGdiInterop1_iface; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0edeebf..2aad837 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5568,6 +5568,9 @@ HRESULT create_fontfacereference(IDWriteFactory3 *factory, IDWriteFontFile *file *ret = NULL; + if (!is_simulation_valid(simulations)) + return E_INVALIDARG; + ref = heap_alloc(sizeof(*ref)); if (!ref) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0ecda11..7c9f085 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -839,6 +839,9 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory3 *iface, if (req_facetype != DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION && index) return E_INVALIDARG; + if (!is_simulation_valid(simulations)) + return E_INVALIDARG; + /* check actual file/face type */ is_supported = FALSE; face_type = DWRITE_FONT_FACE_TYPE_UNKNOWN; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index affdfda..5169f2a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1524,6 +1524,13 @@ if (0) /* crashes on native */ ok(face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %i\n", face_type); ok(count == 1, "got %i\n", count); + /* invalid simulation flags */ + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, ~0u, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, 0xf, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* try mismatching face type, the one that's not supported */ hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); @@ -5869,7 +5876,11 @@ static void test_CreateFontFaceReference(void) hr = IDWriteFactory3_CreateFontFaceReference(factory3, NULL, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - /* test file is not a collection, but reference could still be created */ + /* out of range simulation flags */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, ~0u, &ref); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* test file is not a collection, but reference could still be created with non-zero face index */ hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Fix reference equality condition.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: bda5f5700863c85b114233ccb212f41a49eed25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda5f5700863c85b114233ccb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:23 2016 +0300 dwrite: Fix reference equality condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- dlls/dwrite/tests/font.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a890250..0edeebf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5416,7 +5416,9 @@ static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDW if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) return FALSE; - ret = is_same_fontfile(This->file, file); + ret = is_same_fontfile(This->file, file) && + This->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && + This->simulations == IDWriteFontFaceReference_GetSimulations(ref); IDWriteFontFile_Release(file); return ret; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 99572ed..affdfda 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5853,6 +5853,7 @@ static void test_CreateFontFaceReference(void) UINT32 index; WCHAR *path; HRESULT hr; + BOOL ret; factory = create_factory(); @@ -5923,7 +5924,23 @@ todo_wine IDWriteFontFace3_Release(fontface); IDWriteFontFace3_Release(fontface1); + /* reference equality */ + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(ret, "got %d\n", ret); + IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(!ret, "got %d\n", ret); IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_BOLD, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(!ret, "got %d\n", ret); + IDWriteFontFaceReference_Release(ref1); + IDWriteFontFaceReference_Release(ref); /* create reference from a file */

1 0

Jacek Caban : msctf: Added ITfTransitoryExtensionSink tests.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: 4585687e7db342df7b6a56b06243fc3af0ee6e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4585687e7db342df7b6a56b06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 5 13:22:50 2016 +0200 msctf: Added ITfTransitoryExtensionSink tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d78509d..16df012 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -62,6 +62,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static DWORD dmSinkCookie; static DWORD documentStatus; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -622,6 +623,42 @@ static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) return S_OK; } +static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfTransitoryExtensionSink_AddRef(ITfTransitoryExtensionSink *iface) +{ + return 2; +} + +static ULONG WINAPI TfTransitoryExtensionSink_Release(ITfTransitoryExtensionSink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfTransitoryExtensionSink_OnTransitoryExtensionUpdated(ITfTransitoryExtensionSink *iface, ITfContext *pic, + TfEditCookie ecReadOnly, ITfRange *pResultRange, ITfRange *pCompositionRange, BOOL *pfDeleteResultRange) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { + TfTransitoryExtensionSink_QueryInterface, + TfTransitoryExtensionSink_AddRef, + TfTransitoryExtensionSink_Release, + TfTransitoryExtensionSink_OnTransitoryExtensionUpdated +}; + +static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; /******************************************************************************************** * Stub text service for testing @@ -1053,6 +1090,34 @@ static void test_ThreadMgrUnadviseSinks(void) ITfSource_Release(source); } +static void test_DocumentMgrAdviseSinks(void) +{ + ITfSource *source; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + dmSinkCookie = 0; + hr = ITfSource_AdviseSink(source, &IID_ITfTransitoryExtensionSink, (IUnknown*)&TfTransitoryExtensionSink, &dmSinkCookie); + ok(hr == S_OK,"Failed to Advise Sink\n"); + + ITfSource_Release(source); +} + +static void test_DocumentMgrUnadviseSinks(void) +{ + ITfSource *source = NULL; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + hr = ITfSource_UnadviseSink(source, dmSinkCookie); + ok(hr == S_OK,"Failed to unadvise Sink\n"); + ITfSource_Release(source); +} + /********************************************************************** * ITfKeyEventSink **********************************************************************/ @@ -2240,6 +2305,7 @@ START_TEST(inputprocessor) test_ThreadMgrAdviseSinks(); test_Activate(); test_startSession(); + test_DocumentMgrAdviseSinks(); test_TfGuidAtom(); test_ClientId(); test_KeystrokeMgr(); @@ -2250,6 +2316,7 @@ START_TEST(inputprocessor) test_FindClosestCategory(); test_Disable(); test_ThreadMgrUnadviseSinks(); + test_DocumentMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); test_profile_mgr();

1 0

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

May 5, 2016

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

Alistair Leslie-Hughes : inetcomm: Ignore OID_SAVEBODY_KEEPBOUNDARY value in IMimeMessage_SetOption.
by Alexandre Julliard May 5, 2016

May 5, 2016

Module: wine Branch: master Commit: c51c319b9f5f55103c49ec6876ad3f7730c8b525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51c319b9f5f55103c49ec687… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 09:17:45 2016 +0000 inetcomm: Ignore OID_SAVEBODY_KEEPBOUNDARY value in 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c653555..14739ab 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2331,6 +2331,9 @@ static HRESULT WINAPI MimeMessage_SetOption( case OID_SHOW_MACBINARY: FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); break; + case OID_SAVEBODY_KEEPBOUNDARY: + FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->u.boolVal); + break; default: FIXME("Unhandled oid %08x\n", oid); hr = MIME_E_INVALID_OPTION_ID;

1 0

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

May 5, 2016

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 Compartment object.
by Alexandre Julliard May 5, 2016

May 5, 2016

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

May 5, 2016

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