[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
The following commit has been merged in the wheezy branch:
commit a301ac63c32055914eb1ba942e1d07af9a2a939e
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Wed Apr 18 10:14:01 2012 -0500
dmime: Don't try to create a standard audio path if the client didn't ask for one.
(cherry picked from commit 629e857c2ee0e8816a11ee4ab446c13798362f33)
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 91df283..0b70354 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -787,7 +787,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio (LPDIRECTMUSICPERFO
This->pParams.dwFeatures = dwFlags;
This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink;
}
- hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath);
+ if(dwDefaultPathType != 0)
+ hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath);
PostMessageToProcessMsgThread(This, PROCESSMSG_START);
@@ -924,7 +925,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath (LPDI
*ppNewPath = pPath;
- TRACE(" returning IDirectMusicPerformance interface at %p.\n", *ppNewPath);
+ TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ppNewPath);
return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate);
}
--
Debian Wine packaging
Reply to: