quartz: Fix variant handling in GetFilterInfo.

Removes unnecessary and unsafe type assignment, adds a missing VariantClear.

quartz: Fix variant handling in GetFilterInfo.
1cd83afd · Alexander Dorofeyev · Alexandre Julliard · 7c5a4481 · 1cd83afd
Commit 1cd83afd authored Jul 17, 2008 by Alexander Dorofeyev Committed by Alexandre Julliard Jul 18, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

filtergraph.c dlls/quartz/filtergraph.c +2 -1

No files found.
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -773,7 +773,6 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar)
    HRESULT hr;

    VariantInit(pvar);
-    V_VT(pvar) = VT_BSTR;

    hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat);

@@ -783,6 +782,8 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar)
    if (SUCCEEDED(hr))
        hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid);

+    VariantClear(pvar);
+
    if (SUCCEEDED(hr))
        hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL);