[PATCH 3/5] devenum: Don't support VT_LPWSTR in IPropertyBag methods.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/devenum/mediacatenum.c  | 10 ++--------
 dlls/devenum/tests/devenum.c |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 4a5ae45e8b4..aab044cbad8 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -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))
             {
diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index 89f6f8d5bb7..ce452e39044 100644
--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -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);