propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc.
97c51208 · Dmitry Timoshkov · Alexandre Julliard · 09a2547f · 97c51208
Commit 97c51208 authored Jun 20, 2017 by Dmitry Timoshkov Committed by Alexandre Julliard Jun 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

propvar.c dlls/propsys/propvar.c +13 -0

No files found.
--- a/dlls/propsys/propvar.c
+++ b/dlls/propsys/propvar.c
@@ -224,6 +224,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret)
            res = CoTaskMemAlloc(1*sizeof(WCHAR));
            res[0] = '\0';
            break;
+
        case VT_LPSTR:
            if(propvarIn->u.pszVal)
            {
@@ -237,6 +238,18 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret)
                MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, res, len);
            }
            break;
+
+        case VT_LPWSTR:
+        case VT_BSTR:
+            if (propvarIn->u.pwszVal)
+            {
+                DWORD size = (lstrlenW(propvarIn->u.pwszVal) + 1) * sizeof(WCHAR);
+                res = CoTaskMemAlloc(size);
+                if(!res) return E_OUTOFMEMORY;
+                memcpy(res, propvarIn->u.pwszVal, size);
+            }
+            break;
+
        default:
            FIXME("Unsupported conversion (%d)\n", propvarIn->vt);
            hr = E_FAIL;