From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 26 Sep 2014 09:42:33 +0000 (+0000)
Subject: [QEDIT]
X-Git-Tag: backups/0.3.17@66124~437
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b809b0c635fa5dfb45a2c200b9ab24940ddc783c

[QEDIT]
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64303
---

diff --git a/reactos/dll/directx/wine/qedit/mediadet.c b/reactos/dll/directx/wine/qedit/mediadet.c
index c0978e3daa4..60aa97ef7a2 100644
--- a/reactos/dll/directx/wine/qedit/mediadet.c
+++ b/reactos/dll/directx/wine/qedit/mediadet.c
@@ -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))
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 56273aa4fb0..01679f49f48 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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