Zebediah Figura : devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types.
Alexandre Julliard
julliard at winehq.org
Wed Apr 15 15:55:41 CDT 2020
Module: wine
Branch: master
Commit: 7c16aacc5f35fde06566ad47625c9347dc68035b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c16aacc5f35fde06566ad47625c9347dc68035b
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Apr 14 22:22:48 2020 -0500
devenum: Return E_INVALIDARG from IPropertyBag::Write() for invalid variant types.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/devenum/mediacatenum.c | 2 +-
dlls/devenum/tests/devenum.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 569baffb21..15e5c9642c 100644
--- 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);
diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index 06efa3d773..01e6be98da 100644
--- 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);
More information about the wine-cvs
mailing list