Nikolay Sivov : qedit: Use V_BSTR() to access BSTR data.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 3 15:09:20 CDT 2014
Module: wine
Branch: master
Commit: 3c716499ccf2501fdb5089127fa0a31b6496592e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c716499ccf2501fdb5089127fa0a31b6496592e
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Sep 2 20:12:52 2014 +0400
qedit: Use V_BSTR() to access BSTR data.
---
dlls/qedit/mediadet.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c
index 7e90c31..3d79107 100644
--- a/dlls/qedit/mediadet.c
+++ b/dlls/qedit/mediadet.c
@@ -357,7 +357,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar)
if (SUCCEEDED(hr))
{
- hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid);
+ hr = CLSIDFromString(V_BSTR(pvar), pclsid);
VariantClear(pvar);
V_VT(pvar) = VT_BSTR;
}
@@ -366,8 +366,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar)
hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL);
if (SUCCEEDED(hr))
- TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid),
- debugstr_w(V_UNION(pvar, bstrVal)));
+ TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar)));
if (pPropBagCat)
IPropertyBag_Release(pPropBagCat);
@@ -440,8 +439,7 @@ static HRESULT GetSplitter(MediaDetImpl *This)
continue;
}
- hr = IGraphBuilder_AddFilter(This->graph, splitter,
- V_UNION(&var, bstrVal));
+ hr = IGraphBuilder_AddFilter(This->graph, splitter, V_BSTR(&var));
VariantClear(&var);
This->splitter = splitter;
if (FAILED(hr))
More information about the wine-cvs
mailing list