mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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.
pull/9552/head
Michael Lutz 2021-09-11 15:09:12 +02:00
parent a8641ea44a
commit ee57afc285
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sound/xaudio2_s.cpp
View File

@ -117,6 +117,20 @@ static IXAudio2MasteringVoice* _mastering_voice = nullptr;
static ComPtr<IXAudio2> _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))
{