[PATCH 2/2] d2d1: Implement d2d_effect_GetValue().

[Ziqing Hui]

Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
---

This supersedes 210310.
Changes: Index static standard properties by a switch instead of a fixed size array.

 dlls/d2d1/effect.c     | 38 +++++++++++++++++++++++++++++++++++---
 dlls/d2d1/tests/d2d1.c |  8 +++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
index ef1189ba042..5f334d19f71 100644
--- a/dlls/d2d1/effect.c
+++ b/dlls/d2d1/effect.c
@@ -164,10 +164,42 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_GetValueByName(ID2D1Effect *iface, c
 static HRESULT STDMETHODCALLTYPE d2d_effect_GetValue(ID2D1Effect *iface, UINT32 index, D2D1_PROPERTY_TYPE type,
         BYTE *value, UINT32 value_size)
 {
-    FIXME("iface %p, index %u, type %#x, value %p, value_size %u stub!\n", iface, index, type,
-            value, value_size);
+    struct d2d_effect *effect = impl_from_ID2D1Effect(iface);
+    const void *src;
 
-    return E_NOTIMPL;
+    TRACE("iface %p, index %u, type %#x, value %p, value_size %u.\n", iface, index, type, value, value_size);
+
+    switch (index)
+    {
+        case D2D1_PROPERTY_CLSID:
+            if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_CLSID)
+                    || value_size != sizeof(*effect->info->clsid))
+                return E_INVALIDARG;
+            src = effect->info->clsid;
+            break;
+        case D2D1_PROPERTY_MIN_INPUTS:
+            if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32)
+                    || value_size != sizeof(effect->info->min_inputs))
+                return E_INVALIDARG;
+            src = &effect->info->min_inputs;
+            break;
+        case D2D1_PROPERTY_MAX_INPUTS:
+            if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32)
+                    || value_size != sizeof(effect->info->max_inputs))
+                return E_INVALIDARG;
+            src = &effect->info->max_inputs;
+            break;
+        default:
+            if (index < D2D1_PROPERTY_CLSID)
+                FIXME("Custom properties are not supported.\n");
+            else if (index <= D2D1_PROPERTY_MAX_INPUTS)
+                FIXME("Standard property %#x is not supported.\n", index);
+            return D2DERR_INVALID_PROPERTY;
+    }
+
+    memcpy(value, src, value_size);
+
+    return S_OK;
 }
 
 static UINT32 STDMETHODCALLTYPE d2d_effect_GetValueSize(ID2D1Effect *iface, UINT32 index)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index f655274754e..343a2363e14 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -9738,8 +9738,6 @@ static void test_effect(BOOL d3d11)
         ID2D1Image_Release(image_b);
         ID2D1Image_Release(image_a);
 
-        todo_wine
-        {
         hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid));
         ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr);
 
@@ -9751,11 +9749,14 @@ static void test_effect(BOOL d3d11)
         ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
 
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer));
+        todo_wine
         ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
         str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR);
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size);
+        todo_wine
         ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1);
+        todo_wine
         ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr);
 
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid));
@@ -9776,12 +9777,14 @@ static void test_effect(BOOL d3d11)
 
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED,
                 D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached));
+        todo_wine
         ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
         if (hr == S_OK)
             ok(cached == FALSE, "Got unexpected cached %d.\n", cached);
 
         hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION,
                 D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision));
+        todo_wine
         ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
         if (hr == S_OK)
             ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision);
@@ -9799,7 +9802,6 @@ static void test_effect(BOOL d3d11)
         if (hr == S_OK)
             ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n",
                     max_inputs, test->max_inputs);
-        }
 
         input_count = ID2D1Effect_GetInputCount(effect);
         ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n",
-- 
2.25.1