From 22e7e8495a592f776fd61246b7a7f65553c2fd99 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sun, 3 Mar 2019 16:41:42 +1100 Subject: [PATCH 3/4] Revert "xaudio2: Fix uninitialized variable access (Valgrind)." This reverts commit ac8be6a1a24d49e1e32806b05dcf4591de5c691e. --- dlls/xaudio2_7/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index bc33cb92ed7..318f6685896 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -923,7 +923,7 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends = NULL; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -1483,7 +1483,7 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends = NULL; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -2115,7 +2115,7 @@ static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - XAUDIO2_VOICE_SENDS sends, *psends = NULL; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; if(pSendList){ @@ -2350,7 +2350,7 @@ static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - XAUDIO2_VOICE_SENDS sends, *psends = NULL; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; if(pSendList){ -- 2.20.1