[ros-diffs] [akhaldi] 64303: [QEDIT] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Fri Sep 26 09:42:33 2014
New Revision: 64303

URL: http://svn.reactos.org/svn/reactos?rev=64303&view=rev
Log:
[QEDIT]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/dll/directx/wine/qedit/mediadet.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/mediadet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/mediadet.c	[iso-8859-1] Fri Sep 26 09:42:33 2014
@@ -347,7 +347,7 @@
 
     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 @@
         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 @@
             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))

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Sep 26 09:42:33 2014
@@ -44,7 +44,7 @@
 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