devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types.
7c16aacc · Zebediah Figura · Alexandre Julliard · ab355d6e · 7c16aacc · 7c16aacc
Commit 7c16aacc authored Apr 14, 2020 by Zebediah Figura Committed by Alexandre Julliard Apr 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

mediacatenum.c dlls/devenum/mediacatenum.c +1 -1

devenum.c dlls/devenum/tests/devenum.c +4 -4

No files found.
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -265,7 +265,7 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name,
    }
    default:
        WARN("Unhandled type %s.\n", debugstr_vt(V_VT(var)));
-        return E_FAIL;
+        return E_INVALIDARG;
    }

    RegCloseKey(key);

--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -377,7 +377,7 @@ static void test_directshow_filter(void)

        V_VT(&var) = VT_LPWSTR;
        hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var);
-        todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+        ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
        VariantClear(&var);

        V_VT(&var) = VT_I4;
@@ -406,7 +406,7 @@ static void test_directshow_filter(void)

        V_VT(&var) = VT_UI4;
        hr = IPropertyBag_Write(prop_bag, L"foobar", &var);
-        todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+        ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

        V_VT(&var) = VT_ARRAY | VT_UI1;
        V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound);
@@ -513,7 +513,7 @@ static void test_codec(void)

    V_VT(&var) = VT_LPWSTR;
    hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var);
-    todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

    VariantClear(&var);
    V_VT(&var) = VT_EMPTY;
@@ -559,7 +559,7 @@ static void test_codec(void)

    V_VT(&var) = VT_UI4;
    hr = IPropertyBag_Write(prop_bag, L"foobar", &var);
-    todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

    V_VT(&var) = VT_ARRAY | VT_UI1;
    V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound);