ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 19:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/; revision=72266
This commit is contained in:
Amine Khaldi
2016-08-18 09:45:45 +00:00
parent 7d75b785b8
commit bef5d0e69f
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/directx/wine/dmusic/clock.c
+1 -1
View File
@@ -121,7 +121,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO
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) {
reactos/dll/directx/wine/dmusic/dmusic.c
+1 -1
View File
@@ -403,7 +403,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU
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)
reactos/dll/directx/wine/dmusic/port.c
+6 -3
View File
@@ -755,7 +755,8 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou
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_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou
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;
}
reactos/media/doc/README.WINE
+1 -1
View File
@@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4
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