Skip to content

W
wine-cw
Commit ccefc1f4 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

devenum: Don't support VT_UI4 in IPropertyBag methods.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e3df3ca8
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
dlls/devenum/mediacatenum.c
View file @ ccefc1f4
...@@ -187,7 +187,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, ...@@ -187,7 +187,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
V_VT(pVar) = VT_I4; V_VT(pVar) = VT_I4;
/* fall through */ /* fall through */
case VT_I4: case VT_I4:
case VT_UI4:
V_I4(pVar) = *(DWORD *)pData; V_I4(pVar) = *(DWORD *)pData;
res = S_OK; res = S_OK;
break; break;
...@@ -262,9 +261,8 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, ...@@ -262,9 +261,8 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface,
cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR); cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR);
break; break;
case VT_I4: case VT_I4:
case VT_UI4: TRACE("writing %d\n", V_I4(pVar));
TRACE("writing %u\n", V_UI4(pVar)); lpData = &V_I4(pVar);
lpData = &V_UI4(pVar);
dwType = REG_DWORD; dwType = REG_DWORD;
cbData = sizeof(DWORD); cbData = sizeof(DWORD);
break; break;
......
dlls/devenum/tests/devenum.c
View file @ ccefc1f4
...@@ -385,7 +385,7 @@ static void test_directshow_filter(void) ...@@ -385,7 +385,7 @@ static void test_directshow_filter(void)
V_VT(&var) = VT_UI4; V_VT(&var) = VT_UI4;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
V_VT(&var) = VT_BSTR; V_VT(&var) = VT_BSTR;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
...@@ -538,7 +538,7 @@ static void test_codec(void) ...@@ -538,7 +538,7 @@ static void test_codec(void)
V_VT(&var) = VT_UI4; V_VT(&var) = VT_UI4;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
V_VT(&var) = VT_BSTR; V_VT(&var) = VT_BSTR;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
......
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