Author: akhaldi
Date: Sat Jun 3 18:36:47 2017
New Revision: 74782
URL:
http://svn.reactos.org/svn/reactos?rev=74782&view=rev
Log:
[QUARTZ] Sync with Wine Staging 2.9. CORE-13362
1f765fb quartz: Remove an unnecessary if.
Modified:
trunk/reactos/dll/directx/wine/quartz/filtergraph.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Sat Jun 3 18:36:47
2017
@@ -1520,8 +1520,7 @@
if (FAILED(hr))
return hr;
- if (SUCCEEDED(hr))
- hr = IBaseFilter_EnumPins(preader, &penumpins);
+ hr = IBaseFilter_EnumPins(preader, &penumpins);
if (SUCCEEDED(hr))
{
while (IEnumPins_Next(penumpins, 1, &ppinreader, NULL) == S_OK)
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] Sat Jun 3 18:36:47 2017
@@ -39,7 +39,7 @@
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23
-reactos/dll/directx/wine/quartz # Synced to WineStaging-2.2
+reactos/dll/directx/wine/quartz # Synced to WineStaging-2.9
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11