From: Alfred Agrell floating@muncher.se
--- dlls/d2d1/effect.c | 35 ++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 42 +++++++++++++++++++++++++++++++++++++++++ include/d2d1effects.idl | 6 ++++++ 3 files changed, 83 insertions(+)
diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 418dd013293..891f6fc42e4 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1718,6 +1718,40 @@ static HRESULT __stdcall hue_rotation_factory(IUnknown **effect) return d2d_effect_create_impl(effect, &properties, sizeof(properties)); }
+static const WCHAR saturation_description[] = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='Saturation'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Stub'/> \ + <Property name='Description' type='string' value='Saturation'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Saturation' type='float' /> \ + </Effect>"; + +struct saturation_properties +{ + float saturation; +}; + +EFFECT_PROPERTY_RW(saturation, saturation, FLOAT) + +static const D2D1_PROPERTY_BINDING saturation_bindings[] = +{ + { L"Saturation", BINDING_RW(saturation, saturation) }, +}; + +static HRESULT __stdcall saturation_factory(IUnknown **effect) +{ + static const struct saturation_properties properties = + { + .saturation = 0.5f, + }; + return d2d_effect_create_impl(effect, &properties, sizeof(properties)); +} + void d2d_effects_init_builtins(struct d2d_factory *factory) { static const struct builtin_description @@ -1747,6 +1781,7 @@ void d2d_effects_init_builtins(struct d2d_factory *factory) { &CLSID_D2D1Brightness, X2(brightness) }, { &CLSID_D2D1DirectionalBlur, X2(directional_blur) }, { &CLSID_D2D1HueRotation, X2(hue_rotation) }, + { &CLSID_D2D1Saturation, X2(saturation) }, #undef X2 #undef X }; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1a8790eae2a..67ac840ff25 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -14167,6 +14167,47 @@ static void test_effect_hue_rotation(BOOL d3d11) release_test_context(&ctx); }
+static void test_effect_saturation(BOOL d3d11) +{ + static const struct effect_property properties[] = + { + { L"Saturation", D2D1_SATURATION_PROP_SATURATION, D2D1_PROPERTY_TYPE_FLOAT }, + }; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + unsigned int count, i; + ID2D1Effect *effect; + WCHAR name[64]; + HRESULT hr; + float f; + + if (!init_test_context(&ctx, d3d11)) + return; + + context = ctx.context; + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Saturation, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + check_system_properties(effect); + + count = ID2D1Effect_GetPropertyCount(effect); + ok(count == 1, "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)); + } + + f = effect_get_float_prop(effect, D2D1_SATURATION_PROP_SATURATION); + ok(f == 0.5f, "got %f.\n", f); + + ID2D1Effect_Release(effect); + release_test_context(&ctx); +} + static void test_registered_effects(BOOL d3d11) { UINT32 ret, count, count2, count3; @@ -17553,6 +17594,7 @@ START_TEST(d2d1) queue_d3d10_test(test_effect_brightness); queue_d3d10_test(test_effect_directional_blur); queue_d3d10_test(test_effect_hue_rotation); + queue_d3d10_test(test_effect_saturation); 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 93876229138..cf374bdeb19 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -270,3 +270,9 @@ typedef enum D2D1_HUEROTATION_PROP D2D1_HUEROTATION_PROP_ANGLE = 0, D2D1_HUEROTATION_PROP_FORCE_DWORD = 0xffffffff } D2D1_HUEROTATION_PROP; + +typedef enum D2D1_SATURATION_PROP +{ + D2D1_SATURATION_PROP_SATURATION = 0, + D2D1_SATURATION_PROP_FORCE_DWORD = 0xffffffff +} D2D1_SATURATION_PROP;