Commit 064edf1d authored by Alexandre Julliard's avatar Alexandre Julliard

d2d1/tests: Skip subsequent todo tests for unsupported properties.

This reduces the number of printed todos in order to stay within the 32kB limit.
parent 2d885036
......@@ -10416,13 +10416,15 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect, BOO
name[0] = 0;
hr = ID2D1Effect_GetPropertyName(effect, test->index, name, sizeof(name));
todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING)))
{
ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr);
if (hr == D2DERR_INVALID_PROPERTY)
{
winetest_pop_context();
continue;
}
ok_(__FILE__, line)(!wcscmp(name, test->name), "Got unexpected property name %s, expected %s.\n",
debugstr_w(name), debugstr_w(test->name));
}
type = D2D1_PROPERTY_TYPE_UNKNOWN;
type = ID2D1Effect_GetType(effect, test->index);
todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING)))
ok_(__FILE__, line)(type == test->type, "Got unexpected property type %#x, expected %#x.\n",
......@@ -11743,6 +11745,12 @@ static void test_effect_2d_affine(BOOL d3d11)
D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix));
todo_wine
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (hr == D2DERR_INVALID_PROPERTY)
{
ID2D1Bitmap1_Release(bitmap);
winetest_pop_context();
continue;
}
ID2D1Effect_GetOutput(effect, &output);
ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds);
......@@ -11858,6 +11866,12 @@ static void test_effect_crop(BOOL d3d11)
(const BYTE *)&test->crop_rect, sizeof(test->crop_rect));
todo_wine
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (hr == D2DERR_INVALID_PROPERTY)
{
ID2D1Bitmap1_Release(bitmap);
winetest_pop_context();
continue;
}
ID2D1Effect_GetOutput(effect, &output);
set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment