From: Alfred Agrell <floating(a)muncher.se> --- dlls/d2d1/effect.c | 39 ++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 46 +++++++++++++++++++++++++++++++++++++++++ include/d2d1effects.idl | 7 +++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 8bac19f8d7c..e1b9fb5da4f 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1602,6 +1602,44 @@ static HRESULT __stdcall blend_factory(IUnknown **effect) return d2d_effect_create_impl(effect, &properties, sizeof(properties)); } +static const WCHAR brightness_description[] = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='Brightness'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Stub'/> \ + <Property name='Description' type='string' value='Brightness'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='WhitePoint' type='vector2' /> \ + <Property name='BlackPoint' type='vector2' /> \ + </Effect>"; + +struct brightness_properties +{ + D2D_VECTOR_2F white_point; + D2D_VECTOR_2F black_point; +}; + +EFFECT_PROPERTY_RW(brightness, white_point, VECTOR2) +EFFECT_PROPERTY_RW(brightness, black_point, VECTOR2) + +static const D2D1_PROPERTY_BINDING brightness_bindings[] = +{ + { L"WhitePoint", BINDING_RW(brightness, white_point) }, + { L"BlackPoint", BINDING_RW(brightness, black_point) }, +}; + +static HRESULT __stdcall brightness_factory(IUnknown **effect) +{ + static const struct brightness_properties properties = + { + .white_point = { 1.0f, 1.0f }, + }; + return d2d_effect_create_impl(effect, &properties, sizeof(properties)); +} + void d2d_effects_init_builtins(struct d2d_factory *factory) { static const struct builtin_description @@ -1628,6 +1666,7 @@ void d2d_effects_init_builtins(struct d2d_factory *factory) { &CLSID_D2D1PointSpecular, X2(point_specular) }, { &CLSID_D2D1ArithmeticComposite, X2(arithmetic_composite) }, { &CLSID_D2D1Blend, X2(blend) }, + { &CLSID_D2D1Brightness, X2(brightness) }, #undef X2 #undef X }; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 716fbb46279..28f65dab085 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -14027,6 +14027,51 @@ static void test_effect_blend(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_brightness(BOOL d3d11) +{ + static const struct effect_property properties[] = + { + { L"WhitePoint", D2D1_BRIGHTNESS_PROP_WHITE_POINT, D2D1_PROPERTY_TYPE_VECTOR2 }, + { L"BlackPoint", D2D1_BRIGHTNESS_PROP_BLACK_POINT, D2D1_PROPERTY_TYPE_VECTOR2 }, + }; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + unsigned int count, i; + ID2D1Effect *effect; + D2D_VECTOR_2F vec; + WCHAR name[64]; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + context = ctx.context; + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Brightness, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + check_system_properties(effect); + + count = ID2D1Effect_GetPropertyCount(effect); + ok(count == 2, "Got unexpected property count %u.\n", count); + + for (i = 0; i < ARRAY_SIZE(properties); ++i) + { + hr = ID2D1Effect_GetPropertyName(effect, properties[i].index, name, 64); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(name, properties[i].name), "Unexpected name %s.\n", wine_dbgstr_w(name)); + } + + vec = effect_get_vec2_prop(effect, D2D1_BRIGHTNESS_PROP_WHITE_POINT); + ok(vec.x == 1.0f && vec.y == 1.0f, "Unexpected value {%.8e,%.8e}.\n", vec.x, vec.y); + + vec = effect_get_vec2_prop(effect, D2D1_BRIGHTNESS_PROP_BLACK_POINT); + ok(vec.x == 0.0f && vec.y == 0.0f, "Unexpected value {%.8e,%.8e}.\n", vec.x, vec.y); + + ID2D1Effect_Release(effect); + release_test_context(&ctx); +} + static void test_registered_effects(BOOL d3d11) { UINT32 ret, count, count2, count3; @@ -17410,6 +17455,7 @@ START_TEST(d2d1) queue_d3d10_test(test_effect_color_matrix); queue_test(test_effect_flood); queue_d3d10_test(test_effect_blend); + queue_d3d10_test(test_effect_brightness); queue_test(test_transform_graph); queue_test(test_offset_transform); queue_test(test_blend_transform); diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index e65520ba9f1..76ac79b0724 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -240,3 +240,10 @@ typedef enum D2D1_BLEND_PROP D2D1_BLEND_PROP_MODE = 0, D2D1_BLEND_PROP_FORCE_DWORD = 0xffffffff } D2D1_BLEND_PROP; + +typedef enum D2D1_BRIGHTNESS_PROP +{ + D2D1_BRIGHTNESS_PROP_WHITE_POINT = 0, + D2D1_BRIGHTNESS_PROP_BLACK_POINT = 1, + D2D1_BRIGHTNESS_PROP_FORCE_DWORD = 0xffffffff +} D2D1_BRIGHTNESS_PROP; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9558