June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Handle GetBreakConditions() failure.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: c230b327778b352b37561bde5f6d69054114ac5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c230b327778b352b37561bde5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 11:57:37 2015 +0300 dwrite: Handle GetBreakConditions() failure. --- dlls/dwrite/layout.c | 3 ++- dlls/dwrite/tests/layout.c | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8fcff86..cb191b0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -379,9 +379,10 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, HRESULT hr; UINT32 i; + /* ignore returned conditions if failed */ hr = IDWriteInlineObject_GetBreakConditions(cur->object, &before, &after); if (FAILED(hr)) - return hr; + after = before = DWRITE_BREAK_CONDITION_NEUTRAL; if (!layout->actual_breakpoints) { layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1c52d69..77fa85c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -542,8 +542,8 @@ static HRESULT WINAPI testinlineobj_GetOverhangMetrics(IDWriteInlineObject *ifac static HRESULT WINAPI testinlineobj_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, DWRITE_BREAK_CONDITION *after) { - *before = *after = DWRITE_BREAK_CONDITION_NEUTRAL; - return S_OK; + *before = *after = DWRITE_BREAK_CONDITION_MUST_BREAK; + return 0x8feacafe; } static IDWriteInlineObjectVtbl testinlineobjvtbl = { @@ -557,6 +557,7 @@ static IDWriteInlineObjectVtbl testinlineobjvtbl = { }; static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; +static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; static void test_CreateTextLayout(void) { @@ -1422,6 +1423,36 @@ todo_wine ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); ok(metrics[0].isSoftHyphen == 0, "got %d\n", metrics[0].isSoftHyphen); ok(metrics[0].isRightToLeft == 0, "got %d\n", metrics[0].isRightToLeft); + + /* now set two inline object for [0,1] and [2,3], both fail to report break conditions */ + range.startPosition = 2; + range.length = 2; + hr = IDWriteTextLayout_SetInlineObject(layout, &testinlineobj2, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %u\n", count); + + ok(metrics[0].width == 0.0, "got %.2f\n", metrics[0].width); + ok(metrics[0].length == 2, "got %d\n", metrics[0].length); + ok(metrics[0].canWrapLineAfter == 0, "got %d\n", metrics[0].canWrapLineAfter); + ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); + ok(metrics[0].isSoftHyphen == 0, "got %d\n", metrics[0].isSoftHyphen); + ok(metrics[0].isRightToLeft == 0, "got %d\n", metrics[0].isRightToLeft); + + ok(metrics[1].width == 0.0, "got %.2f\n", metrics[1].width); + ok(metrics[1].length == 2, "got %d\n", metrics[1].length); +todo_wine + ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); + ok(metrics[1].isWhitespace == 0, "got %d\n", metrics[1].isWhitespace); + ok(metrics[1].isNewline == 0, "got %d\n", metrics[1].isNewline); + ok(metrics[1].isSoftHyphen == 0, "got %d\n", metrics[1].isSoftHyphen); + ok(metrics[1].isRightToLeft == 0, "got %d\n", metrics[1].isRightToLeft); + IDWriteTextLayout_Release(layout); IDWriteInlineObject_Release(trimm);

1 0

Daniel Lehman : msvcrt: Add __swprintf_l.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 65b8a3da473905e08c8be0745db8ed2657c6cff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b8a3da473905e08c8be0745… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 29 12:08:33 2015 -0700 msvcrt: Add __swprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b7d4945..9b47401 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -657,7 +657,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c7222b9..e99df42 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1005,7 +1005,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1a1470e..2beb51b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -993,7 +993,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f47f906..e262aa9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -966,7 +966,7 @@ @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr @ cdecl __threadhandle() msvcr120.__threadhandle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b40e2e..e3de8ac 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -306,7 +306,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5c65b2f..2de0526 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -290,7 +290,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 98bc686..913b0a7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1295,6 +1295,20 @@ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, } /********************************************************************* + * __swprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vswprintf_l(str, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _sprintf_p (MSVCR100.@) */ int CDECL MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...)

1 0

Nikolay Sivov : ole32: Initialize returned value for disconnected case too in proxy_manager_get_remunknown () (Coverity).
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 7c5f639cb86fba26a3b96d9dd0798fd3da2150a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f639cb86fba26a3b96d9dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 17:51:52 2015 +0300 ole32: Initialize returned value for disconnected case too in proxy_manager_get_remunknown() (Coverity). --- dlls/ole32/marshal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index c5c2023..cc8d6fe 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1045,8 +1045,11 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk IRemUnknown_AddRef(*remunk); } else if (!This->parent) + { /* disconnected - we can't create IRemUnknown */ + *remunk = NULL; hr = S_FALSE; + } else { STDOBJREF stdobjref;

1 0

Nikolay Sivov : riched20: Move data linking text range to IRichEditOle in separate structure.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: b620fb6e85a9d750d4519bf886d454c00652a38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b620fb6e85a9d750d4519bf88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:51:11 2015 +0300 riched20: Move data linking text range to IRichEditOle in separate structure. --- dlls/riched20/richole.c | 167 ++++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b620fb6e85a9d750d4519…

1 0

Nikolay Sivov : riched20/tests: Small test for GetClientSite().
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 383dbeedd75278f3a9369527d8914c02f702798f URL: http://source.winehq.org/git/wine.git/?a=commit;h=383dbeedd75278f3a9369527d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:50:25 2015 +0300 riched20/tests: Small test for GetClientSite(). --- dlls/riched20/tests/richole.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 79c3c3d..0fc4169 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1473,7 +1473,7 @@ static void test_ITextSelection_Collapse(void) ITextSelection_Release(txtSel); } -static void test_IOleClientSite_QueryInterface(void) +static void test_GetClientSite(void) { HWND w; IRichEditOle *reOle = NULL, *reOle1 = NULL; @@ -1487,17 +1487,24 @@ static void test_IOleClientSite_QueryInterface(void) create_interfaces(&w, &reOle, &txtDoc, NULL); hres = IRichEditOle_GetClientSite(reOle, &clientSite); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); - refcount1 = get_refcount((IUnknown *)clientSite); - todo_wine ok(refcount1 == 1, "got wrong ref count: %d\n", refcount1); + +todo_wine + EXPECT_REF(clientSite, 1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); ok(hres == E_NOINTERFACE, "IOleClientSite_QueryInterface: %x\n", hres); + hres = IRichEditOle_GetClientSite(reOle, &clientSite1); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine + ok(clientSite != clientSite1, "got %p, %p\n", clientSite, clientSite1); + IOleClientSite_Release(clientSite1); + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); ok(clientSite == clientSite1, "Should not return a new pointer.\n"); - refcount1 = get_refcount((IUnknown *)clientSite); - todo_wine ok(refcount1 == 2, "got wrong ref count: %d\n", refcount1); +todo_wine + EXPECT_REF(clientSite, 2); /* IOleWindow interface */ hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); @@ -3087,7 +3094,7 @@ START_TEST(richole) test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); - test_IOleClientSite_QueryInterface(); + test_GetClientSite(); test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow(); test_GetFont();

1 0

Nikolay Sivov : dwrite: Handle inline object GetMetrics() failure.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 10ff42097f8833880940357306a09512341add70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ff42097f883388094035730… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 11:40:59 2015 +0300 dwrite: Handle inline object GetMetrics() failure. --- dlls/dwrite/layout.c | 6 ++-- dlls/dwrite/tests/layout.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 88d33a3..8fcff86 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -603,11 +603,11 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) c->position = 0; /* there's always one cluster per inline object, so 0 is valid value */ cluster++; - /* TODO: is it fatal if GetMetrics() fails? */ + /* it's not fatal if GetMetrics() fails, all returned metrics are ignored */ hr = IDWriteInlineObject_GetMetrics(r->u.object.object, &inlinemetrics); if (FAILED(hr)) { - FIXME("failed to get inline object metrics, 0x%08x\n", hr); - continue; + memset(&inlinemetrics, 0, sizeof(inlinemetrics)); + hr = S_OK; } metrics->width = inlinemetrics.width; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a1093b0..1c52d69 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -496,6 +496,68 @@ static const IDWriteTextRendererVtbl testrenderervtbl = { static IDWriteTextRenderer testrenderer = { &testrenderervtbl }; +/* test IDWriteInlineObject */ +static HRESULT WINAPI testinlineobj_QI(IDWriteInlineObject *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IDWriteInlineObject) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDWriteInlineObject_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testinlineobj_AddRef(IDWriteInlineObject *iface) +{ + return 2; +} + +static ULONG WINAPI testinlineobj_Release(IDWriteInlineObject *iface) +{ + return 1; +} + +static HRESULT WINAPI testinlineobj_Draw(IDWriteInlineObject *iface, + void* client_drawingontext, IDWriteTextRenderer* renderer, + FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *drawing_effect) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinlineobj_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *metrics) +{ + metrics->width = 123.0; + return 0x8faecafe; +} + +static HRESULT WINAPI testinlineobj_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinlineobj_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, + DWRITE_BREAK_CONDITION *after) +{ + *before = *after = DWRITE_BREAK_CONDITION_NEUTRAL; + return S_OK; +} + +static IDWriteInlineObjectVtbl testinlineobjvtbl = { + testinlineobj_QI, + testinlineobj_AddRef, + testinlineobj_Release, + testinlineobj_Draw, + testinlineobj_GetMetrics, + testinlineobj_GetOverhangMetrics, + testinlineobj_GetBreakConditions +}; + +static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; + static void test_CreateTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -1336,6 +1398,32 @@ todo_wine IDWriteTextLayout_Release(layout); + /* single inline object that fails to report its metrics */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 4; + hr = IDWriteTextLayout_SetInlineObject(layout, &testinlineobj, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + /* object sets a width to 123.0, but returns failure from GetMetrics() */ + ok(metrics[0].width == 0.0, "got %.2f\n", metrics[0].width); + ok(metrics[0].length == 4, "got %d\n", metrics[0].length); +todo_wine + ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); + ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); + ok(metrics[0].isSoftHyphen == 0, "got %d\n", metrics[0].isSoftHyphen); + ok(metrics[0].isRightToLeft == 0, "got %d\n", metrics[0].isRightToLeft); + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : riched20: Properly implement GetClientSite().
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 41687841bc3ef7a4140a5ad50a31b9c2949ca5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41687841bc3ef7a4140a5ad50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:54:40 2015 +0300 riched20: Properly implement GetClientSite(). --- dlls/riched20/richole.c | 80 +++++++++++++++++++++++++------------------ dlls/riched20/tests/richole.c | 4 --- 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index d637292..7c50304 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -214,8 +214,9 @@ typedef struct IRichEditOleImpl { ME_TextEditor *editor; ITextSelectionImpl *txtSel; - IOleClientSiteImpl *clientSite; + struct list rangelist; + struct list clientsites; } IRichEditOleImpl; struct reole_child { @@ -255,12 +256,11 @@ typedef struct ITextParaImpl { } ITextParaImpl; struct IOleClientSiteImpl { + struct reole_child child; IOleClientSite IOleClientSite_iface; IOleWindow IOleWindow_iface; IOleInPlaceSite IOleInPlaceSite_iface; LONG ref; - - IRichEditOleImpl *reOle; }; static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) @@ -940,15 +940,20 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) if (!ref) { + IOleClientSiteImpl *clientsite; ITextRangeImpl *txtRge; TRACE("Destroying %p\n", This); This->txtSel->reOle = NULL; This->editor->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, child.entry) txtRge->child.reole = NULL; + + LIST_FOR_EACH_ENTRY(clientsite, &This->clientsites, IOleClientSiteImpl, child.entry) + clientsite->child.reole = NULL; + heap_free(This); } return ref; @@ -1039,34 +1044,43 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) static ULONG WINAPI IOleClientSite_fnAddRef(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI IOleClientSite_fnRelease(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) { + if (This->child.reole) { + list_remove(&This->child.entry); + This->child.reole = NULL; + } heap_free(This); + } return ref; } static HRESULT WINAPI IOleClientSite_fnSaveObject(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); return E_NOTIMPL; } - static HRESULT WINAPI IOleClientSite_fnGetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1077,7 +1091,7 @@ static HRESULT WINAPI IOleClientSite_fnGetContainer(IOleClientSite *iface, IOleContainer **ppContainer) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1087,7 +1101,7 @@ static HRESULT WINAPI IOleClientSite_fnGetContainer(IOleClientSite *iface, static HRESULT WINAPI IOleClientSite_fnShowObject(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1097,7 +1111,7 @@ static HRESULT WINAPI IOleClientSite_fnShowObject(IOleClientSite *iface) static HRESULT WINAPI IOleClientSite_fnOnShowWindow(IOleClientSite *iface, BOOL fShow) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1107,7 +1121,7 @@ static HRESULT WINAPI IOleClientSite_fnOnShowWindow(IOleClientSite *iface, BOOL static HRESULT WINAPI IOleClientSite_fnRequestNewObjectLayout(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1155,12 +1169,16 @@ static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) { IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + TRACE("(%p)->(%p)\n", This, phwnd); + if (!This->child.reole) + return CO_E_RELEASED; + if (!phwnd) return E_INVALIDARG; - *phwnd = This->reOle->editor->hWnd; + *phwnd = This->child.reole->editor->hWnd; return S_OK; } @@ -1294,34 +1312,35 @@ static const IOleInPlaceSiteVtbl olestvt = IOleInPlaceSite_fnOnPosRectChange }; -static IOleClientSiteImpl * -CreateOleClientSite(IRichEditOleImpl *reOle) +static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret) { IOleClientSiteImpl *clientSite = heap_alloc(sizeof *clientSite); + if (!clientSite) - return NULL; + return E_OUTOFMEMORY; clientSite->IOleClientSite_iface.lpVtbl = &ocst; clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; - clientSite->reOle = reOle; - return clientSite; + clientSite->child.reole = reOle; + list_add_head(&reOle->clientsites, &clientSite->child.entry); + + *ret = &clientSite->IOleClientSite_iface; + return S_OK; } static HRESULT WINAPI -IRichEditOle_fnGetClientSite(IRichEditOle *me, - LPOLECLIENTSITE *lplpolesite) +IRichEditOle_fnGetClientSite(IRichEditOle *me, IOleClientSite **clientsite) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - TRACE("%p,%p\n",This, lplpolesite); + TRACE("(%p)->(%p)\n", This, clientsite); - if(!lplpolesite) + if (!clientsite) return E_INVALIDARG; - *lplpolesite = &This->clientSite->IOleClientSite_iface; - IOleClientSite_AddRef(*lplpolesite); - return S_OK; + + return CreateOleClientSite(This, clientsite); } static HRESULT WINAPI @@ -4964,15 +4983,10 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p heap_free(reo); return 0; } - reo->clientSite = CreateOleClientSite(reo); - if (!reo->clientSite) - { - ITextSelection_Release(&reo->txtSel->ITextSelection_iface); - heap_free(reo); - return 0; - } + TRACE("Created %p\n",reo); list_init(&reo->rangelist); + list_init(&reo->clientsites); if (outer_unk) reo->outer_unk = outer_unk; else diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 0fc4169..318b386 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1487,8 +1487,6 @@ static void test_GetClientSite(void) create_interfaces(&w, &reOle, &txtDoc, NULL); hres = IRichEditOle_GetClientSite(reOle, &clientSite); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); - -todo_wine EXPECT_REF(clientSite, 1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); @@ -1496,14 +1494,12 @@ todo_wine hres = IRichEditOle_GetClientSite(reOle, &clientSite1); ok(hres == S_OK, "got 0x%08x\n", hres); -todo_wine ok(clientSite != clientSite1, "got %p, %p\n", clientSite, clientSite1); IOleClientSite_Release(clientSite1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); ok(clientSite == clientSite1, "Should not return a new pointer.\n"); -todo_wine EXPECT_REF(clientSite, 2); /* IOleWindow interface */

1 0

Michael Müller : kernel32: Correctly check for an empty short filename in GetShortPathNameW ( Coverity).
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 803e9cfb66de6283d956868784a19b15cf62b435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803e9cfb66de6283d95686878… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 30 15:36:43 2015 +0200 kernel32: Correctly check for an empty short filename in GetShortPathNameW (Coverity). --- dlls/kernel32/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index f74b952..09b8b7f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -528,7 +528,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* In rare cases (like "a.abcd") short path may be longer than original path. * Make sure we have enough space in temp buffer. */ - if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName)) + if (wfd.cAlternateFileName[0] && tmplen < strlenW(wfd.cAlternateFileName)) { WCHAR *new_buf; buf_len += strlenW(wfd.cAlternateFileName) - tmplen;

1 0

Nikolay Sivov : dwrite: Fix wrong run data reported to a renderer.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 89e1a5fb75128e6d26417bcfbf43033980ca90e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e1a5fb75128e6d26417bcfb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 23:51:01 2015 +0300 dwrite: Fix wrong run data reported to a renderer. --- dlls/dwrite/layout.c | 66 ++++++++----- dlls/dwrite/tests/analyzer.c | 8 +- dlls/dwrite/tests/layout.c | 220 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 263 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89e1a5fb75128e6d26417…

1 0

Nikolay Sivov : dwrite: Report inline objects in Draw().
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 2099b109ea4175b71511bc5993939151aab2dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2099b109ea4175b71511bc599… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 18:44:54 2015 +0300 dwrite: Report inline objects in Draw(). --- dlls/dwrite/layout.c | 67 +++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 2 +- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8ab1ef9..1828ef4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -150,6 +150,15 @@ struct layout_effective_run { UINT16 *clustermap; /* effective clustermap, allocated separately, is not reused from nominal map */ }; +struct layout_effective_inline { + struct list entry; + IDWriteInlineObject *object; + FLOAT origin_x; + FLOAT origin_y; + BOOL is_sideways; + BOOL is_rtl; +}; + struct layout_cluster { const struct layout_run *run; /* link to nominal run this cluster belongs to */ UINT32 position; /* relative to run, first cluster has 0 position */ @@ -175,8 +184,10 @@ struct dwrite_textlayout { FLOAT maxwidth; FLOAT maxheight; struct list ranges; - struct list eruns; struct list runs; + /* lists ready to use by Draw() */ + struct list eruns; + struct list inlineobjects; USHORT recompute; DWRITE_LINE_BREAKPOINT *nominal_breakpoints; @@ -324,12 +335,19 @@ static void free_layout_runs(struct dwrite_textlayout *layout) static void free_layout_eruns(struct dwrite_textlayout *layout) { + struct layout_effective_inline *in, *in2; struct layout_effective_run *cur, *cur2; + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->eruns, struct layout_effective_run, entry) { list_remove(&cur->entry); heap_free(cur->clustermap); heap_free(cur); } + + LIST_FOR_EACH_ENTRY_SAFE(in, in2, &layout->inlineobjects, struct layout_effective_inline, entry) { + list_remove(&in->entry); + heap_free(in); + } } /* Used to resolve break condition by forcing stronger condition over weaker. */ @@ -499,6 +517,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) UINT32 cluster = 0; HRESULT hr; + free_layout_eruns(layout); free_layout_runs(layout); /* Cluster data arrays are allocated once, assuming one text position per cluster. */ @@ -762,6 +781,25 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_effective_run *run; UINT32 i; + if (r->kind == LAYOUT_RUN_INLINE) { + struct layout_effective_inline *inlineobject; + + inlineobject = heap_alloc(sizeof(*inlineobject)); + if (!inlineobject) + return E_OUTOFMEMORY; + + inlineobject->object = r->u.object.object; + inlineobject->origin_x = origin_x; + inlineobject->origin_y = 0.0; /* FIXME */ + /* It's not clear how these two are set, possibly directionality + is derived from surrounding text (replaced text could have + different ranges which differ in reading direction). */ + inlineobject->is_sideways = FALSE; + inlineobject->is_rtl = FALSE; + list_add_tail(&layout->inlineobjects, &inlineobject->entry); + return S_OK; + } + run = heap_alloc(sizeof(*run)); if (!run) return E_OUTOFMEMORY; @@ -828,7 +866,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) const struct layout_run *run; FLOAT width, origin_x; UINT32 i, start, line; - BOOL can_wrap_after; HRESULT hr; if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) @@ -842,12 +879,14 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) origin_x = 0.0; line = 0; run = layout->clusters[0].run; - can_wrap_after = layout->clustermetrics[0].canWrapLineAfter; memset(&metrics, 0, sizeof(metrics)); for (i = 0, start = 0, width = 0.0; i < layout->cluster_count; i++) { + BOOL can_wrap_after = layout->clustermetrics[i].canWrapLineAfter; + + /* switched to next nominal run, at this point all previous pending clusters are already + checked for layout line overflow, so new effective run will fit in current line */ if (run != layout->clusters[i].run) { - /* switched to next nominal run */ hr = layout_add_effective_run(layout, run, start, i - start, origin_x); if (FAILED(hr)) return hr; @@ -869,7 +908,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* we don't need to update origin for next run as we're going to wrap */ } - /* take a look at clusters we got for this line in reverse order */ + /* take a look at clusters we got for this line in reverse order to set + trailing properties for current line */ while (strlength) { DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; @@ -905,7 +945,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) width += layout->clustermetrics[i].width; } - can_wrap_after = layout->clustermetrics[i].canWrapLineAfter; + run = layout->clusters[i].run; } layout->line_count = line; @@ -1984,6 +2024,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, void *context, IDWriteTextRenderer* renderer, FLOAT origin_x, FLOAT origin_y) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); + struct layout_effective_inline *inlineobject; struct layout_effective_run *run; HRESULT hr; @@ -2029,7 +2070,18 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, NULL /* FIXME */); } - /* TODO: 2. Inline objects */ + /* 2. Inline objects */ + LIST_FOR_EACH_ENTRY(inlineobject, &This->inlineobjects, struct layout_effective_inline, entry) { + IDWriteTextRenderer_DrawInlineObject(renderer, + context, + inlineobject->origin_x, + inlineobject->origin_y, + inlineobject->object, + inlineobject->is_sideways, + inlineobject->is_rtl, + NULL /* FIXME */); + } + /* TODO: 3. Underlines */ /* TODO: 4. Strikethrough */ @@ -2986,6 +3038,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->line_alloc = 0; layout->minwidth = 0.0; list_init(&layout->eruns); + list_init(&layout->inlineobjects); list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b0812fd..af4a5c5 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -893,7 +893,7 @@ static void test_Draw(void) DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 100.0, 100.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj);

1 0