ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

devenum: Don't support VT_LPWSTR in IPropertyBag methods. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-04-14 00:16:02 -05:00 committed by Alexandre Julliard
parent 27f13b2bb4
commit e3df3ca839
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/devenum/mediacatenum.c
View File

@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface,
case REG_SZ:
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:
V_VT(pVar) = VT_BSTR;
/* fall through */
@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface,
switch (V_VT(pVar))
{
case VT_BSTR:
case VT_LPWSTR:
TRACE("writing %s\n", debugstr_w(V_BSTR(pVar)));
lpData = V_BSTR(pVar);
dwType = REG_SZ;
@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc,
pProp = pvptr;
if (SUCCEEDED(res))
{
V_VT(&var) = VT_LPWSTR;
V_VT(&var) = VT_BSTR;
res = IPropertyBag_Read(pProp, clsidW, &var, NULL);
}
if (SUCCEEDED(res))
{
res = CLSIDFromString(V_BSTR(&var), &clsID);
CoTaskMemFree(V_BSTR(&var));
VariantClear(&var);
}
if (SUCCEEDED(res))
{

4
dlls/devenum/tests/devenum.c
View File

@ -359,7 +359,7 @@ static void test_directshow_filter(void)
VariantClear(&var);
V_VT(&var) = VT_LPWSTR;
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;
hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);
@ -517,7 +517,7 @@ static void test_codec(void)
VariantClear(&var);
V_VT(&var) = VT_LPWSTR;
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;
hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);