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

Re-fix Check CreateSound3DBuffer Return Value 

For now, let's keep hRet separate from DirectSound's 3DBuffer interfaces
usage. By using hRet3D variable. Just in case we are returning hRet to
xbe.
This commit is contained in:
RadWolfie 2017-10-25 17:47:40 -05:00
parent 3528fccb2e
commit 6eff832b07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuDSound.cpp
View File

@ -851,7 +851,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateBuffer)
if (pdsbd->dwFlags & DSBCAPS_CTRL3D) { if (pdsbd->dwFlags & DSBCAPS_CTRL3D) {
HRESULT hRet3D = (*ppBuffer)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppBuffer)->EmuDirectSound3DBuffer8)); HRESULT hRet3D = (*ppBuffer)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppBuffer)->EmuDirectSound3DBuffer8));
if (hRet != DS_OK) { if (hRet3D != DS_OK) {
EmuWarning("CreateSound3DBuffer8 Failed!"); EmuWarning("CreateSound3DBuffer8 Failed!");
(*ppBuffer)->EmuDirectSound3DBuffer8 = NULL; (*ppBuffer)->EmuDirectSound3DBuffer8 = NULL;
} }
@ -1496,7 +1496,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateStream)
if (pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) { if (pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) {
HRESULT hRet3D = (*ppStream)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppStream)->EmuDirectSound3DBuffer8)); HRESULT hRet3D = (*ppStream)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppStream)->EmuDirectSound3DBuffer8));
if (hRet != DS_OK) { if (hRet3D != DS_OK) {
EmuWarning("CreateSound3DBuffer Failed!"); EmuWarning("CreateSound3DBuffer Failed!");
(*ppStream)->EmuDirectSound3DBuffer8 = NULL; (*ppStream)->EmuDirectSound3DBuffer8 = NULL;
} }

4
src/CxbxKrnl/EmuDSoundInline.hpp
View File

@ -430,8 +430,8 @@ inline void ResizeIDirectSoundBuffer(
while (pDSBuffer->AddRef() < refCount); while (pDSBuffer->AddRef() < refCount);
} }
if (pDS3DBuffer != xbnullptr && pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) { if (pDS3DBuffer != xbnullptr && pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) {
hRet = pDSBuffer->QueryInterface(IID_IDirectSound3DBuffer, (LPVOID*)&(pDS3DBuffer)); HRESULT hRet3D = pDSBuffer->QueryInterface(IID_IDirectSound3DBuffer, (LPVOID*)&(pDS3DBuffer));
if (hRet != DS_OK) { if (hRet3D != DS_OK) {
EmuWarning("CreateSound3DBuffer Failed!"); EmuWarning("CreateSound3DBuffer Failed!");
pDS3DBuffer = xbnullptr; pDS3DBuffer = xbnullptr;
} else { } else {