Commit e3df3ca8 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

devenum: Don't support VT_LPWSTR in IPropertyBag methods.

parent 27f13b2b
...@@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, ...@@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
case REG_SZ: case REG_SZ:
switch (V_VT(pVar)) switch (V_VT(pVar))
{ {
case VT_LPWSTR:
V_BSTR(pVar) = CoTaskMemAlloc(received);
memcpy(V_BSTR(pVar), pData, received);
res = S_OK;
break;
case VT_EMPTY: case VT_EMPTY:
V_VT(pVar) = VT_BSTR; V_VT(pVar) = VT_BSTR;
/* fall through */ /* fall through */
...@@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, ...@@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface,
switch (V_VT(pVar)) switch (V_VT(pVar))
{ {
case VT_BSTR: case VT_BSTR:
case VT_LPWSTR:
TRACE("writing %s\n", debugstr_w(V_BSTR(pVar))); TRACE("writing %s\n", debugstr_w(V_BSTR(pVar)));
lpData = V_BSTR(pVar); lpData = V_BSTR(pVar);
dwType = REG_SZ; dwType = REG_SZ;
...@@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, ...@@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc,
pProp = pvptr; pProp = pvptr;
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
V_VT(&var) = VT_LPWSTR; V_VT(&var) = VT_BSTR;
res = IPropertyBag_Read(pProp, clsidW, &var, NULL); res = IPropertyBag_Read(pProp, clsidW, &var, NULL);
} }
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
res = CLSIDFromString(V_BSTR(&var), &clsID); res = CLSIDFromString(V_BSTR(&var), &clsID);
CoTaskMemFree(V_BSTR(&var)); VariantClear(&var);
} }
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
......
...@@ -359,7 +359,7 @@ static void test_directshow_filter(void) ...@@ -359,7 +359,7 @@ static void test_directshow_filter(void)
VariantClear(&var); VariantClear(&var);
V_VT(&var) = VT_LPWSTR; V_VT(&var) = VT_LPWSTR;
hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &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"FriendlyName", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);
...@@ -517,7 +517,7 @@ static void test_codec(void) ...@@ -517,7 +517,7 @@ static void test_codec(void)
VariantClear(&var); VariantClear(&var);
V_VT(&var) = VT_LPWSTR; V_VT(&var) = VT_LPWSTR;
hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &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"FriendlyName", &var, NULL); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);
......
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