mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 14:03:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DMUSIC] Sync with Wine Staging 1.7.37. CORE-9246

Browse Source 
svn path=/trunk/; revision=66491
This commit is contained in:
Amine Khaldi 2015-02-28 11:21:27 +00:00
parent 5b09d5a99c
commit dd6ea04003
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
reactos/dll/directx/wine/dmusic/port.c
View File

@ -48,9 +48,7 @@ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirec
{ {
TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
if (IsEqualIID(riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument))
IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) ||
IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8))
{ {
IDirectMusicDownloadedInstrument_AddRef(iface); IDirectMusicDownloadedInstrument_AddRef(iface);
*ret_iface = iface; *ret_iface = iface;
@ -131,19 +129,15 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI
TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) {
IsEqualGUID(riid, &IID_IDirectMusicPort) ||
IsEqualGUID(riid, &IID_IDirectMusicPort8)) {
*ret_iface = &This->IDirectMusicPort_iface; *ret_iface = &This->IDirectMusicPort_iface;
IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface);
return S_OK; return S_OK;
} else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) || } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) {
IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) {
*ret_iface = &This->IDirectMusicPortDownload_iface; *ret_iface = &This->IDirectMusicPortDownload_iface;
IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface);
return S_OK; return S_OK;
} else if (IsEqualGUID(riid, &IID_IDirectMusicThru) || } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) {
IsEqualGUID(riid, &IID_IDirectMusicThru8)) {
*ret_iface = &This->IDirectMusicThru_iface; *ret_iface = &This->IDirectMusicThru_iface;
IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
return S_OK; return S_OK;

2
reactos/media/doc/README.WINE
View File

@ -38,7 +38,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 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/dinput # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 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/dplay # Synced to Wine-1.7.27
reactos/dll/directx/wine/dplayx # 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 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29