[PATCH v2 0/1] MR6088: include: Fix return type of IXAudio2MasteringVoice::GetChannelMask in xaudio2.idl
-- v2: include: Fix return type of IXAudio2MasteringVoice::GetChannelMask in xaudio2.idl https://gitlab.winehq.org/wine/wine/-/merge_requests/6088
From: Biswapriyo Nath <nathbappai(a)gmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- include/xaudio2.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a51bb499793..43537589823 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1353,14 +1353,14 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) } #if XAUDIO2_VER >= 8 -static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, +static HRESULT WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, DWORD *pChannelMask) { XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pChannelMask); - FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); + return FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); } #endif diff --git a/include/xaudio2.idl b/include/xaudio2.idl index b07c562914b..5f73ced16e5 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -459,7 +459,7 @@ interface IXAudio2SubmixVoice : IXAudio2Voice interface IXAudio2MasteringVoice : IXAudio2Voice { #if XAUDIO2_VER >= 8 - void GetChannelMask([out] DWORD *pChannelMask); + HRESULT GetChannelMask([out] DWORD *pChannelMask); #endif } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6088
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147152 Your paranoid android. === debian11b (64 bit WoW report) === ddraw: ddraw1.c:3645: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969). ddraw2.c:3735: Test failed: Expected screen size 1024x768, got 0x0.
participants (3)
-
Biswapriyo Nath -
Biswapriyo Nath (@Biswa96) -
Marvin