Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QEDIT]

Browse source 
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64303
This commit is contained in:
Amine Khaldi 2014-09-26 09:42:33 +00:00
parent b8bad25e37
commit b809b0c635
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/directx/wine/qedit/mediadet.c
View file

@ -347,7 +347,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;
}
@ -356,8 +356,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);
@ -430,8 +429,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))

2
reactos/media/doc/README.WINE
View file

@ -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/dxgi # Synced to Wine-1.7.27
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/wined3d # Synced to Wine-1.7.27