[PATCH 2/5] d2d1/effect: Check that "Inputs" property was specified in the description.

Nikolay Sivov wine at gitlab.winehq.org
Tue Jul 5 01:31:28 CDT 2022


From: Nikolay Sivov <nsivov at codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/d2d1/factory.c    | 3 ++-
 dlls/d2d1/tests/d2d1.c | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 699b8c05669..0a8a3bbd5b1 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -921,7 +921,8 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto
     if (!parse_effect_get_property(effect, L"DisplayName")
             || !parse_effect_get_property(effect, L"Author")
             || !parse_effect_get_property(effect, L"Category")
-            || !parse_effect_get_property(effect, L"Description"))
+            || !parse_effect_get_property(effect, L"Description")
+            || !parse_effect_get_property(effect, L"Inputs"))
     {
         WARN("Missing required properties.\n");
         d2d_effect_registration_cleanup(effect);
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index fed0e9bdf96..05ebf10e666 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -10855,7 +10855,6 @@ static void test_effect_register(BOOL d3d11)
         winetest_push_context("Test %u", i);
 
         hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create);
-        todo_wine_if(i == 5)
         ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr);
         if (hr == S_OK)
         {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/377



More information about the wine-devel mailing list