From 6eff832b0722597a78ad00eaec7b499b35ab6e70 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Wed, 25 Oct 2017 17:47:40 -0500 Subject: [PATCH] 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. --- src/CxbxKrnl/EmuDSound.cpp | 4 ++-- src/CxbxKrnl/EmuDSoundInline.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index d756923b8..b63dfb165 100755 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -851,7 +851,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateBuffer) if (pdsbd->dwFlags & DSBCAPS_CTRL3D) { HRESULT hRet3D = (*ppBuffer)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppBuffer)->EmuDirectSound3DBuffer8)); - if (hRet != DS_OK) { + if (hRet3D != DS_OK) { EmuWarning("CreateSound3DBuffer8 Failed!"); (*ppBuffer)->EmuDirectSound3DBuffer8 = NULL; } @@ -1496,7 +1496,7 @@ HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateStream) if (pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) { HRESULT hRet3D = (*ppStream)->EmuDirectSoundBuffer8->QueryInterface(IID_IDirectSound3DBuffer8, (LPVOID*)&((*ppStream)->EmuDirectSound3DBuffer8)); - if (hRet != DS_OK) { + if (hRet3D != DS_OK) { EmuWarning("CreateSound3DBuffer Failed!"); (*ppStream)->EmuDirectSound3DBuffer8 = NULL; } diff --git a/src/CxbxKrnl/EmuDSoundInline.hpp b/src/CxbxKrnl/EmuDSoundInline.hpp index d48cf1e52..e5c393886 100644 --- a/src/CxbxKrnl/EmuDSoundInline.hpp +++ b/src/CxbxKrnl/EmuDSoundInline.hpp @@ -430,8 +430,8 @@ inline void ResizeIDirectSoundBuffer( while (pDSBuffer->AddRef() < refCount); } if (pDS3DBuffer != xbnullptr && pDSBufferDesc->dwFlags & DSBCAPS_CTRL3D) { - hRet = pDSBuffer->QueryInterface(IID_IDirectSound3DBuffer, (LPVOID*)&(pDS3DBuffer)); - if (hRet != DS_OK) { + HRESULT hRet3D = pDSBuffer->QueryInterface(IID_IDirectSound3DBuffer, (LPVOID*)&(pDS3DBuffer)); + if (hRet3D != DS_OK) { EmuWarning("CreateSound3DBuffer Failed!"); pDS3DBuffer = xbnullptr; } else {