[ros-diffs] [akhaldi] 66491: [DMUSIC] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Sat Feb 28 11:21:27 2015
New Revision: 66491

URL: http://svn.reactos.org/svn/reactos?rev=66491&view=rev
Log:
[DMUSIC] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/directx/wine/dmusic/port.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dmusic/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] Sat Feb 28 11:21:27 2015
@@ -48,9 +48,7 @@
 {
     TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
 
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) ||
-        IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8))
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,
&IID_IDirectMusicDownloadedInstrument))
     {
         IDirectMusicDownloadedInstrument_AddRef(iface);
         *ret_iface = iface;
@@ -131,19 +129,15 @@
 
     TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid),
ret_iface);
 
-    if (IsEqualIID (riid, &IID_IUnknown) ||
-        IsEqualGUID(riid, &IID_IDirectMusicPort) ||
-        IsEqualGUID(riid, &IID_IDirectMusicPort8)) {
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid,
&IID_IDirectMusicPort)) {
         *ret_iface = &This->IDirectMusicPort_iface;
         IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface);
         return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) ||
-               IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) {
+    } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) {
         *ret_iface = &This->IDirectMusicPortDownload_iface;
         IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface);
         return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) ||
-               IsEqualGUID(riid, &IID_IDirectMusicThru8)) {
+    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) {
         *ret_iface = &This->IDirectMusicThru_iface;
         IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
         return 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 Feb 28 11:21:27 2015
@@ -38,7 +38,7 @@
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.27
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dinput8        # Synced to Wine-1.7.27
-reactos/dll/directx/wine/dmusic         # Synced to Wine-1.7.27
+reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.27
 reactos/dll/directx/wine/dplayx         # Synced to Wine-1.7.27
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29