[PATCH 0/1] MR3556: Draft: gdiplus: initial support for GdipPathIterNextPathType
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/gdiplus/pathiterator.c | 25 ++++++++++++++++++++++--- dlls/gdiplus/tests/pathiterator.c | 20 ++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 2addbc3bc57..ac6cda9c52e 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -295,12 +295,31 @@ GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator* iterator, BOOL* valid) GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator* iter, INT* result, BYTE* type, INT* start, INT* end) { - FIXME("(%p, %p, %p, %p, %p) stub\n", iter, result, type, start, end); + INT i; + TRACE("(%p, %p, %p, %p, %p)\n", iter, result, type, start, end); - if(!iter || !result || !type || !start || !end) + if (!iter || !result || !type || !start || !end) return InvalidParameter; - return NotImplemented; + if (iter->pathtype_pos >= iter->pathdata.Count) + { + *result = 0; + return Ok; + } + *start = *end = iter->pathtype_pos; + *type = iter->pathdata.Types[iter->pathtype_pos] & PathPointTypePathMarker; + iter->pathtype_pos++; + + if (iter->pathtype_pos < iter->pathdata.Count) { + for (i = iter->pathtype_pos + 1; i < iter->pathdata.Count; i++) { + if ((iter->pathdata.Types[i] & PathPointTypePathMarker) != *type) + break; + } + *end = i; + } + *result = *end - *start; + + return Ok; } GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator* iter, INT* result, diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 9bd3ac5452e..4f7edcdd028 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -512,13 +512,15 @@ static void test_nextpathtype(void) /* empty path */ start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); - todo_wine expect(Ok, stat); + expect(Ok, stat); expect((INT)0xdeadbeef, start); expect((INT)0xdeadbeef, end); - todo_wine expect(0, result); + expect(0, result); GdipDeletePathIter(iter); + GdipDeletePath(path); /* single figure */ + GdipCreatePath(FillModeAlternate, &path); GdipAddPathLine(path, 0.0, 0.0, 10.0, 30.0); GdipCreatePathIter(&iter, path); start = end = result = (INT)0xdeadbeef; @@ -531,6 +533,20 @@ static void test_nextpathtype(void) todo_wine expect(0, result); GdipDeletePathIter(iter); + // Create PathPointTypeBezier type + stat = GdipAddPathBezier(path, 10.0, 10.0, 20.0, 10.0, 20.0, 20.0, 30.0, 20.0); + expect(Ok, stat); + GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; + type = 255; /* out of range */ + stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); + todo_wine expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); + expect(255, type); + todo_wine expect(0, result); + GdipDeletePathIter(iter); + stat = GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); expect(Ok, stat); GdipCreatePathIter(&iter, path); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3556
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=135972 Your paranoid android. === debian11 (32 bit report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit ar:MA report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit de report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit fr report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit he:IL report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit hi:IN report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit ja:JP report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11 (32 bit zh:CN report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11b (32 bit WoW report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000 === debian11b (64 bit WoW report) === gdiplus: pathiterator.c:529: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:530: Test failed: Expected deadbeef, got 00000000 pathiterator.c:531: Test failed: Expected deadbeef, got 00000002 pathiterator.c:532: Test failed: Expected 000000ff, got 00000000 pathiterator.c:543: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:544: Test failed: Expected deadbeef, got 00000000 pathiterator.c:545: Test failed: Expected deadbeef, got 00000006 pathiterator.c:546: Test failed: Expected 000000ff, got 00000000 pathiterator.c:556: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:557: Test failed: Expected deadbeef, got 00000000 pathiterator.c:558: Test failed: Expected deadbeef, got 00000013 pathiterator.c:559: Test failed: Expected 000000ff, got 00000000 pathiterator.c:569: Test succeeded inside todo block: Expected 00000000, got 00000000 pathiterator.c:570: Test failed: Expected deadbeef, got 00000000 pathiterator.c:571: Test failed: Expected deadbeef, got 00000013 pathiterator.c:572: Test failed: Expected 000000ff, got 00000000
This merge request was closed by Bartosz Kosiorek. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3556
participants (3)
-
Bartosz Kosiorek -
Bartosz Kosiorek (＠gang65)
-
Marvin