January 2022 - Wine-commits

Rémi Bernon : server: Return error when hardware message is too large.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 095204a9f3bab7a85a96f002ccf5754894502659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095204a9f3bab7a85a96f002… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 12 17:23:59 2022 +0100 server: Return error when hardware message is too large. So that the client allocates a larger receive buffer when needed and not trigger the assert below when setting the reply message data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/queue.c b/server/queue.c index f7bc28f39e9..4f69a082b74 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2145,6 +2145,14 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user clear_bits &= ~get_hardware_msg_bit( msg ); continue; } + + reply->total = msg->data_size; + if (msg->data_size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_OVERFLOW ); + return 1; + } + /* now we can return it */ if (!msg->unique_id) msg->unique_id = get_unique_id(); reply->type = MSG_HARDWARE;

1 0

Rémi Bernon : hidclass.sys: Always read InputReportByteLength bytes when not polling.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 9479e217b8a9d5fd71cf7b24953dd2ece786de04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9479e217b8a9d5fd71cf7b24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 12 17:24:00 2022 +0100 hidclass.sys: Always read InputReportByteLength bytes when not polling. This fixes several games (e.g. ICEY) not working well with DS4 gamepad over bluetooth, as we fixup the input report sizes, and the game expects them to be longer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 1 - dlls/hidclass.sys/device.c | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index d6232d578ca..a0fd2f6c660 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2314,7 +2314,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle 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 ); diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index dd288a82b67..0744865f8f7 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -53,15 +53,16 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } -static struct hid_report *hid_report_create( HID_XFER_PACKET *packet ) +static struct hid_report *hid_report_create( HID_XFER_PACKET *packet, ULONG length ) { struct hid_report *report; - if (!(report = malloc( offsetof( struct hid_report, buffer[packet->reportBufferLen] ) ))) + if (!(report = malloc( offsetof( struct hid_report, buffer[length] ) ))) return NULL; report->ref = 1; - report->length = packet->reportBufferLen; - memcpy( report->buffer, packet->reportBuffer, report->length ); + report->length = length; + memcpy( report->buffer, packet->reportBuffer, packet->reportBufferLen ); + memset( report->buffer + packet->reportBufferLen, 0, length - packet->reportBufferLen ); return report; } @@ -218,18 +219,19 @@ static struct hid_report *hid_queue_pop_report( struct hid_queue *queue ) static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *packet ) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; const BOOL polled = ext->u.pdo.information.Polled; + ULONG size, report_len = polled ? packet->reportBufferLen : desc->InputLength; struct hid_report *last_report, *report; struct hid_queue *queue; LIST_ENTRY completed, *entry; RAWINPUT *rawinput; - ULONG size; KIRQL irql; IRP *irp; if (IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) { - size = offsetof( RAWINPUT, data.hid.bRawData[packet->reportBufferLen] ); + size = offsetof( RAWINPUT, data.hid.bRawData[report_len] ); if (!(rawinput = malloc( size ))) ERR( "Failed to allocate rawinput data!\n" ); else { @@ -240,8 +242,9 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack rawinput->header.hDevice = ULongToHandle( ext->u.pdo.rawinput_handle ); rawinput->header.wParam = RIM_INPUT; rawinput->data.hid.dwCount = 1; - rawinput->data.hid.dwSizeHid = packet->reportBufferLen; + rawinput->data.hid.dwSizeHid = report_len; memcpy( rawinput->data.hid.bRawData, packet->reportBuffer, packet->reportBufferLen ); + memset( rawinput->data.hid.bRawData + packet->reportBufferLen, 0, report_len - packet->reportBufferLen ); input.type = INPUT_HARDWARE; input.hi.uMsg = WM_INPUT; @@ -253,7 +256,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack } } - if (!(last_report = hid_report_create( packet ))) + if (!(last_report = hid_report_create( packet, report_len ))) { ERR( "Failed to allocate hid_report!\n" ); return;

1 0

Stefan Dösinger : d3d10core/tests: Run test_generate_mips separately.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: b7808643c51eb4373818b7d50242add9cb3da234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7808643c51eb4373818b7d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 12 11:34:36 2022 +0300 d3d10core/tests: Run test_generate_mips 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 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 287292ebb5f..ffab5cbfca3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19319,7 +19319,6 @@ START_TEST(d3d10core) queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); - queue_test(test_generate_mips); queue_test(test_alpha_to_coverage); queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); @@ -19338,11 +19337,10 @@ START_TEST(d3d10core) run_queued_tests(); - /* 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) */ + /* There should be no reason these tests can't be run in parallel with the + * others, yet they randomly fail or crash when doing so. + * (AMD Radeon HD 6310, Radeon 560, Windows 7 and Windows 10) */ 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(); + test_generate_mips(); }

1 0

Stefan Dösinger : d3d11/tests: Run test_generate_mips separately.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: dd1a3213026b727cedba8e7efbba8902a11449d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1a3213026b727cedba8e7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 12 11:34:37 2022 +0300 d3d11/tests: Run test_generate_mips 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/d3d11/tests/d3d11.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2dfb1cc0bf5..0d91d828676 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34088,7 +34088,6 @@ START_TEST(d3d11) test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); - queue_test(test_generate_mips); queue_test(test_alpha_to_coverage); queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); @@ -34116,8 +34115,9 @@ START_TEST(d3d11) run_queued_tests(); - /* 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. */ + /* There should be no reason these tests can't be run in parallel with the + * others, yet they randomly fail or crash when doing so. + * (Radeon 560, Windows 10) */ test_instanced_draw(); + test_generate_mips(); }

1 0

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

12 Jan '22

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 11 Jan '22

11 Jan '22

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 Brüns : d2d1: Refactor outline generation as preparation for the new TYPE_END vertex type.
by Alexandre Julliard 11 Jan '22

11 Jan '22

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: Use the TYPE_END vertex type when last/first vertices coincide.
by Alexandre Julliard 11 Jan '22

11 Jan '22

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

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

11 Jan '22

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 Dösinger : d3d10core/tests: Run test_instanced_draw() separately.
by Alexandre Julliard 11 Jan '22

11 Jan '22

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