From ee57afc285f277d30cd3c87f6bcea2bb60b3e0f6 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sat, 11 Sep 2021 15:09:12 +0200 Subject: Fix #9463: [Win32] Try to work around XAudio2 crashes by catching SEH exceptions. If an exceptions is thrown during context creation, just declare the XAudio driver as unusable. The driver logic will try to find an alternative for us. --- src/sound/xaudio2_s.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp index dd66c8aef..70f8fa987 100644 --- a/src/sound/xaudio2_s.cpp +++ b/src/sound/xaudio2_s.cpp @@ -117,6 +117,20 @@ static IXAudio2MasteringVoice* _mastering_voice = nullptr; static ComPtr _xaudio2; static StreamingVoiceContext* _voice_context = nullptr; +/** Create XAudio2 context with SEH exception checking. */ +static HRESULT CreateXAudio(API_XAudio2Create xAudio2Create) +{ + HRESULT hr; + __try { + UINT32 flags = 0; + hr = xAudio2Create(_xaudio2.GetAddressOf(), flags, XAUDIO2_DEFAULT_PROCESSOR); + } __except (EXCEPTION_EXECUTE_HANDLER) { + hr = GetExceptionCode(); + } + + return hr; +} + /** * Initialises the XAudio2 driver. * @@ -156,8 +170,7 @@ const char *SoundDriver_XAudio2::Start(const StringList &parm) } // Create the XAudio engine - UINT32 flags = 0; - hr = xAudio2Create(_xaudio2.GetAddressOf(), flags, XAUDIO2_DEFAULT_PROCESSOR); + hr = CreateXAudio(xAudio2Create); if (FAILED(hr)) { -- cgit v1.2.3-70-g09d2