ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spu2-x:windows: Potentially prevent XAudio2.7 unload crashes 

The extra LoadLibrary call prevents XAudio2.7 from unloading since
LoadLibrary reference counts. See
http://blogs.msdn.com/b/chuckw/archive/2015/10/09/known-issues-xaudio-2-7.aspx

Should fix random XAudio2 crashes.
This commit is contained in:
Jonathan Li 2015-11-20 21:48:28 +00:00
parent 9f2fa79fe3
commit 000f4984cf
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp
View File

@ -233,6 +233,7 @@ private:
}; };
HMODULE xAudio2DLL;
CComPtr<IXAudio2> pXAudio2; CComPtr<IXAudio2> pXAudio2;
IXAudio2MasteringVoice* pMasteringVoice; IXAudio2MasteringVoice* pMasteringVoice;
BaseStreamingVoice* voiceContext; BaseStreamingVoice* voiceContext;
@ -245,6 +246,16 @@ public:
jASSUME( pXAudio2 == NULL ); jASSUME( pXAudio2 == NULL );
// On some systems XAudio2.7 can unload itself and cause PCSX2 to crash.
// Maintain an extra library reference so it can't do so. Does not
// affect XAudio 2.8+, but that's Win8+. See
// http://blogs.msdn.com/b/chuckw/archive/2015/10/09/known-issues-xaudio-2-7.aspx
#ifdef _DEBUG
xAudio2DLL = LoadLibrary(L"XAudioD2_7.dll");
#else
xAudio2DLL = LoadLibrary(L"XAudio2_7.dll");
#endif
// //
// Initialize XAudio2 // Initialize XAudio2
// //
@ -375,6 +386,11 @@ public:
pXAudio2.Release(); pXAudio2.Release();
CoUninitialize(); CoUninitialize();
if (xAudio2DLL) {
FreeLibrary(xAudio2DLL);
xAudio2DLL = nullptr;
}
} }
virtual void Configure(uptr parent) virtual void Configure(uptr parent)