[akhaldi] 72266: [DMUSIC] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Thu Aug 18 09:45:45 2016
New Revision: 72266

URL: http://svn.reactos.org/svn/reactos?rev=72266&view=rev
Log:
[DMUSIC] Sync with Wine Staging 1.9.16. CORE-11866

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

Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/cl…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/clock.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/clock.c	[iso-8859-1] Thu Aug 18 09:45:45 2016
@@ -121,7 +121,7 @@
     IReferenceClockImpl* clock;
     HRESULT hr;
 
-    TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter);
+    TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter);
 
     clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl));
     if (!clock) {

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c	[iso-8859-1] Thu Aug 18 09:45:45 2016
@@ -403,7 +403,7 @@
     IDirectMusic8Impl *dmusic;
     HRESULT ret;
 
-    TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter);
+    TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter);
 
     *ret_iface = NULL;
     if (unkouter)

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] Thu Aug 18 09:45:45 2016
@@ -755,7 +755,8 @@
     HRESULT hr = E_FAIL;
     int i;
 
-    TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params,
port_caps, device);
+    TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter,
port_params,
+            port_caps, device);
 
     *object = NULL;
 
@@ -840,14 +841,16 @@
 
 HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter,
LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
 {
-    TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params,
port_caps, device);
+    TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object,
unkouter, port_params,
+            port_caps, device);
 
     return E_NOTIMPL;
 }
 
 HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter,
LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
 {
-    TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params,
port_caps, device);
+    TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object,
unkouter, port_params,
+            port_caps, device);
 
     return E_NOTIMPL;
 }

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] Thu Aug 18 09:45:45 2016
@@ -32,7 +32,7 @@
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.9.11
-reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.9.11
+reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.9.11
 reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.9.11
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29