[PATCH 0/3] MR9904: d2d1/tests: Add a test for default stroke transform type.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9904
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 65f4f9336f2..dca2c9cf3b3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7505,6 +7505,7 @@ static void test_stroke_style(BOOL d3d11) }; D2D1_STROKE_STYLE_PROPERTIES desc; struct d2d1_test_context ctx; + ID2D1StrokeStyle1 *style1; ID2D1StrokeStyle *style; UINT32 count; HRESULT hr; @@ -7628,6 +7629,29 @@ static void test_stroke_style(BOOL d3d11) ID2D1StrokeStyle_Release(style); + if (ctx.factory1) + { + D2D1_STROKE_TRANSFORM_TYPE transform_type; + + hr = ID2D1Factory_CreateStrokeStyle(ctx.factory, &desc, NULL, 0, &style); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1StrokeStyle_QueryInterface(style, &IID_ID2D1StrokeStyle1, (void **)&style1); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + transform_type = ID2D1StrokeStyle1_GetStrokeTransformType(style1); + ok(transform_type == D2D1_STROKE_TRANSFORM_TYPE_NORMAL, "Unexpected type %u.\n", transform_type); + + ID2D1StrokeStyle1_Release(style1); + } + ID2D1StrokeStyle_Release(style); + } + else + win_skip("ID2D1StrokeStyle1 is not supported.\n"); + release_test_context(&ctx); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9904
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/d2d1/stroke.c | 3 ++- dlls/d2d1/tests/d2d1.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index fc12d4eb972..140ba257986 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -29,7 +29,8 @@ static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyl { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1StrokeStyle) + if (IsEqualGUID(iid, &IID_ID2D1StrokeStyle1) + || IsEqualGUID(iid, &IID_ID2D1StrokeStyle) || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index dca2c9cf3b3..30ac31c2620 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7637,16 +7637,12 @@ static void test_stroke_style(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1StrokeStyle_QueryInterface(style, &IID_ID2D1StrokeStyle1, (void **)&style1); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { transform_type = ID2D1StrokeStyle1_GetStrokeTransformType(style1); ok(transform_type == D2D1_STROKE_TRANSFORM_TYPE_NORMAL, "Unexpected type %u.\n", transform_type); ID2D1StrokeStyle1_Release(style1); - } ID2D1StrokeStyle_Release(style); } else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9904
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 99 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 30ac31c2620..1821f4f4e3e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -17574,6 +17574,104 @@ static void test_path_geometry_stream(BOOL d3d11) release_test_context(&ctx); } +static void test_transformed_geometry(BOOL d3d11) +{ + ID2D1TransformedGeometry *geometry, *geometry2; + ID2D1PathGeometry *path_geometry; + struct d2d1_test_context ctx; + D2D1_MATRIX_3X2_F matrix; + ID2D1GeometrySink *sink; + D2D1_POINT_2F point; + D2D1_RECT_F bounds; + BOOL match; + float area; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1Factory_CreatePathGeometry(ctx.factory, &path_geometry); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Path geometry hasn't been populated yet. */ + set_matrix_identity(&matrix); + translate_matrix(&matrix, 240.0f, 720.0f); + hr = ID2D1Factory_CreateTransformedGeometry(ctx.factory, (ID2D1Geometry *)path_geometry, + &matrix, &geometry); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + translate_matrix(&matrix, 240.0f, 720.0f); + hr = ID2D1Factory_CreateTransformedGeometry(ctx.factory, (ID2D1Geometry *)geometry, + &matrix, &geometry2); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&bounds, 1.0f, 2.0f, 3.0f, 4.0f); + hr = ID2D1TransformedGeometry_GetBounds(geometry, NULL, &bounds); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + match = compare_rect(&bounds, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom); + } + + set_rect(&bounds, 1.0f, 2.0f, 3.0f, 4.0f); + hr = ID2D1TransformedGeometry_GetBounds(geometry2, NULL, &bounds); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + match = compare_rect(&bounds, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom); + } + + set_rect(&bounds, 1.0f, 2.0f, 3.0f, 4.0f); + hr = ID2D1PathGeometry_GetBounds(path_geometry, NULL, &bounds); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + match = compare_rect(&bounds, 1.0f, 2.0f, 3.0f, 4.0f, 0); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom); + + area = 123.0f; + hr = ID2D1TransformedGeometry_ComputeArea(geometry, NULL, 1.0f, &area); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(area == 0.0f, "Unexpected value %.8e.\n", area); + + area = 123.0f; + hr = ID2D1TransformedGeometry_ComputeArea(geometry2, NULL, 1.0f, &area); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(area == 0.0f, "Unexpected value %.8e.\n", area); + + hr = ID2D1PathGeometry_Open(path_geometry, &sink); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_point(&point, 0.0f, 0.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 10.0f, 10.0f); + line_to(sink, 0.0f, 10.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1GeometrySink_Release(sink); + + area = 0.0f; + hr = ID2D1TransformedGeometry_ComputeArea(geometry, NULL, 0.0f, &area); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(area > 0.0f, "Unexpected value %.8e.\n", area); + + area = 0.0f; + hr = ID2D1TransformedGeometry_ComputeArea(geometry2, NULL, 0.0f, &area); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(area > 0.0f, "Unexpected value %.8e.\n", area); + + ID2D1TransformedGeometry_Release(geometry2); + ID2D1TransformedGeometry_Release(geometry); + ID2D1PathGeometry_Release(path_geometry); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -17695,6 +17793,7 @@ START_TEST(d2d1) queue_test(test_mesh); queue_test(test_geometry_realization); queue_d3d10_test(test_path_geometry_stream); + queue_d3d10_test(test_transformed_geometry); run_queued_tests(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9904
participants (2)
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)