January 2022 - Wine-Commits

Alexandre Julliard : include: Move the ITextRange2 definition to avoid an undefined reference.
by Alexandre Julliard Jan. 12, 2022

Jan. 12, 2022

Module: wine Branch: master Commit: 048f5436fa447b325964c6d2247a94eff521339c URL: https://source.winehq.org/git/wine.git/?a=commit;h=048f5436fa447b325964c6d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 17:14:01 2022 +0100 include: Move the ITextRange2 definition to avoid an undefined reference. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52381 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tom.idl | 128 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 940b1f2e52c..d987aecaf9c 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -269,6 +269,8 @@ interface ITextDocument2Old : ITextDocument interface ITextDisplays; interface ITextFont2; interface ITextPara2; +interface ITextRange2; +interface ITextSelection2; interface ITextStory; interface ITextStoryRanges2; interface ITextStrings; @@ -331,69 +333,6 @@ interface ITextRow : IDispatch HRESULT SetProperty([in] LONG type, [in] LONG value); } -[ - object, - uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) -] -interface ITextRange2 : ITextSelection -{ - HRESULT GetCch([retval, out] LONG *count); - HRESULT GetCells([retval, out] IUnknown **cells); - HRESULT GetColumn([retval, out] IUnknown **column); - HRESULT GetCount([retval, out] LONG *count); - HRESULT GetDuplicate2([retval, out] ITextRange2 **range); - HRESULT GetFont2([retval, out] ITextFont2 **font); - HRESULT SetFont2([in] ITextFont2 *font); - HRESULT GetFormattedText2([retval, out] ITextRange2 **range); - HRESULT SetFormattedText2([in] ITextRange2 *range); - HRESULT GetGravity([retval, out] LONG *value); - HRESULT SetGravity([in] LONG value); - HRESULT GetPara2([retval, out] ITextPara2 **para); - HRESULT SetPara2([in] ITextPara2 *para); - HRESULT GetRow([retval, out] ITextRow **row); - HRESULT GetStartPara([retval, out] LONG *value); - HRESULT GetTable([retval, out] IUnknown **table); - HRESULT GetURL([retval, out] BSTR *url); - HRESULT SetURL([in] BSTR url); - HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); - HRESULT BuildUpMath([in] LONG flags); - HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); - HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); - HRESULT GetChar2([out] LONG *ch, [in] LONG offset); - HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); - HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, - [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, - [out] LONG *ccol, [out] LONG *level); - HRESULT GetProperty([in] LONG type, [out] LONG *value); - HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, - [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); - HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); - HRESULT GetText2([in] LONG flags, [out] BSTR *str); - HRESULT HexToUnicode(); - HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); - HRESULT Linearize([in] LONG flags); - HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); - HRESULT SetDropCap([in] LONG line, [in] LONG pos); - HRESULT SetProperty([in] LONG type, [in] LONG value); - HRESULT SetText2([in] LONG flags, [in] BSTR str); - HRESULT UnicodeToHex(); - HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, - [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, - [in] LONG ccol); - HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); - HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, - [in] LONG type, [in] BSTR alttext, [in] IStream *stream); -} - -[ - object, - uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) -] -interface ITextSelection2 : ITextRange2 -{ -} - - [ object, uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) @@ -527,6 +466,69 @@ interface ITextSelection : ITextRange HRESULT TypeText([in]BSTR bstr); } +[ + object, + uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRange2 : ITextSelection +{ + HRESULT GetCch([retval, out] LONG *count); + HRESULT GetCells([retval, out] IUnknown **cells); + HRESULT GetColumn([retval, out] IUnknown **column); + HRESULT GetCount([retval, out] LONG *count); + HRESULT GetDuplicate2([retval, out] ITextRange2 **range); + HRESULT GetFont2([retval, out] ITextFont2 **font); + HRESULT SetFont2([in] ITextFont2 *font); + HRESULT GetFormattedText2([retval, out] ITextRange2 **range); + HRESULT SetFormattedText2([in] ITextRange2 *range); + HRESULT GetGravity([retval, out] LONG *value); + HRESULT SetGravity([in] LONG value); + HRESULT GetPara2([retval, out] ITextPara2 **para); + HRESULT SetPara2([in] ITextPara2 *para); + HRESULT GetRow([retval, out] ITextRow **row); + HRESULT GetStartPara([retval, out] LONG *value); + HRESULT GetTable([retval, out] IUnknown **table); + HRESULT GetURL([retval, out] BSTR *url); + HRESULT SetURL([in] BSTR url); + HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); + HRESULT BuildUpMath([in] LONG flags); + HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); + HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); + HRESULT GetChar2([out] LONG *ch, [in] LONG offset); + HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); + HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, + [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, + [out] LONG *ccol, [out] LONG *level); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); + HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); + HRESULT GetText2([in] LONG flags, [out] BSTR *str); + HRESULT HexToUnicode(); + HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); + HRESULT Linearize([in] LONG flags); + HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); + HRESULT SetDropCap([in] LONG line, [in] LONG pos); + HRESULT SetProperty([in] LONG type, [in] LONG value); + HRESULT SetText2([in] LONG flags, [in] BSTR str); + HRESULT UnicodeToHex(); + HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, + [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, + [in] LONG ccol); + HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); + HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, + [in] LONG type, [in] BSTR alttext, [in] IStream *stream); +} + +[ + object, + uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextSelection2 : ITextRange2 +{ +} + + [ object, uuid(8cc497c3-a1df-11ce-8098-00aa0047be5d)

1 0

Alex Henrie : gdi32/tests: Drop font test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 12, 2022

Jan. 12, 2022

Module: wine Branch: master Commit: ec72025cff2c4e46adc78bf8b648af779adef2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec72025cff2c4e46adc78bf8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 9 22:03:52 2022 -0700 gdi32/tests: Drop font test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 445 ++++++++++++++---------------------------------- 1 file changed, 132 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec72025cff2c4e46adc7…

1 0

Alex Henrie : gdi32/tests: Mark a GetTextExtentPointW test as broken on Windows 10.
by Alexandre Julliard Jan. 12, 2022

Jan. 12, 2022

Module: wine Branch: master Commit: 524dbe4bef5bb373941f884a9cd7c5db8571cb4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=524dbe4bef5bb373941f884a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 9 20:45:04 2022 -0700 gdi32/tests: Mark a GetTextExtentPointW test as broken on Windows 10. Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0c346fa5e6b..269151a1e1a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2457,7 +2457,8 @@ static void testJustification(const char *context, HDC hdc, PCSTR str, RECT *cli { /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ - ok(error[e].GetTextExtentExPointWWidth == areaWidth, + ok(error[e].GetTextExtentExPointWWidth == areaWidth || + broken(abs(areaWidth - error[e].GetTextExtentExPointWWidth) <= 2) /* win10 */, "%s: GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", context, error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); }

1 0

Rémi Bernon : dinput/tests: Check that InputReportByteLength bytes are read.
by Alexandre Julliard Jan. 12, 2022

Jan. 12, 2022

Module: wine Branch: master Commit: 352cfbcf1bb0ccaa3e887bae9178ef5c693edb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352cfbcf1bb0ccaa3e887bae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 12 17:23:57 2022 +0100 dinput/tests: Check that InputReportByteLength bytes are read. Regardless of how long the driver packet is. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index f8e8a275b09..d6232d578ca 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2110,6 +2110,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; send_hid_input( file, expect, sizeof(expect) ); @@ -2190,6 +2200,21 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value, (report_id ? 3 : 4) ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + send_hid_input( file, expect_small, sizeof(expect_small) ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == report_id ? 2 : caps.InputReportByteLength - 1, + "got length %u, expected %u\n", value, report_id ? 2 : caps.InputReportByteLength - 1 ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } @@ -2212,6 +2237,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2269,6 +2304,19 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + send_hid_input( file, expect_small, sizeof(expect_small) ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine_if( report_id ) + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); }

1 0

Stefan Brüns : d2d1/tests: Avoid out-of-bounds access when comparing segments.
by Alexandre Julliard Jan. 12, 2022

Jan. 12, 2022

Module: wine Branch: master Commit: 7aaeec35e2d7cc799461858edb788e412e9a1fbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aaeec35e2d7cc799461858e… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Fri Jan 7 21:43:58 2022 +0100 d2d1/tests: Avoid out-of-bounds access when comparing segments. In case real and expected segment count differ, don't compare the segment type/position for extra segments. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 381367bbbdc..0228ae8d52b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1248,6 +1248,7 @@ static void geometry_sink_check_(unsigned int line, const struct geometry_sink * const struct expected_geometry_figure *expected_figure; const struct geometry_figure *figure; unsigned int i, j; + unsigned int segment_count; BOOL match; ok_(__FILE__, line)(sink->fill_mode == fill_mode, @@ -1276,7 +1277,10 @@ static void geometry_sink_check_(unsigned int line, const struct geometry_sink * "Got unexpected figure %u segment count %u, expected %u.\n", i, figure->segment_count, expected_figure->segment_count); - for (j = 0; j < figure->segment_count; ++j) + segment_count = expected_figure->segment_count < figure->segment_count ? + expected_figure->segment_count : figure->segment_count; + + for (j = 0; j < segment_count; ++j) { expected_segment = &expected_figure->segments[j]; segment = &figure->segments[j]; @@ -1315,6 +1319,44 @@ static void geometry_sink_check_(unsigned int line, const struct geometry_sink * break; } } + + for (j = segment_count; j < expected_figure->segment_count; ++j) + { + segment = &expected_figure->segments[j]; + switch (segment->type) + { + case SEGMENT_LINE: + ok_(__FILE__, line)(FALSE, "Missing figure %u segment %u {%.8e, %.8e}.\n", + i, j, segment->u.line.x, segment->u.line.y); + break; + case SEGMENT_BEZIER: + ok_(__FILE__, line)(FALSE, "Missing figure %u segment %u " + "{%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}\n", + i, j, segment->u.bezier.point1.x, segment->u.bezier.point1.y, + segment->u.bezier.point2.x, segment->u.bezier.point2.y, + segment->u.bezier.point3.x, segment->u.bezier.point3.y); + break; + } + } + + for (j = segment_count; j < figure->segment_count; ++j) + { + segment = &figure->segments[j]; + switch (segment->type) + { + case SEGMENT_LINE: + ok_(__FILE__, line)(FALSE, "Got unexpected figure %u segment %u {%.8e, %.8e}.\n", + i, j, segment->u.line.x, segment->u.line.y); + break; + case SEGMENT_BEZIER: + ok_(__FILE__, line)(FALSE, "Got unexpected figure %u segment %u " + "{%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}\n", + i, j, segment->u.bezier.point1.x, segment->u.bezier.point1.y, + segment->u.bezier.point2.x, segment->u.bezier.point2.y, + segment->u.bezier.point3.x, segment->u.bezier.point3.y); + break; + } + } } }

1 0

Andrey Gusev : wined3d: Handle WINED3DSPSM_NONE in shader_sm4_read_param().
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: wine Branch: master Commit: 76c9fc8a761c9faff72f97ab508a1afcb28eeb12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76c9fc8a761c9faff72f97ab… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 10 18:05:08 2022 +0200 wined3d: Handle WINED3DSPSM_NONE in shader_sm4_read_param(). Next titles call for it Dying Light, Mortal Shell, Deus Ex: Mankind Divided, Thief (2014). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 80564641eab..5afe612da21 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1460,6 +1460,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p default: FIXME("Skipping modifier 0x%08x.\n", m); + case 0x01: *modifier = WINED3DSPSM_NONE; break; }

1 0

Stefan Dösinger : d3d10core/tests: Run test_instanced_draw() separately.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: wine Branch: master Commit: 623f8ec0b2248cc733cfac6cfcfa4d61acb2c2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623f8ec0b2248cc733cfac6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 11 16:28:18 2022 +0100 d3d10core/tests: Run test_instanced_draw() separately. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ca12f185ec5..287292ebb5f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19268,7 +19268,6 @@ START_TEST(d3d10core) queue_test(test_private_data); queue_test(test_state_refcounting); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); queue_test(test_update_subresource); @@ -19342,4 +19341,8 @@ START_TEST(d3d10core) /* There should be no reason this test can't be run in parallel with the * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ test_stream_output_vs(); + /* Same here, this test fails randomly on Win10 when run together with + * others on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot + * and Stefan's macbook. */ + test_instanced_draw(); }

1 0

Stefan Brüns : d2d1: Refactor outline generation as preparation for the new TYPE_END vertex type.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: wine Branch: master Commit: 065917d101b2f3eb9de9da03245823166a7e8ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=065917d101b2f3eb9de9da03… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Tue Jan 11 16:28:15 2022 +0100 d2d1: Refactor outline generation as preparation for the new TYPE_END vertex type. This is a preparative patch for the next change, behaviour is essentially unchanged, though it may be slightly faster. Rearrange code for outline segment and join generation so it will work for END_OPEN/END_CLOSED path, with coincident and disparate last/first vertex. Each vertex is now fetched once, and pivoted on the next iteration. Also move invariants in front of the loop, Path segments are drawn starting with the first segment, up to vertex_count - 2 (index of start vertex). Only in case of a END_CLOSED figure with non-coincident last/first vertex, also the last line segment is drawn. Joins are added between all drawn segments, and only for END_CLOSED also the join at the first vertex is added. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 100 +++++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 28414d7c9a9..7de4af5e12a 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2597,43 +2597,68 @@ static BOOL d2d_geometry_outline_add_arc_quadrant(struct d2d_geometry *geometry, static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, struct d2d_figure *figure, D2D1_FIGURE_END figure_end) { - const D2D1_POINT_2F *prev, *p0, *next; - enum d2d_vertex_type prev_type, type; - size_t bezier_idx, i; + const D2D1_POINT_2F *prev, *p0, *p1, *next, *next_prev; + size_t bezier_idx, i, vertex_count; + enum d2d_vertex_type type; + + if (!(vertex_count = figure->vertex_count)) + return TRUE; - for (i = 0, bezier_idx = 0; i < figure->vertex_count; ++i) + p0 = &figure->vertices[0]; + if (figure_end == D2D1_FIGURE_END_CLOSED) { - type = figure->vertex_types[i]; - if (type == D2D_VERTEX_TYPE_NONE) - continue; + /* In case of a CLOSED path, a join between first and last vertex is + * required. */ + if (d2d_vertex_type_is_bezier(figure->vertex_types[vertex_count - 1])) + prev = &figure->bezier_controls[figure->bezier_control_count - 1]; + else + prev = &figure->vertices[vertex_count - 1]; + } + else + { + if (!--vertex_count) + return TRUE; + prev = p0; + } - p0 = &figure->vertices[i]; + for (i = 0, bezier_idx = 0; i < vertex_count; ++i) + { + if ((type = figure->vertex_types[i]) == D2D_VERTEX_TYPE_NONE) + { + prev = next_prev = &figure->vertices[i]; + continue; + } - if (!i) + /* next: tangent along next segment, at p0. + * p1: next vertex. */ + if (d2d_vertex_type_is_bezier(type)) { - prev_type = figure->vertex_types[figure->vertex_count - 1]; - if (d2d_vertex_type_is_bezier(prev_type)) - prev = &figure->bezier_controls[figure->bezier_control_count - 1]; - else - prev = &figure->vertices[figure->vertex_count - 1]; + next_prev = next = &figure->bezier_controls[bezier_idx++]; + /* type BEZIER implies i + 1 < figure->vertex_count. */ + p1 = &figure->vertices[i + 1]; + + if (!d2d_geometry_outline_add_bezier_segment(geometry, p0, next, p1)) + { + ERR("Failed to add bezier segment.\n"); + return FALSE; + } } else { - prev_type = figure->vertex_types[i - 1]; - if (d2d_vertex_type_is_bezier(prev_type)) - prev = &figure->bezier_controls[bezier_idx - 1]; + if (i + 1 == figure->vertex_count) + next = p1 = &figure->vertices[0]; else - prev = &figure->vertices[i - 1]; - } + next = p1 = &figure->vertices[i + 1]; + next_prev = p0; - if (d2d_vertex_type_is_bezier(type)) - next = &figure->bezier_controls[bezier_idx++]; - else if (i == figure->vertex_count - 1) - next = &figure->vertices[0]; - else - next = &figure->vertices[i + 1]; + if (!d2d_geometry_outline_add_line_segment(geometry, p0, p1)) + { + ERR("Failed to add line segment.\n"); + return FALSE; + } + } - if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) + if (i || figure_end == D2D1_FIGURE_END_CLOSED) { D2D1_POINT_2F q_next, q_prev; @@ -2650,27 +2675,8 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, } } - if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) - && !d2d_geometry_outline_add_line_segment(geometry, p0, next)) - { - ERR("Failed to add line segment.\n"); - return FALSE; - } - else if (d2d_vertex_type_is_bezier(type)) - { - const D2D1_POINT_2F *p2; - - if (i == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[i + 1]; - - if (!d2d_geometry_outline_add_bezier_segment(geometry, p0, next, p2)) - { - ERR("Failed to add bezier segment.\n"); - return FALSE; - } - } + p0 = p1; + prev = next_prev; } return TRUE;

1 0

Stefan Brüns : d2d1: Remove extraneous checks for last vertex.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: wine Branch: master Commit: ee59534f9c134b1fb5817f5b77e147e21533670e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee59534f9c134b1fb5817f5b… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Tue Jan 11 16:28:17 2022 +0100 d2d1: Remove extraneous checks for last vertex. The very last vertex of a figure can only be a of type LINE (non-coincident last/first vertices) or type END (otherwise). In case the current vertex starts a Bézier path, there is always at least one more vertex, i.e. (vertex_idx + 1) < vertex_count is always true. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 20325b0fb18..46bfd488a7b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2007,8 +2007,6 @@ static BOOL d2d_geometry_intersect_bezier_line(struct d2d_geometry *geometry, p[0] = &figure->vertices[idx_p->vertex_idx]; p[1] = &figure->bezier_controls[idx_p->control_idx]; next = idx_p->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; figure = &geometry->u.path.figures[idx_q->figure_idx]; @@ -2085,16 +2083,12 @@ static BOOL d2d_geometry_intersect_bezier_bezier(struct d2d_geometry *geometry, p[0] = &figure->vertices[idx_p->vertex_idx]; p[1] = &figure->bezier_controls[idx_p->control_idx]; next = idx_p->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; figure = &geometry->u.path.figures[idx_q->figure_idx]; q[0] = &figure->vertices[idx_q->vertex_idx]; q[1] = &figure->bezier_controls[idx_q->control_idx]; next = idx_q->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; q[2] = &figure->vertices[next]; d2d_rect_get_bezier_segment_bounds(&p_bounds, p[0], p[1], p[2], start_p, end_p); @@ -2178,8 +2172,6 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, p[0] = &figure->vertices[inter->vertex_idx + vertex_offset]; p[1] = &figure->bezier_controls[inter->control_idx + control_offset]; next = inter->vertex_idx + vertex_offset + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; d2d_point_lerp(&q[0], p[0], p[1], t); @@ -3016,18 +3008,12 @@ static BOOL d2d_geometry_check_bezier_overlap(struct d2d_geometry *geometry, figure = &geometry->u.path.figures[idx_p->figure_idx]; a[0] = &figure->vertices[idx_p->vertex_idx]; a[1] = &figure->bezier_controls[idx_p->control_idx]; - if (idx_p->vertex_idx == figure->vertex_count - 1) - a[2] = &figure->vertices[0]; - else - a[2] = &figure->vertices[idx_p->vertex_idx + 1]; + a[2] = &figure->vertices[idx_p->vertex_idx + 1]; figure = &geometry->u.path.figures[idx_q->figure_idx]; b[0] = &figure->vertices[idx_q->vertex_idx]; b[1] = &figure->bezier_controls[idx_q->control_idx]; - if (idx_q->vertex_idx == figure->vertex_count - 1) - b[2] = &figure->vertices[0]; - else - b[2] = &figure->vertices[idx_q->vertex_idx + 1]; + b[2] = &figure->vertices[idx_q->vertex_idx + 1]; if (d2d_point_ccw(a[0], a[1], a[2]) == 0.0f || d2d_point_ccw(b[0], b[1], b[2]) == 0.0f) return FALSE; @@ -3097,9 +3083,6 @@ static float d2d_geometry_bezier_ccw(struct d2d_geometry *geometry, const struct const struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; size_t next = idx->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; - return d2d_point_ccw(&figure->vertices[idx->vertex_idx], &figure->bezier_controls[idx->control_idx], &figure->vertices[next]); } @@ -3115,8 +3098,6 @@ static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struc p[0] = &figure->vertices[idx->vertex_idx]; p[1] = &figure->bezier_controls[idx->control_idx]; next = idx->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; d2d_point_lerp(&q[0], p[0], p[1], 0.5f);

1 0

Stefan Brüns : d2d1: Use the TYPE_END vertex type when last/first vertices coincide.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: wine Branch: master Commit: b92b6c29298805abd18a3c7ea0f7905099af572d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b92b6c29298805abd18a3c7e… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Tue Jan 11 16:28:16 2022 +0100 d2d1: Use the TYPE_END vertex type when last/first vertices coincide. When the last vertex is coincident with the first vertex, the last segment should be suppressed for both END_OPEN and END_CLOSED. Only when last and first vertex are not coincident the additional line segment may be added - always for intersection tests and similar, and for stroking operations when the figure is CLOSED. Trying to use an zero-length segment in d2d_geometry_intersect_self() will create invalid segments, causing infinite loops later. Instead of reducing the vertex_count for coincident first/last vertices add a dedicated type. This is required as some operations need the last segment, others do not. This also allows to remove some replicated code in StrokeContains()/GetBounds()/Simplify(), as a last Bézier segment is always processed in the regular loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 105 +++++++++++++++---------------------------------- dlls/d2d1/tests/d2d1.c | 16 +++++++- 2 files changed, 46 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b92b6c29298805abd18a…

1 0