quartz: Don't cast WSTR to BSTR, convert properly instead.

da550ed2 · Nikolay Sivov · Alexandre Julliard · c8cd1502 · da550ed2
Commit da550ed2 authored Mar 12, 2010 by Nikolay Sivov Committed by Alexandre Julliard Mar 15, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

filtermapper.c dlls/quartz/filtermapper.c +7 -2

No files found.
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -479,11 +479,16 @@ static HRESULT WINAPI FilterMapper2_UnregisterFilter(
 static HRESULT FM2_WriteFriendlyName(IPropertyBag * pPropBag, LPCWSTR szName)
 {
    VARIANT var;
+    HRESULT ret;
+    BSTR value;

    V_VT(&var) = VT_BSTR;
-    V_UNION(&var, bstrVal) = (BSTR)szName;
+    V_UNION(&var, bstrVal) = value = SysAllocString(szName);

-    return IPropertyBag_Write(pPropBag, wszFriendlyName, &var);
+    ret = IPropertyBag_Write(pPropBag, wszFriendlyName, &var);
+    SysFreeString(value);
+
+    return ret;
 }

 static HRESULT FM2_WriteClsid(IPropertyBag * pPropBag, REFCLSID clsid)