Nikolay Sivov : d2d1/effect: Implement ConnectToEffectInput().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 054c9d85fe54e2d90f5b97922282f4321ffbf151
URL:    https://gitlab.winehq.org/wine/wine/-/commit/054c9d85fe54e2d90f5b97922282f43...

Author: Nikolay Sivov 
Date:   Tue Apr  2 12:51:11 2024 +0200

d2d1/effect: Implement ConnectToEffectInput().

Signed-off-by: Nikolay Sivov

---

dlls/d2d1/d2d1_private.h |  9 ++++++++-
 dlls/d2d1/effect.c       | 40 ++++++++++++++++++++++++++++++++++++----
 dlls/d2d1/tests/d2d1.c   | 11 +++++++++++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 1f5093e29a4..d59fbf10013 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -728,12 +728,19 @@ struct d2d_transform_node
     ID2D1TransformNode *object;
 };

+struct d2d_transform_node_connection
+{
+    struct d2d_transform_node *node;
+    unsigned int index;
+};
+
 struct d2d_transform_graph
 {
     ID2D1TransformGraph ID2D1TransformGraph_iface;
     LONG refcount;

-    UINT32 input_count;
+    struct d2d_transform_node_connection *inputs;
+    unsigned int input_count;

struct list nodes;
 };
diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
index f441abde2b9..a6a0d33a5a8 100644
--- a/dlls/d2d1/effect.c
+++ b/dlls/d2d1/effect.c
@@ -279,9 +279,17 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph,
 static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph,
         struct d2d_transform_node *node)
 {
+    unsigned int i;
+
     list_remove(&node->entry);
     ID2D1TransformNode_Release(node->object);

+    for (i = 0; i < graph->input_count; ++i)
+    {
+        if (graph->inputs[i].node == node)
+            memset(&graph->inputs[i].node, 0, sizeof(graph->inputs[i].node));
+    }
+
     free(node);
 }

@@ -336,6 +344,7 @@ static ULONG STDMETHODCALLTYPE d2d_transform_graph_Release(ID2D1TransformGraph *
     if (!refcount)
     {
         d2d_transform_graph_clear(graph);
+        free(graph->inputs);
         free(graph);
     }

@@ -403,11 +412,28 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformG
 }

static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1TransformGraph *iface,
-        UINT32 input_index, ID2D1TransformNode *node, UINT32 node_index)
+        UINT32 input_index, ID2D1TransformNode *object, UINT32 node_index)
 {
-    FIXME("iface %p, input_index %u, node %p, node_index %u stub!\n", iface, input_index, node, node_index);
+    struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface);
+    struct d2d_transform_node *node;
+    unsigned int count;

-    return E_NOTIMPL;
+    TRACE("iface %p, input_index %u, object %p, node_index %u.\n", iface, input_index, object, node_index);
+
+    if (!(node = d2d_transform_graph_get_node(graph, object)))
+        return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
+
+    if (input_index >= graph->input_count)
+        return E_INVALIDARG;
+
+    count = ID2D1TransformNode_GetInputCount(object);
+    if (node_index >= count)
+        return E_INVALIDARG;
+
+    graph->inputs[input_index].node = node;
+    graph->inputs[input_index].index = node_index;
+
+    return S_OK;
 }

static void STDMETHODCALLTYPE d2d_transform_graph_Clear(ID2D1TransformGraph *iface)
@@ -451,9 +477,15 @@ static HRESULT d2d_transform_graph_create(UINT32 input_count, struct d2d_transfo

object->ID2D1TransformGraph_iface.lpVtbl = &d2d_transform_graph_vtbl;
     object->refcount = 1;
-    object->input_count = input_count;
     list_init(&object->nodes);

+    if (!(object->inputs = calloc(input_count, sizeof(*object->inputs))))
+    {
+        free(object);
+        return E_OUTOFMEMORY;
+    }
+    object->input_count = input_count;
+
     *graph = object;

return S_OK;
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 15d3b8b82ee..b2d1296bdde 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -12727,6 +12727,8 @@ static void test_transform_graph(BOOL d3d11)
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

/* Add nodes */
+    hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 1, (ID2D1TransformNode *)offset_transform, 0);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr);
     hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform);
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
     hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform);
@@ -12734,6 +12736,15 @@ static void test_transform_graph(BOOL d3d11)
     hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform);
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

+    /* Invalid effect input index. */
+    hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 1, (ID2D1TransformNode *)offset_transform, 0);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+    /* Invalid object input index. */
+    hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 0, (ID2D1TransformNode *)offset_transform, 1);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+    hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 0, (ID2D1TransformNode *)offset_transform, 0);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
     /* Remove nodes */
     hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform);
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);