[PATCH v9 4/6] propsys: Implement PropVariantToBSTR.

[Ziqing Hui]

From: Ziqing Hui

---
 dlls/propsys/propvar.c       | 17 +++++++++++++++--
 dlls/propsys/tests/propsys.c |  6 +-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c
index 4a60f2c2c7e..c42a6e00525 100644
--- a/dlls/propsys/propvar.c
+++ b/dlls/propsys/propvar.c
@@ -334,9 +334,22 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret)

HRESULT WINAPI PropVariantToBSTR(REFPROPVARIANT propvar, BSTR *bstr)
 {
-    FIXME("propvar %p, bstr %p.\n", propvar, bstr);
+    WCHAR *str;
+    HRESULT hr;
+
+    TRACE("propvar %p, propvar->vt %#x, bstr %p.\n",
+            propvar, propvar ? propvar->vt : 0, bstr);
+
+    if (FAILED(hr = PropVariantToStringAlloc(propvar, &str)))
+        return hr;

-    return E_NOTIMPL;
+    *bstr = SysAllocString(str);
+    CoTaskMemFree(str);
+
+    if (!*bstr)
+        return E_OUTOFMEMORY;
+
+    return S_OK;
 }

HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb)
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index d2a26c8fbfa..a7396bd8983 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -1679,10 +1679,10 @@ static void test_PropVariantToBSTR(void)
     check_PropVariantToBSTR(VT_BOOL,   boolVal,        TRUE,                 L"1");
     check_PropVariantToBSTR(VT_R4,     fltVal,         0.123f,               L"0.123000003397464752");
     check_PropVariantToBSTR(VT_R8,     dblVal,         0.456,                L"0.456");
+    }
     check_PropVariantToBSTR(VT_CLSID,  puuid,          (CLSID *)&dummy_guid, dummy_guid_str);
     check_PropVariantToBSTR(VT_LPSTR,  pszVal,         (char *)topic,        topicW);
     check_PropVariantToBSTR(VT_LPWSTR, pwszVal,        (WCHAR *)topicW,      topicW);
-    }

PropVariantInit(&propvar);
     propvar.vt = VT_FILETIME;
@@ -1726,15 +1726,11 @@ static void test_PropVariantToBSTR(void)
     propvar.vt = VT_BSTR;
     propvar.bstrVal = SysAllocStringLen(test_bstr, ARRAY_SIZE(test_bstr));
     hr = PropVariantToBSTR(&propvar, &bstr);
-    todo_wine
     ok(hr == S_OK, "PropVariantToBSTR returned %#lx.\n", hr);
-    if (hr == S_OK)
-    {
     length = SysStringLen(bstr);
     ok(length == wcslen(test_bstr), "Unexpected length %u.\n", length);
     ok(!wcscmp(bstr, test_bstr), "Unexpected bstr %s.", debugstr_wn(bstr, ARRAY_SIZE(test_bstr)));
     SysFreeString(bstr);
-    }
     PropVariantClear(&propvar);
 }