[PATCH 0/1] MR6506: d2d1/tests: Add a few tests for ComputeArea().

[Nikolay Sivov (＠nsivov)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6506

[PATCH 1/1] d2d1/tests: Add a few tests for ComputeArea().

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

---
 dlls/d2d1/tests/d2d1.c | 92 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index ae0b6f51bdc..8653d2f2dcb 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -15103,6 +15103,97 @@ static void test_effect_vertex_buffer(BOOL d3d11)
     release_test_context(&ctx);
 }
 
+static void test_compute_geometry_area(BOOL d3d11)
+{
+    ID2D1RectangleGeometry *rectangle_geometry;
+    ID2D1EllipseGeometry *ellipse_geometry;
+    struct d2d1_test_context ctx;
+    D2D1_MATRIX_3X2_F matrix;
+    D2D1_ELLIPSE ellipse;
+    D2D1_RECT_F rect;
+    HRESULT hr;
+    float area;
+
+    if (!init_test_context(&ctx, d3d11))
+        return;
+
+    /* Ellipse */
+    set_ellipse(&ellipse, 0.0f, 0.0f, 10.0f, 5.0f);
+    hr = ID2D1Factory_CreateEllipseGeometry(ctx.factory, &ellipse, &ellipse_geometry);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    hr = ID2D1EllipseGeometry_ComputeArea(ellipse_geometry, NULL, 0.01f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 156.9767f, 0), "Unexpected value %.8e.\n", area);
+
+    hr = ID2D1EllipseGeometry_ComputeArea(ellipse_geometry, NULL, 200.0f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 100.0f, 0), "Unexpected value %.8e.\n", area);
+
+    set_matrix_identity(&matrix);
+    scale_matrix(&matrix, 1.0f, 2.0f);
+    hr = ID2D1EllipseGeometry_ComputeArea(ellipse_geometry, &matrix, 0.01f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 314.12088f, 0), "Unexpected value %.8e.\n", area);
+
+    hr = ID2D1EllipseGeometry_ComputeArea(ellipse_geometry, &matrix, 200.0f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 200.0f, 0), "Unexpected value %.8e.\n", area);
+
+    ID2D1EllipseGeometry_Release(ellipse_geometry);
+
+    /* Rectangle */
+    set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
+    hr = ID2D1Factory_CreateRectangleGeometry(ctx.factory, &rect, &rectangle_geometry);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    hr = ID2D1RectangleGeometry_ComputeArea(rectangle_geometry, NULL, 0.01f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 4.0f, 0), "Unexpected value %.8e.\n", area);
+
+    hr = ID2D1RectangleGeometry_ComputeArea(rectangle_geometry, NULL, 200.0f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 4.0f, 0), "Unexpected value %.8e.\n", area);
+
+    set_matrix_identity(&matrix);
+    scale_matrix(&matrix, 1.0f, 2.0f);
+    hr = ID2D1RectangleGeometry_ComputeArea(rectangle_geometry, &matrix, 0.01f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 8.0f, 0), "Unexpected value %.8e.\n", area);
+
+    rotate_matrix(&matrix, 0.5f);
+    hr = ID2D1RectangleGeometry_ComputeArea(rectangle_geometry, &matrix, 200.0f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 8.0f, 0), "Unexpected value %.8e.\n", area);
+
+    skew_matrix(&matrix, 0.1f, 1.5f);
+    hr = ID2D1RectangleGeometry_ComputeArea(rectangle_geometry, &matrix, 200.0f, &area);
+    todo_wine
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    if (hr == S_OK)
+        ok(compare_float(area, 6.8f, 0), "Unexpected value %.8e.\n", area);
+
+    ID2D1RectangleGeometry_Release(rectangle_geometry);
+
+    release_test_context(&ctx);
+}
+
 START_TEST(d2d1)
 {
     HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll");
@@ -15197,6 +15288,7 @@ START_TEST(d2d1)
     queue_test(test_get_effect_properties);
     queue_test(test_effect_custom_pixel_shader);
     queue_test(test_effect_vertex_buffer);
+    queue_test(test_compute_geometry_area);
 
     run_queued_tests();
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6506

[PATCH 1/1] d2d1/tests: Add a few tests for ComputeArea().

[Marvin]

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=148445

Your paranoid android.


=== w7u_2qxl (32 bit report) ===

d2d1:
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.

=== w7u_adm (32 bit report) ===

d2d1:
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.

=== w7u_el (32 bit report) ===

d2d1:
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.

=== w7pro64 (64 bit report) ===

d2d1:
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.
d2d1.c:15129: Test failed: Unexpected value 1.56976654e+002.
d2d1.c:15135: Test failed: Unexpected value 9.99999847e+001.
d2d1.c:15143: Test failed: Unexpected value 3.14120819e+002.
d2d1.c:15149: Test failed: Unexpected value 1.99999985e+002.