mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 18:54:25 +00:00
[QEDIT]
* Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64303
This commit is contained in:
parent
b8bad25e37
commit
b809b0c635
|
@ -347,7 +347,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar)
|
||||||
|
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid);
|
hr = CLSIDFromString(V_BSTR(pvar), pclsid);
|
||||||
VariantClear(pvar);
|
VariantClear(pvar);
|
||||||
V_VT(pvar) = VT_BSTR;
|
V_VT(pvar) = VT_BSTR;
|
||||||
}
|
}
|
||||||
|
@ -356,8 +356,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar)
|
||||||
hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL);
|
hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL);
|
||||||
|
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid),
|
TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar)));
|
||||||
debugstr_w(V_UNION(pvar, bstrVal)));
|
|
||||||
|
|
||||||
if (pPropBagCat)
|
if (pPropBagCat)
|
||||||
IPropertyBag_Release(pPropBagCat);
|
IPropertyBag_Release(pPropBagCat);
|
||||||
|
@ -430,8 +429,7 @@ static HRESULT GetSplitter(MediaDetImpl *This)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = IGraphBuilder_AddFilter(This->graph, splitter,
|
hr = IGraphBuilder_AddFilter(This->graph, splitter, V_BSTR(&var));
|
||||||
V_UNION(&var, bstrVal));
|
|
||||||
VariantClear(&var);
|
VariantClear(&var);
|
||||||
This->splitter = splitter;
|
This->splitter = splitter;
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
|
|
|
@ -44,7 +44,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26
|
||||||
reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17
|
reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17
|
||||||
reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27
|
reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27
|
||||||
reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17
|
reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17
|
||||||
reactos/dll/directx/wine/qedit # Synced to Wine-1.7.17
|
reactos/dll/directx/wine/qedit # Synced to Wine-1.7.27
|
||||||
reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17
|
reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17
|
||||||
reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.27
|
reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.27
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue