Commit 7c16aacc authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

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

parent ab355d6e
...@@ -265,7 +265,7 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, ...@@ -265,7 +265,7 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name,
} }
default: default:
WARN("Unhandled type %s.\n", debugstr_vt(V_VT(var))); WARN("Unhandled type %s.\n", debugstr_vt(V_VT(var)));
return E_FAIL; return E_INVALIDARG;
} }
RegCloseKey(key); RegCloseKey(key);
......
...@@ -377,7 +377,7 @@ static void test_directshow_filter(void) ...@@ -377,7 +377,7 @@ static void test_directshow_filter(void)
V_VT(&var) = VT_LPWSTR; V_VT(&var) = VT_LPWSTR;
hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); 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); VariantClear(&var);
V_VT(&var) = VT_I4; V_VT(&var) = VT_I4;
...@@ -406,7 +406,7 @@ static void test_directshow_filter(void) ...@@ -406,7 +406,7 @@ static void test_directshow_filter(void)
V_VT(&var) = VT_UI4; V_VT(&var) = VT_UI4;
hr = IPropertyBag_Write(prop_bag, L"foobar", &var); 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_VT(&var) = VT_ARRAY | VT_UI1;
V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound);
...@@ -513,7 +513,7 @@ static void test_codec(void) ...@@ -513,7 +513,7 @@ static void test_codec(void)
V_VT(&var) = VT_LPWSTR; V_VT(&var) = VT_LPWSTR;
hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); 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); VariantClear(&var);
V_VT(&var) = VT_EMPTY; V_VT(&var) = VT_EMPTY;
...@@ -559,7 +559,7 @@ static void test_codec(void) ...@@ -559,7 +559,7 @@ static void test_codec(void)
V_VT(&var) = VT_UI4; V_VT(&var) = VT_UI4;
hr = IPropertyBag_Write(prop_bag, L"foobar", &var); 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_VT(&var) = VT_ARRAY | VT_UI1;
V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment