February 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 4/4 v2] comctl32: Add listbox WM_MEASUREITEM tests

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36289 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 The previous 1 run(s) terminated abnormally

Feb. 28, 2018

Re: [PATCH 2/4 v2] user32: Add listbox WM_MEASUREITEM tests

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36288 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:740: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:975: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:740: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:975: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

Feb. 28, 2018

Re: [PATCH 5/5] usp10/tests: Cleanup test_ScriptGetFontFunctions().

by Aric Stewart

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 2/28/18 12:26 AM, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/usp10/tests/usp10.c | 205 ++++++++++++++++++++++++----------------------- > 1 file changed, 103 insertions(+), 102 deletions(-) > > diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c > index cd2c129..f548b57 100644 > --- a/dlls/usp10/tests/usp10.c > +++ b/dlls/usp10/tests/usp10.c > @@ -3701,116 +3701,117 @@ static void test_newlines(void) > > static void test_ScriptGetFontFunctions(HDC hdc) > { > + static const WCHAR test_phagspa[] = {0xa84f, 0xa861, 0xa843, 0x0020, 0xa863, 0xa861, 0xa859, > + 0x0020, 0xa850, 0xa85c, 0xa85e}; > + SCRIPT_CONTROL control; > + SCRIPT_CACHE sc = NULL; > + SCRIPT_ITEM items[15]; > + OPENTYPE_TAG tags[5]; > + SCRIPT_STATE state; > + int count = 0; > HRESULT hr; > + > if (!pScriptGetFontScriptTags || !pScriptGetFontLanguageTags || !pScriptGetFontFeatureTags) > { > - win_skip("ScriptGetFontScriptTags,ScriptGetFontLanguageTags or ScriptGetFontFeatureTags not available on this platform\n"); > + win_skip("ScriptGetFontScriptTags, ScriptGetFontLanguageTags or " > + "ScriptGetFontFeatureTags not available on this platform.\n"); > + return; > } > + > + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, ARRAY_SIZE(tags), tags, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontScriptTags(NULL, &sc, NULL, ARRAY_SIZE(tags), tags, &count); > + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, ARRAY_SIZE(tags), tags, &count); > + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); > + if (hr == S_OK) > + ok(count <= 5, "Got unexpected count %d.\n", count); > else > - { > - SCRIPT_CACHE sc = NULL; > - OPENTYPE_TAG tags[5]; > - int count = 0; > - int outnItems=0; > - SCRIPT_ITEM outpItems[15]; > - SCRIPT_CONTROL Control; > - SCRIPT_STATE State; > - static const WCHAR test_phagspa[] = {0xa84f, 0xa861, 0xa843, 0x0020, 0xa863, 0xa861, 0xa859, 0x0020, 0xa850, 0xa85c, 0xa85e}; > - > - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontScriptTags(NULL, &sc, NULL, 5, tags, &count); > - ok(hr == E_PENDING,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, &count); > - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); > - if (hr == S_OK) > - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); > - else if (hr == E_OUTOFMEMORY) > - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); > - ok(sc != NULL, "ScriptCache should be initialized\n"); > + ok(!count, "Got unexpected count %d.\n", count); > + ok(!!sc, "Got unexpected script cache %p.\n", sc); > > - ScriptFreeCache(&sc); > - sc = NULL; > - > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 5, tags, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, tags, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontLanguageTags(NULL, &sc, NULL, latn_tag, 5, tags, &count); > - ok(hr == E_PENDING,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 5, tags, &count); > - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); > - if (hr == S_OK) > - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); > - else if (hr == E_OUTOFMEMORY) > - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); > + ScriptFreeCache(&sc); > + sc = NULL; > > - ScriptFreeCache(&sc); > - sc = NULL; > - > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 5, tags, NULL); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, tags, &count); > - ok(hr == E_INVALIDARG,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontFeatureTags(NULL, &sc, NULL, latn_tag, 0x0, 5, tags, &count); > - ok(hr == E_PENDING,"Incorrect return code\n"); > - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 5, tags, &count); > - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); > - if (hr == S_OK) > - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); > - else if (hr == E_OUTOFMEMORY) > - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); > - > - memset(&Control, 0, sizeof(Control)); > - memset(&State, 0, sizeof(State)); > - > - hr = ScriptItemize(test_phagspa, 10, 15, &Control, &State, outpItems, &outnItems); > - ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); > - memset(tags,0,sizeof(tags)); > - hr = pScriptGetFontScriptTags(hdc, &sc, &outpItems[0].a, 5, tags, &count); > - ok( hr == USP_E_SCRIPT_NOT_IN_FONT || broken(hr == S_OK), "wrong return code\n"); > - > - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, dsrt_tag, 5, tags, &count); > - ok( hr == S_OK, "wrong return code\n"); > - hr = pScriptGetFontLanguageTags(hdc, &sc, &outpItems[0].a, dsrt_tag, 5, tags, &count); > - ok( hr == E_INVALIDARG || broken(hr == S_OK), "wrong return code\n"); > - > - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, dsrt_tag, 0x0, 5, tags, &count); > - ok( hr == S_OK, "wrong return code\n"); > - hr = pScriptGetFontFeatureTags(hdc, &sc, &outpItems[0].a, dsrt_tag, 0x0, 5, tags, &count); > - ok( hr == E_INVALIDARG || broken(hr == S_OK), "wrong return code\n"); > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, tags, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontLanguageTags(NULL, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, &count); > + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, &count); > + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); > + if (hr == S_OK) > + ok(count <= 5, "Got unexpected count %d.\n", count); > + else > + ok(!count, "Got unexpected count %d.\n", count); > > - ScriptFreeCache(&sc); > - } > + ScriptFreeCache(&sc); > + sc = NULL; > + > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, tags, &count); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontFeatureTags(NULL, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, &count); > + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); > + ok(!sc, "Got unexpected script cache %p.\n", sc); > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, &count); > + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); > + if (hr == S_OK) > + ok(count <= 5, "Got unexpected count %d.\n", count); > + else > + ok(!count, "Got unexpected count %d.\n", count); > + > + memset(&control, 0, sizeof(control)); > + memset(&state, 0, sizeof(state)); > + > + hr = ScriptItemize(test_phagspa, ARRAY_SIZE(test_phagspa), ARRAY_SIZE(items), > + &control, &state, items, &count); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + memset(tags, 0, sizeof(tags)); > + hr = pScriptGetFontScriptTags(hdc, &sc, &items[0].a, ARRAY_SIZE(tags), tags, &count); > + ok(hr == USP_E_SCRIPT_NOT_IN_FONT || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); > + > + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, dsrt_tag, ARRAY_SIZE(tags), tags, &count); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + hr = pScriptGetFontLanguageTags(hdc, &sc, &items[0].a, dsrt_tag, ARRAY_SIZE(tags), tags, &count); > + ok(hr == E_INVALIDARG || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); > + > + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, dsrt_tag, 0x0, ARRAY_SIZE(tags), tags, &count); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + hr = pScriptGetFontFeatureTags(hdc, &sc, &items[0].a, dsrt_tag, 0x0, ARRAY_SIZE(tags), tags, &count); > + ok(hr == E_INVALIDARG || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); > + > + ScriptFreeCache(&sc); > } > > struct logical_width_test >

Feb. 28, 2018

Re: [PATCH] usp10: Use the available ARRAY_SIZE() macro

by Aric Stewart

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 2/27/18 6:11 PM, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/usp10/usp10.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c > index 5f50332712..4daba34350 100644 > --- a/dlls/usp10/usp10.c > +++ b/dlls/usp10/usp10.c > @@ -1155,7 +1155,7 @@ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num) > > if (!props && !num) return E_INVALIDARG; > > - if (num) *num = sizeof(script_props)/sizeof(script_props[0]); > + if (num) *num = ARRAY_SIZE(script_props); > if (props) *props = script_props; > > return S_OK; >

Feb. 28, 2018

[PATCH 4/4 v2] comctl32: Add listbox WM_MEASUREITEM tests

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

Feb. 28, 2018

[PATCH 3/4 v2] comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

Feb. 28, 2018

[PATCH 2/4 v2] user32: Add listbox WM_MEASUREITEM tests

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

Feb. 28, 2018

[PATCH 1/4 v2] user32: Fix itemData passed in ListBox WM_MEASUREITEM message

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed test failures dlls/user32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

Feb. 28, 2018

Re: [PATCH 4/8] wined3d: Fix draw calls when first render target is NULL.

by Henri Verbeet

On 28 February 2018 at 16:26, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > Actually, I did not necessarily mean to sign-off on this one just yet, although it could still happen.

Feb. 28, 2018

[PATCH] gdiplus: Silently ignore empty rectangles in GdipAddPathRectangles.

by Vincent Povirk

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/graphicspath.c | 3 +++ dlls/gdiplus/tests/graphicspath.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8b13fc5b2a0..76ef1c248e2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2306,6 +2306,9 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, if(!path) return InvalidParameter; + if (width <= 0.0 || height <= 0.0) + return Ok; + /* make a backup copy of path data */ if((retstat = GdipClonePath(path, &backup)) != Ok) return retstat; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9a6dde3bd85..102c33c902a 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1301,6 +1301,7 @@ static void test_empty_rect(void) { GpPath *path; GpStatus status; + INT count; BOOL result; status = GdipCreatePath(FillModeAlternate, &path); @@ -1309,6 +1310,10 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, -5.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); expect(Ok, status); expect(FALSE, status); @@ -1316,12 +1321,31 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 0.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.1); + expect(Ok, status); + + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(4, count); + GdipDeletePath(path); } -- 2.14.1

Feb. 28, 2018