[PATCH 4/5] devenum: Don't support VT_UI4 in IPropertyBag methods.
Zebediah Figura
z.figura12 at gmail.com
Tue Apr 14 00:16:03 CDT 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/devenum/mediacatenum.c | 6 ++----
dlls/devenum/tests/devenum.c | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index aab044cbad8..cee2389617b 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -187,7 +187,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
V_VT(pVar) = VT_I4;
/* fall through */
case VT_I4:
- case VT_UI4:
V_I4(pVar) = *(DWORD *)pData;
res = S_OK;
break;
@@ -262,9 +261,8 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface,
cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR);
break;
case VT_I4:
- case VT_UI4:
- TRACE("writing %u\n", V_UI4(pVar));
- lpData = &V_UI4(pVar);
+ TRACE("writing %d\n", V_I4(pVar));
+ lpData = &V_I4(pVar);
dwType = REG_DWORD;
cbData = sizeof(DWORD);
break;
diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index ce452e39044..6164efb7774 100644
--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -385,7 +385,7 @@ static void test_directshow_filter(void)
V_VT(&var) = VT_UI4;
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;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
@@ -538,7 +538,7 @@ static void test_codec(void)
V_VT(&var) = VT_UI4;
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;
hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL);
ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
--
2.26.0
More information about the wine-devel
mailing list