Module: wine Branch: stable Commit: 094d3c7cfbb370ce2d48e5639d06b1960f5bde3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d3c7cfbb370ce2d48e5639d...
Author: Andrew Eikum aeikum@codeweavers.com Date: Tue Feb 9 10:39:23 2016 -0600
xaudio2: Handle openal source allocation failure.
Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit ecadabe25b11bbd2bb41facf40dfc592e12632ad) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 04f975c..73e6db1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -34,6 +34,7 @@ #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag);
static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1399,11 +1400,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface,
hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; }
alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs);
alSourcePlay(src->al_src);