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

Nikolay Sivov : dwrite: Validate per-range attribute values.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 7be11594799c7b37ae2a285ce36f68bcdaec9d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be11594799c7b37ae2a285ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 19:05:00 2015 +0300 dwrite: Validate per-range attribute values. --- dlls/dwrite/layout.c | 9 +++++++++ dlls/dwrite/tests/layout.c | 28 +++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index af0e6f3..150e34b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1937,6 +1937,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontStyle(IDWriteTextLayout2 *iface, D TRACE("(%p)->(%d %s)\n", This, style, debugstr_range(&range)); + if ((UINT32)style > DWRITE_FONT_STYLE_ITALIC) + return E_INVALIDARG; + value.range = range; value.u.style = style; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STYLE, &value); @@ -1949,6 +1952,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout2 *iface, TRACE("(%p)->(%d %s)\n", This, stretch, debugstr_range(&range)); + if (stretch == DWRITE_FONT_STRETCH_UNDEFINED || (UINT32)stretch > DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + return E_INVALIDARG; + value.range = range; value.u.stretch = stretch; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRETCH, &value); @@ -1961,6 +1967,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout2 *iface, FL TRACE("(%p)->(%.2f %s)\n", This, size, debugstr_range(&range)); + if (size <= 0.0) + return E_INVALIDARG; + value.range = range; value.u.fontsize = size; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTSIZE, &value); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4c76f50..a740c4f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1832,6 +1832,15 @@ static void test_SetFontSize(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* negative/zero size */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontSize(layout, -15.0, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetFontSize(layout, 0.0, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; size = 0.0; @@ -1909,6 +1918,12 @@ static void test_SetFontFamilyName(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* NULL name */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontFamilyName(layout, NULL, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; nameW[0] = 0; @@ -1961,6 +1976,12 @@ static void test_SetFontStyle(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* invalid style value */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC+1, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; hr = IDWriteTextLayout_GetFontStyle(layout, 0, &style, &r); @@ -2036,6 +2057,12 @@ static void test_SetFontStretch(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* invalid stretch value */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_ULTRA_EXPANDED+1, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; stretch = DWRITE_FONT_STRETCH_UNDEFINED; @@ -2093,7 +2120,6 @@ static void test_SetFontStretch(void) r.startPosition = 0; r.length = 2; hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_UNDEFINED, r); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : riched20: Implement GetStoryLength().
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 9c6bcec5090ca0c021e5791de4f40d12ce30ef92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6bcec5090ca0c021e5791de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 19:34:56 2015 +0300 riched20: Implement GetStoryLength(). --- dlls/riched20/richole.c | 25 ++++++++++++---- dlls/riched20/tests/richole.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 7af3ae2..019a25f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -312,6 +312,15 @@ static HRESULT create_textfont(ITextRange*, const ITextFontImpl*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); static ITextSelectionImpl *CreateTextSelection(IRichEditOleImpl*); +static HRESULT textrange_get_storylength(ME_TextEditor *editor, LONG *length) +{ + if (!length) + return E_INVALIDARG; + + *length = ME_GetTextLength(editor) + 1; + return S_OK; +} + static void textranges_update_ranges(IRichEditOleImpl *reole, LONG start, LONG end, enum range_update_op op) { ITextRangeImpl *range; @@ -1897,14 +1906,16 @@ static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara) return E_NOTIMPL; } -static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch) +static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *length) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)->(%p)\n", This, length); + if (!This->child.reole) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + return textrange_get_storylength(This->child.reole->editor, length); } static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *value) @@ -4364,14 +4375,16 @@ static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *pP return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG *pcch) +static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG *length) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%p)\n", This, length); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + return textrange_get_storylength(This->reOle->editor, length); } static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index da92e6c..515b9ad 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3109,6 +3109,74 @@ static void test_InsertObject(void) release_interfaces(&hwnd, &reole, &doc, NULL); } +static void test_GetStoryLength(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetStoryLength(range, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + value = 0; + hr = ITextRange_GetStoryLength(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + hr = ITextSelection_GetStoryLength(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + value = 0; + hr = ITextSelection_GetStoryLength(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + + value = 0; + hr = ITextRange_GetStoryLength(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextSelection_GetStoryLength(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_GetStoryLength(range, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = 100; + hr = ITextRange_GetStoryLength(range, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == 100, "got %d\n", value); + + hr = ITextSelection_GetStoryLength(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = 100; + hr = ITextSelection_GetStoryLength(selection, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == 100, "got %d\n", value); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3142,4 +3210,5 @@ START_TEST(richole) test_GetStoryType(); test_SetFont(); test_InsertObject(); + test_GetStoryLength(); }

1 0

Nikolay Sivov : riched20: Implement GetDuplicate() for selection.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 5f933018a289125c180b83002f4a355ca3d20daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f933018a289125c180b83002… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 21:32:00 2015 +0300 riched20: Implement GetDuplicate() for selection. --- dlls/riched20/richole.c | 14 ++++++-- dlls/riched20/tests/richole.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 019a25f..b7f0298 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4223,14 +4223,22 @@ static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **ppRange) +static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **range) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG start, end; + + TRACE("(%p)->(%p)\n", This, range); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!range) + return E_INVALIDARG; + + ITextSelection_GetStart(me, &start); + ITextSelection_GetEnd(me, &end); + return CreateITextRange(This->reOle, start, end, range); } static HRESULT WINAPI ITextSelection_fnGetFormattedText(ITextSelection *me, ITextRange **ppRange) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 515b9ad..fd4d9e8 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3177,6 +3177,80 @@ static void test_GetStoryLength(void) ITextRange_Release(range); } +static void test_ITextSelection_GetDuplicate(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection, *sel2; + ITextRange *range, *range2; + ITextFont *font; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + EXPECT_REF(selection, 2); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(range != range2, "got %p, %p\n", range, range2); + + EXPECT_REF(selection, 2); + EXPECT_REF(range, 1); + EXPECT_REF(range2, 1); + + ITextRange_Release(range2); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + hr = ITextRange_QueryInterface(range, &IID_ITextSelection, (void**)&sel2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_GetFont(range, &font); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3211,4 +3285,5 @@ START_TEST(richole) test_SetFont(); test_InsertObject(); test_GetStoryLength(); + test_ITextSelection_GetDuplicate(); }

1 0

Alistair Leslie-Hughes : oledb32: Fix memory leak.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 804b96a680587b38ad8e4680e65125401071aa6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=804b96a680587b38ad8e4680e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 5 20:23:02 2015 +1000 oledb32: Fix memory leak. --- dlls/oledb32/tests/database.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b4ce139..9e20fec 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -73,6 +73,7 @@ static void test_GetDataSource(WCHAR *initstring) pInfoset->rgPropertyInfos[i].vtType); } + CoTaskMemFree(pInfoset); CoTaskMemFree(ary); }

1 0

Alistair Leslie-Hughes : odbccp32: Add a trace message to functions.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: f4c9eac73d736d8916885e6215879930ddf9aea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c9eac73d736d8916885e621… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 5 16:01:03 2015 +1000 odbccp32: Add a trace message to functions. --- dlls/odbccp32/odbccp32.c | 77 ++++++++++++++++++++++++++++----------------- dlls/odbccp32/odbccp32.spec | 8 ++--- 2 files changed, 53 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c9eac73d736d8916885…

1 0

Nikolay Sivov : shlwapi: Fix error handling in IUnknown_GetClassID ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: b5c2c0b05ad288e933428d08f300fb024bdee6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c2c0b05ad288e933428d08f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 5 16:21:05 2015 +0300 shlwapi: Fix error handling in IUnknown_GetClassID (Coverity). --- dlls/shlwapi/ordinal.c | 31 ++++++++------- dlls/shlwapi/tests/ordinal.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3da25b4..68b66e3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1384,7 +1384,7 @@ HRESULT WINAPI IUnknown_SetSite( * * PARAMS * lpUnknown [I] Object supporting the IPersist interface - * lpClassId [O] Destination for Class Id + * clsid [O] Destination for Class Id * * RETURNS * Success: S_OK. lpClassId contains the Class Id requested. @@ -1392,23 +1392,28 @@ HRESULT WINAPI IUnknown_SetSite( * E_NOINTERFACE If lpUnknown does not support IPersist, * Or an HRESULT error code. */ -HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID* lpClassId) +HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *clsid) { - IPersist* lpPersist; - HRESULT hRet = E_FAIL; + IPersist *persist; + HRESULT hr; - TRACE("(%p,%s)\n", lpUnknown, debugstr_guid(lpClassId)); + TRACE("(%p, %p)\n", lpUnknown, clsid); - if (lpUnknown) - { - hRet = IUnknown_QueryInterface(lpUnknown,&IID_IPersist,(void**)&lpPersist); - if (SUCCEEDED(hRet)) + if (!lpUnknown) { - IPersist_GetClassID(lpPersist, lpClassId); - IPersist_Release(lpPersist); + memset(clsid, 0, sizeof(*clsid)); + return E_FAIL; } - } - return hRet; + + hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersist, (void**)&persist); + if (hr != S_OK) + hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersistFolder, (void**)&persist); + if (hr != S_OK) + return hr; + + hr = IPersist_GetClassID(persist, clsid); + IPersist_Release(persist); + return hr; } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index d8a4f68..9225219 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -69,6 +69,7 @@ static HRESULT (WINAPI *pSKSetValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD, void*, DWO static HRESULT (WINAPI *pSKDeleteValueW)(DWORD, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); +static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -3047,6 +3048,7 @@ static void init_pointers(void) MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(SHSetParentHwnd, 167); MAKEFUNC(ConnectToConnectionPoint, 168); + MAKEFUNC(IUnknown_GetClassID, 175); MAKEFUNC(SHSearchMapInt, 198); MAKEFUNC(SHCreateWorkerWindowA, 257); MAKEFUNC(GUIDFromStringA, 269); @@ -3152,6 +3154,95 @@ static void test_SHSetParentHwnd(void) DestroyWindow(hwnd2); } +static HRESULT WINAPI testpersist_QI(IPersist *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist)) { + *obj = iface; + IPersist_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI testpersist_QI2(IPersist *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersistFolder)) { + *obj = iface; + IPersist_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testpersist_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI testpersist_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI testpersist_GetClassID(IPersist *iface, CLSID *clsid) +{ + memset(clsid, 0xab, sizeof(*clsid)); + return 0x8fff2222; +} + +static IPersistVtbl testpersistvtbl = { + testpersist_QI, + testpersist_AddRef, + testpersist_Release, + testpersist_GetClassID +}; + +static IPersistVtbl testpersist2vtbl = { + testpersist_QI2, + testpersist_AddRef, + testpersist_Release, + testpersist_GetClassID +}; + +static IPersist testpersist = { &testpersistvtbl }; +static IPersist testpersist2 = { &testpersist2vtbl }; + +static void test_IUnknown_GetClassID(void) +{ + CLSID clsid, clsid2, clsid3; + HRESULT hr; + +if (0) /* crashes on native systems */ + hr = pIUnknown_GetClassID(NULL, NULL); + + memset(&clsid, 0xcc, sizeof(clsid)); + memset(&clsid3, 0xcc, sizeof(clsid3)); + hr = pIUnknown_GetClassID(NULL, &clsid); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_NULL) || broken(IsEqualCLSID(&clsid, &clsid3)) /* win2k, winxp, win2k3 */, + "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + memset(&clsid, 0xcc, sizeof(clsid)); + memset(&clsid2, 0xab, sizeof(clsid2)); + hr = pIUnknown_GetClassID((IUnknown*)&testpersist, &clsid); + ok(hr == 0x8fff2222, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &clsid2) || broken(IsEqualCLSID(&clsid, &clsid3)) /* win2k3 */, + "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + /* IPersistFolder is also supported */ + memset(&clsid, 0xcc, sizeof(clsid)); + memset(&clsid2, 0xab, sizeof(clsid2)); + memset(&clsid3, 0xcc, sizeof(clsid3)); + hr = pIUnknown_GetClassID((IUnknown*)&testpersist2, &clsid); + ok(hr == 0x8fff2222, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &clsid2) || broken(IsEqualCLSID(&clsid, &clsid3)) /* win2k3 */, + "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); +} + START_TEST(ordinal) { char **argv; @@ -3206,6 +3297,7 @@ START_TEST(ordinal) test_SHSetIniString(); test_SHGetShellKey(); test_SHSetParentHwnd(); + test_IUnknown_GetClassID(); FreeLibrary(hshell32); FreeLibrary(hmlang);

1 0

Nikolay Sivov : shell32/tests: Fix error code on win2k.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 1de3aec336439a14d84350b5388a36b7990453a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de3aec336439a14d84350b53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 13:12:12 2015 +0300 shell32/tests: Fix error code on win2k. --- dlls/shell32/tests/shelldispatch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 1f27cfa..e4bda93 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -719,7 +719,8 @@ static void test_ParseName(void) str = SysAllocString(cadabraW); item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, str, &item); - ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* win2k */, + "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); SysFreeString(str);

1 0

Nikolay Sivov : browseui: Added IEnumString stub for ACListISF.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: ab958dcf0cdaf82e42185021ed306a33dfcb2be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab958dcf0cdaf82e42185021e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 02:14:11 2015 +0300 browseui: Added IEnumString stub for ACListISF. --- dlls/browseui/aclsource.c | 129 ++++++++++++++++++++++++++++--------- dlls/browseui/tests/autocomplete.c | 24 +++++++ 2 files changed, 123 insertions(+), 30 deletions(-) diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 07033cc..71e9d39 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -42,7 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); -typedef struct tagACLMulti { +typedef struct tagACLShellSource { + IEnumString IEnumString_iface; IACList2 IACList2_iface; LONG refCount; DWORD dwOptions; @@ -53,26 +54,37 @@ static inline ACLShellSource *impl_from_IACList2(IACList2 *iface) return CONTAINING_RECORD(iface, ACLShellSource, IACList2_iface); } +static inline ACLShellSource *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, ACLShellSource, IEnumString_iface); +} + static void ACLShellSource_Destructor(ACLShellSource *This) { TRACE("destroying %p\n", This); heap_free(This); } -static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, LPVOID *ppvOut) +static HRESULT WINAPI ACLShellSource_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { - ACLShellSource *This = impl_from_IACList2(iface); + ACLShellSource *This = impl_from_IEnumString(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), ppvOut); + *ppvOut = NULL; - if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IACList2) || - IsEqualIID(iid, &IID_IACList)) + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) + { + *ppvOut = &This->IEnumString_iface; + } + else if (IsEqualIID(iid, &IID_IACList2) || IsEqualIID(iid, &IID_IACList)) { *ppvOut = &This->IACList2_iface; } if (*ppvOut) { - IACList2_AddRef(iface); + IEnumString_AddRef(iface); return S_OK; } @@ -80,40 +92,98 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, return E_NOINTERFACE; } -static ULONG WINAPI ACLShellSource_AddRef(IACList2 *iface) +static ULONG WINAPI ACLShellSource_AddRef(IEnumString *iface) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + ULONG ref = InterlockedIncrement(&This->refCount); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI ACLShellSource_Release(IEnumString *iface) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + ULONG ref = InterlockedDecrement(&This->refCount); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + ACLShellSource_Destructor(This); + return ref; +} + +static HRESULT WINAPI ACLShellSource_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, + ULONG *fetched) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + FIXME("(%p)->(%u %p %p): stub\n", This, celt, rgelt, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACLShellSource_Skip(IEnumString *iface, ULONG celt) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + FIXME("(%p)->(%u): stub\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACLShellSource_Reset(IEnumString *iface) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ACLShellSource_Clone(IEnumString *iface, IEnumString **ppenum) +{ + ACLShellSource *This = impl_from_IEnumString(iface); + FIXME("(%p)->(%p): stub\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumStringVtbl ACLShellSourceVtbl = { + ACLShellSource_QueryInterface, + ACLShellSource_AddRef, + ACLShellSource_Release, + ACLShellSource_Next, + ACLShellSource_Skip, + ACLShellSource_Reset, + ACLShellSource_Clone +}; + +static HRESULT WINAPI ACList_QueryInterface(IACList2 *iface, REFIID iid, void **ppvOut) { ACLShellSource *This = impl_from_IACList2(iface); - return InterlockedIncrement(&This->refCount); + return IEnumString_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } -static ULONG WINAPI ACLShellSource_Release(IACList2 *iface) +static ULONG WINAPI ACList_AddRef(IACList2 *iface) { ACLShellSource *This = impl_from_IACList2(iface); - ULONG ret; + return IEnumString_AddRef(&This->IEnumString_iface); +} - ret = InterlockedDecrement(&This->refCount); - if (ret == 0) - ACLShellSource_Destructor(This); - return ret; +static ULONG WINAPI ACList_Release(IACList2 *iface) +{ + ACLShellSource *This = impl_from_IACList2(iface); + return IEnumString_Release(&This->IEnumString_iface); } -static HRESULT WINAPI ACLShellSource_Expand(IACList2 *iface, LPCWSTR wstr) +static HRESULT WINAPI ACList_Expand(IACList2 *iface, LPCWSTR wstr) { ACLShellSource *This = impl_from_IACList2(iface); FIXME("STUB:(%p) %s\n",This,debugstr_w(wstr)); return E_NOTIMPL; } - -static HRESULT WINAPI ACLShellSource_GetOptions(IACList2 *iface, - DWORD *pdwFlag) +static HRESULT WINAPI ACList_GetOptions(IACList2 *iface, DWORD *pdwFlag) { ACLShellSource *This = impl_from_IACList2(iface); *pdwFlag = This->dwOptions; return S_OK; } -static HRESULT WINAPI ACLShellSource_SetOptions(IACList2 *iface, +static HRESULT WINAPI ACList_SetOptions(IACList2 *iface, DWORD dwFlag) { ACLShellSource *This = impl_from_IACList2(iface); @@ -121,16 +191,14 @@ static HRESULT WINAPI ACLShellSource_SetOptions(IACList2 *iface, return S_OK; } -static const IACList2Vtbl ACLMulti_ACList2Vtbl = +static const IACList2Vtbl ACListVtbl = { - ACLShellSource_QueryInterface, - ACLShellSource_AddRef, - ACLShellSource_Release, - - ACLShellSource_Expand, - - ACLShellSource_SetOptions, - ACLShellSource_GetOptions + ACList_QueryInterface, + ACList_AddRef, + ACList_Release, + ACList_Expand, + ACList_SetOptions, + ACList_GetOptions }; HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) @@ -143,10 +211,11 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->IACList2_iface.lpVtbl = &ACLMulti_ACList2Vtbl; + This->IEnumString_iface.lpVtbl = &ACLShellSourceVtbl; + This->IACList2_iface.lpVtbl = &ACListVtbl; This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)&This->IACList2_iface; + *ppOut = (IUnknown *)&This->IEnumString_iface; return S_OK; } diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index e7da647..0b04ab2 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -364,9 +364,33 @@ static void test_ACLMulti(void) CoTaskMemFree(acl2); } +static void test_ACListISF(void) +{ + IEnumString *enumstring; + IACList *list, *list2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list); + ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr); + + hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(list == list2, "got %p, %p\n", list, list2); + IACList_Release(list2); + + IEnumString_Release(enumstring); + IACList_Release(list); +} + START_TEST(autocomplete) { CoInitialize(NULL); + test_ACLMulti(); + test_ACListISF(); + CoUninitialize(); }

1 0

Nikolay Sivov : browseui: Use method wrappers when forwarding, rearrange functions to match vtable order.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 6db93689b15e4215112a1173d1c6a4c54c65cddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db93689b15e4215112a1173d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 02:18:56 2015 +0300 browseui: Use method wrappers when forwarding, rearrange functions to match vtable order. --- dlls/browseui/aclmulti.c | 120 +++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 6deb30d..3a6525f 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -138,44 +138,6 @@ static ULONG WINAPI ACLMulti_Release(IEnumString *iface) return ret; } -static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) -{ - ACLMulti *This = impl_from_IObjMgr(iface); - - TRACE("(%p, %p)\n", This, obj); - if (obj == NULL) - return E_FAIL; - - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); - This->objs[This->nObjs].punk = obj; - IUnknown_AddRef(obj); - if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) - This->objs[This->nObjs].pEnum = NULL; - if (FAILED(IUnknown_QueryInterface(obj, &IID_IACList, (LPVOID *)&This->objs[This->nObjs].pACL))) - This->objs[This->nObjs].pACL = NULL; - This->nObjs++; - return S_OK; -} - -static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) -{ - ACLMulti *This = impl_from_IObjMgr(iface); - int i; - - TRACE("(%p, %p)\n", This, obj); - for (i = 0; i < This->nObjs; i++) - if (This->objs[i].punk == obj) - { - release_obj(&This->objs[i]); - memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); - This->nObjs--; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); - return S_OK; - } - - return E_FAIL; -} - static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { ACLMulti *This = impl_from_IEnumString(iface); @@ -226,22 +188,6 @@ static HRESULT WINAPI ACLMulti_Clone(IEnumString *iface, IEnumString **ppOut) return E_OUTOFMEMORY; } -static HRESULT WINAPI ACLMulti_Expand(IACList *iface, LPCWSTR wstr) -{ - ACLMulti *This = impl_from_IACList(iface); - HRESULT res = S_OK; - int i; - - for (i = 0; i < This->nObjs; i++) - { - if (!This->objs[i].pACL) - continue; - res = IACList_Expand(This->objs[i].pACL, wstr); - /* Vista behaviour - XP would break out of the loop if res == S_OK (usually calling Expand only once) */ - } - return res; -} - static const IEnumStringVtbl ACLMultiVtbl = { ACLMulti_QueryInterface, @@ -257,19 +203,57 @@ static const IEnumStringVtbl ACLMultiVtbl = static HRESULT WINAPI ACLMulti_IObjMgr_QueryInterface(IObjMgr *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); + return IEnumString_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IObjMgr_AddRef(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_AddRef(&This->IEnumString_iface); + return IEnumString_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IObjMgr_Release(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_Release(&This->IEnumString_iface); + return IEnumString_Release(&This->IEnumString_iface); +} + +static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + + TRACE("(%p, %p)\n", This, obj); + if (obj == NULL) + return E_FAIL; + + This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs[This->nObjs].punk = obj; + IUnknown_AddRef(obj); + if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) + This->objs[This->nObjs].pEnum = NULL; + if (FAILED(IUnknown_QueryInterface(obj, &IID_IACList, (LPVOID *)&This->objs[This->nObjs].pACL))) + This->objs[This->nObjs].pACL = NULL; + This->nObjs++; + return S_OK; +} + +static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + int i; + + TRACE("(%p, %p)\n", This, obj); + for (i = 0; i < This->nObjs; i++) + if (This->objs[i].punk == obj) + { + release_obj(&This->objs[i]); + memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); + This->nObjs--; + This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + return S_OK; + } + + return E_FAIL; } static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = @@ -285,19 +269,35 @@ static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = static HRESULT WINAPI ACLMulti_IACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); + return IEnumString_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IACList_AddRef(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_AddRef(&This->IEnumString_iface); + return IEnumString_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IACList_Release(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_Release(&This->IEnumString_iface); + return IEnumString_Release(&This->IEnumString_iface); +} + +static HRESULT WINAPI ACLMulti_Expand(IACList *iface, LPCWSTR wstr) +{ + ACLMulti *This = impl_from_IACList(iface); + HRESULT res = S_OK; + int i; + + for (i = 0; i < This->nObjs; i++) + { + if (!This->objs[i].pACL) + continue; + res = IACList_Expand(This->objs[i].pACL, wstr); + /* Vista behaviour - XP would break out of the loop if res == S_OK (usually calling Expand only once) */ + } + return res; } static const IACListVtbl ACLMulti_ACListVtbl =

1 0

Nikolay Sivov : riched20: Handle range method failures in IsEqual ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 3889dadcca1c5a0638168a3750cf566bb9d26543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3889dadcca1c5a0638168a375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:26:50 2015 +0300 riched20: Handle range method failures in IsEqual (Coverity). --- dlls/riched20/richole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b7f0298..198061d 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2048,10 +2048,11 @@ static HRESULT textrange_isequal(LONG start, LONG end, ITextRange *range, LONG * if (!ret) ret = &v; - ITextRange_GetStart(range, &from); - ITextRange_GetEnd(range, &to); - - *ret = (start == from && end == to) ? tomTrue : tomFalse; + if (FAILED(ITextRange_GetStart(range, &from)) || FAILED(ITextRange_GetEnd(range, &to))) { + *ret = tomFalse; + } + else + *ret = (start == from && end == to) ? tomTrue : tomFalse; return *ret == tomTrue ? S_OK : S_FALSE; }

1 0