- Wine-Devel - list.winehq.org

[tools] testbot/SetWinLocale: Windows omits the country for some locales.
by Francois Gouget Jan. 11, 2022

Jan. 11, 2022

For instance one finds the hi-IN information in the "User Profile\hi" subkey. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b2da673eda..a6e95a2758 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -663,6 +663,12 @@ sub GetWinKeyboardIds($) # Look for that locale's keyboard id. # Its first component is the locale's LCID. my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + if (!%$Values) + { + my $Lang = $Locale; + $Lang =~ s/-.*$//; + $Values = RegGetValues("$HKCU_USER_PROFILE\\$Lang", "*:*"); + } foreach my $VName (keys %$Values) { next if ($VName !~ /^[0-9A-F]{4}:/); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Add the en-US keyboard layout.
by Francois Gouget Jan. 11, 2022

Jan. 11, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c8f681a001..c62d663335 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -190,7 +190,7 @@ my %Keyboards = ( "dv-MV" => ["0465:00000465"], # Divehi - Maldives "el-GR" => ["0408:00000408"], # Greek - Greece "en-GB" => ["0809:00000809"], # English - Great Britain - "en-US" => undef, # English - United States + "en-US" => ["0409:00000409"], # English - United States "es-ES" => ["0c0a:0000040a"], # Spanish - Spain "et-EE" => ["0425:00000425"], # Estonian - Estonia "eu-ES" => ["042d:0000040a"], # Basque - Basque -- 2.30.2

1 0

[tools 1/2] testbot/TestAgent: Simplify running and waiting for a remote command.
by Francois Gouget Jan. 11, 2022

Jan. 11, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 0aa59da573..fea7e650e1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1354,6 +1354,30 @@ sub Wait($$$;$) return $Result; } +=pod +=over 12 + +=item C<RunAndWait()> + +Starts the specified command and waits for it to complete, returning its exit +code or a negative value if running or waiting for it failed. + +Note: The TestAgent-side error codes make it so that in most cases any non-zero + return value indicates that the command did not run successfully. + +=back +=cut + +sub RunAndWait($$$;$$$$$) +{ + my ($self, $Argv, $Flags, $WaitTimeout, $ServerInPath, $ServerOutPath, $ServerErrPath, $Keepalive) = @_; + + my $Pid = $self->Run($Argv, $Flags, $ServerInPath, $ServerOutPath, $ServerErrPath); + return -1 if (!$Pid); + my $Ret = $self->Wait($Pid, $WaitTimeout, $Keepalive); + return defined $Ret ? $Ret : -2; +} + sub Rm($@) { my $self = shift @_; -- 2.30.2

1 1

[PATCH 6/7] d2d1: Remove extraneous checks for last vertex.
by Henri Verbeet Jan. 11, 2022

Jan. 11, 2022

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> 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> --- This supersedes patch 223225. v3: Resend. 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); -- 2.30.2

2 1

[PATCH 5/7] d2d1: Use the TYPE_END vertex type when last/first vertices coincide.
by Henri Verbeet Jan. 11, 2022

Jan. 11, 2022

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> 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> --- This supersedes patches 223221 and 223224. v3: Merge patches 223221 and 223224, minor style changes. dlls/d2d1/geometry.c | 105 +++++++++++++---------------------------- dlls/d2d1/tests/d2d1.c | 16 ++++++- 2 files changed, 46 insertions(+), 75 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 7de4af5e12a..20325b0fb18 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -50,6 +50,7 @@ enum d2d_vertex_type D2D_VERTEX_TYPE_LINE, D2D_VERTEX_TYPE_BEZIER, D2D_VERTEX_TYPE_SPLIT_BEZIER, + D2D_VERTEX_TYPE_END, }; struct d2d_segment_idx @@ -2219,7 +2220,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) idx_p.control_idx = 0; for (idx_p.vertex_idx = 0; idx_p.vertex_idx < figure_p->vertex_count; ++idx_p.vertex_idx) { - type_p = figure_p->vertex_types[idx_p.vertex_idx]; + if ((type_p = figure_p->vertex_types[idx_p.vertex_idx]) == D2D_VERTEX_TYPE_END) + continue; + for (idx_q.figure_idx = 0; idx_q.figure_idx <= idx_p.figure_idx; ++idx_q.figure_idx) { figure_q = &geometry->u.path.figures[idx_q.figure_idx]; @@ -2227,7 +2230,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { if (!d2d_rect_check_overlap(&figure_p->bounds, &figure_q->bounds)) continue; - max_q = figure_q->vertex_count; + if ((max_q = figure_q->vertex_count) + && figure_q->vertex_types[max_q - 1] == D2D_VERTEX_TYPE_END) + --max_q; } else { @@ -2607,6 +2612,9 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, p0 = &figure->vertices[0]; if (figure_end == D2D1_FIGURE_END_CLOSED) { + if (figure->vertex_types[vertex_count - 1] == D2D_VERTEX_TYPE_END && !--vertex_count) + return TRUE; + /* 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])) @@ -2921,13 +2929,14 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa } figure = &geometry->u.path.figures[geometry->u.path.figure_count - 1]; - figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; + if (memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) + figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; + else + figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_END; if (figure_end == D2D1_FIGURE_END_CLOSED) { ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; - if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) - --figure->vertex_count; } if (!d2d_geometry_add_figure_outline(geometry, figure, figure_end)) @@ -3476,14 +3485,6 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) continue; - /* Single vertex figures are reduced by CloseFigure(). */ - if (figure->vertex_count == 0) - { - d2d_point_transform(&p, transform, figure->bounds.left, figure->bounds.top); - d2d_rect_expand(bounds, &p); - continue; - } - for (j = 0; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE) @@ -3498,8 +3499,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3537,26 +3540,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * break; } - type = figure->vertex_types[j]; - } - - if (d2d_vertex_type_is_bezier(type)) - { - /* FIXME: This attempts to approximate a cubic Bézier with - * a quadratic one. */ - p1 = figure->original_bezier_controls[bezier_idx++]; - d2d_point_transform(&p1, transform, p1.x, p1.y); - p2 = figure->original_bezier_controls[bezier_idx++]; - d2d_point_transform(&p2, transform, p2.x, p2.y); - p1.x = (p1.x + p2.x) * 0.75f; - p1.y = (p1.y + p2.y) * 0.75f; - p2 = figure->vertices[0]; - d2d_point_transform(&p2, transform, p2.x, p2.y); - p1.x -= (p.x + p2.x) * 0.25f; - p1.y -= (p.y + p2.y) * 0.25f; - - d2d_rect_get_bezier_bounds(&bezier_bounds, &p, &p1, &p2); - d2d_rect_union(bounds, &bezier_bounds); + type = next_type; } } @@ -3619,8 +3603,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3646,25 +3632,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path } if (*contains) return S_OK; - type = figure->vertex_types[j]; + type = next_type; } - if (figure->flags & D2D_FIGURE_FLAG_CLOSED && (!*contains)) + if (type == D2D_VERTEX_TYPE_LINE) { - if (type == D2D_VERTEX_TYPE_LINE) - { - p1 = figure->vertices[0]; + p1 = figure->vertices[0]; + if (figure->flags & D2D_FIGURE_FLAG_CLOSED) *contains = d2d_point_on_line_segment(&point, &p, &p1, transform, stroke_width * 0.5f, tolerance); - p = p1; - } - else if (d2d_vertex_type_is_bezier(type)) - { - b.point1 = figure->original_bezier_controls[bezier_idx++]; - b.point2 = figure->original_bezier_controls[bezier_idx++]; - b.point3 = figure->vertices[0]; - *contains = d2d_point_on_bezier_segment(&point, &p, &b, transform, stroke_width, tolerance); - p = b.point3; - } } if (*contains) @@ -3787,8 +3762,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3827,25 +3804,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i break; } - type = figure->vertex_types[j]; - } - - if (d2d_vertex_type_is_bezier(type)) - { - b.point1 = figure->original_bezier_controls[bezier_idx++]; - b.point2 = figure->original_bezier_controls[bezier_idx++]; - b.point3 = figure->vertices[0]; - if (transform) - { - d2d_point_transform(&b.point1, transform, b.point1.x, b.point1.y); - d2d_point_transform(&b.point2, transform, b.point2.x, b.point2.y); - d2d_point_transform(&b.point3, transform, b.point3.x, b.point3.y); - } - - if (option == D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES) - d2d_geometry_flatten_cubic(sink, &p, &b, tolerance); - else - ID2D1SimplifiedGeometrySink_AddBeziers(sink, &b, 1); + type = next_type; } end = figure->flags & D2D_FIGURE_FLAG_CLOSED ? D2D1_FIGURE_END_CLOSED : D2D1_FIGURE_END_OPEN; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ae3167ea1bb..381367bbbdc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3856,6 +3856,18 @@ static void test_path_geometry(BOOL d3d11) hr = ID2D1PathGeometry_Open(geometry, &sink); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + set_point(&point, 20.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 40.0f, 100.0f); + quadratic_to(sink, 40.0f, 65.0f, 20.0f, 80.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + + set_point(&point, 80.0f, 20.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 60.0f, 40.0f); + quadratic_to(sink, 95.0f, 40.0f, 80.0f, 20.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + set_point(&point, 120.0f, 180.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); line_to(sink, 140.0f, 160.0f); @@ -3875,7 +3887,7 @@ static void test_path_geometry(BOOL d3d11) set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - match = compare_rect(&rect, 115.5f, 110.0f, 180.0f, 180.0f, 1); + match = compare_rect(&rect, 20.0f, 20.0f, 180.0f, 180.0f, 0); ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); @@ -3883,7 +3895,7 @@ static void test_path_geometry(BOOL d3d11) hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 2, &expected_figures[31], 1); + geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[29], 1); geometry_sink_cleanup(&simplify_sink); ID2D1PathGeometry_Release(geometry); -- 2.30.2

2 1

[PATCH 2/7] d2d1/tests: Add a test for single quadratic Bézier segment.
by Henri Verbeet Jan. 11, 2022

Jan. 11, 2022

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Extra test for outline generation code, path with only 2 vertices. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223220. v3: Use power-of-two tolerances. dlls/d2d1/tests/d2d1.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2d9bcfc892e..a165c67db2a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6879,6 +6879,45 @@ static void test_draw_geometry(BOOL d3d11) "AiWaAiScAiKdAiGeAh+hAhyjAhmuAg3GxgEA"); ok(match, "Figure does not match.\n"); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + set_point(&point, 20.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, 20.0f, 160.0f, 60.0f, 160.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 100.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, 100.0f, 160.0f, 140.0f, 160.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + + hr = ID2D1GeometrySink_Close(sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 10.0f, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 32, + "3iUCngEEnAEGmgEImAEKlgEMlAEOkgEQkAESjgEUjAEWigEYiAEahgEchAEeggEggQEhfyN9JXsn" + "eih4KnYUAhZ1FAMWcxQFFnIUBhZwFQcWbxQJFm4UChZsFQsWaxUMFmoVDRZpFQ4WaBUPFmcVEBZm" + "FREWZhURFmUVEhZkFhIWZBYSFmQXERZkFxEWZBgQFmQaDhZlGwwWZh0JFmchBBZpOWw2bzN0Lnsn" + "2mEA"); + ok(match, "Figure does not match.\n"); + + match = compare_figure(&ctx, 160, 0, 160, 160, 0xff652e89, 32, + "njIUjAEUjAEUjAEUjAEUjAEUjQEUjAEUjAEUjAEUjQEUjAEUjAEUjQEUjAEUjQEUjAEVjAEUjQEU" + "jAEVjAEVjAEVjAEVjAEVjAEVjAEVjQEVjAEVjAEWjAEWjAEXiwEXiwEYigEaiQEbiAEdhgEhgwEz" + "ci53KX4ihwEZ6GEA"); + ok(match, "Figure does not match.\n"); + ID2D1SolidColorBrush_Release(brush); ID2D1Factory_Release(factory); release_test_context(&ctx); -- 2.30.2

2 1

False positives? - Re: TestBot job 104977 - results: [PATCH 1/8] d2d1/tests: Test StrokeContains when last segment is bezier and closes the path
by Stefan Brüns Jan. 11, 2022

Jan. 11, 2022

On Freitag, 7. Januar 2022 09:50:08 CET you wrote: > VM Status Failures Command > build success > w7u_2qxl success 0 d2d1_test.exe d2d1 > w7u_adm success 0 d2d1_test.exe d2d1 > w7u_el success 0 d2d1_test.exe d2d1 > w8 success 0 d2d1_test.exe d2d1 > w8adm success 0 d2d1_test.exe d2d1 > w864 success 0 d2d1_test.exe d2d1 > w1064v1507 success 0 d2d1_test.exe d2d1 > w1064v1809 success 0 d2d1_test.exe d2d1 > w1064 success 0 d2d1_test.exe d2d1 > w1064_tsign success 0 d2d1_test.exe d2d1 > w10pro64 success 0 d2d1_test.exe d2d1 > w864 success 0 d2d1_test64.exe d2d1 > w1064v1507 success 0 d2d1_test64.exe d2d1 > w1064v1809 success 0 d2d1_test64.exe d2d1 > w1064 success 0 d2d1_test64.exe d2d1 > w1064_2qxl success 0 d2d1_test64.exe d2d1 > w1064_tsign success 0 d2d1_test64.exe d2d1 > w10pro64 success 0 d2d1_test64.exe d2d1 > w10pro64_ar success 0 d2d1_test64.exe d2d1 > w10pro64_he success 0 d2d1_test64.exe d2d1 > w10pro64_ja success 0 d2d1_test64.exe d2d1 > w10pro64_zh_CN success 0 d2d1_test64.exe d2d1 > debian11 failed 63 > debian11 failed 16 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=104977 > > > === debian11 (32 bit report) === > > d2d1: > d2d1.c:6664: Test failed: Figure does not match. > d2d1.c:6672: Test failed: Figure does not match. > d2d1.c:6680: Test failed: Figure does not match. > d2d1.c:6688: Test failed: Figure does not match. > d2d1.c:6672: Test failed: Figure does not match. > d2d1.c:6680: Test failed: Figure does not match. > d2d1.c:6688: Test failed: Figure does not match. As this patch just adds another testcase, it seems somewhat unlikely it introduces new regressions in unrelated tests. It seems like the my previous patch got applied (which would match the 4 regressions noted), but the patch.diff from the test bot tells something else. Is this possible? I had tested this against rc4 and had no new test failures. As d2d was unchanged since rc1 this should be sufficient. Visual inspection of the results on my machine (teached the tests to dump result and reference as PBM) also looks good. Unfortunately, the tests are only run with WINETEST_DEBUG=1, and the relevant output is suppressed in the logs. Kind regards, Stefan -- Stefan Brüns / Bergstraße 21 / 52062 Aachen home: +49 241 53809034 mobile: +49 151 50412019

2 2

[PATCH 1/2] d3d11/tests: Run test_instanced_draw separately.
by Stefan Dösinger Jan. 11, 2022

Jan. 11, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- There are more random test failures in d3d11 and d3d10core that I am trying to isolate, including one that cases a segfault. test_stream_output_vs() is suspicious as well, we already separate it in d3d10core. --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8fa462dc39..2dfb1cc0bf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34001,7 +34001,6 @@ START_TEST(d3d11) queue_test(test_scissor); queue_test(test_clear_state); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_vertex_id); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); @@ -34116,4 +34115,9 @@ START_TEST(d3d11) queue_test(test_dynamic_map_synchronization); 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. */ + test_instanced_draw(); } -- 2.34.1

2 2

[PATCH 1/2] d3d11/tests: Run test_instanced_draw separately.
by Stefan Dösinger Jan. 11, 2022

Jan. 11, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- There are more random test failures in d3d11 and d3d10core that I am trying to isolate, including one that cases a segfault. test_stream_output_vs() is suspicious as well, we already separate it in d3d10core. --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8fa462dc39..2dfb1cc0bf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34001,7 +34001,6 @@ START_TEST(d3d11) queue_test(test_scissor); queue_test(test_clear_state); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_vertex_id); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); @@ -34116,4 +34115,9 @@ START_TEST(d3d11) queue_test(test_dynamic_map_synchronization); 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. */ + test_instanced_draw(); } -- 2.34.1

3 3

[PATCH] wined3d: Handle WINED3DSPSM_NONE in shader_sm4_read_param().
by Andrey Gusev Jan. 11, 2022

Jan. 11, 2022

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> --- 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; } -- 2.34.1

2 1