[PATCH 0/1] MR6088: include: Fix return type of IXAudio2MasteringVoice::GetChannelMask in xaudio2.idl
From: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/xaudio2.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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
You will also have to update xaudio2_7/xaudio_dll.c to reflect this change. dlls/kernel32/i386-windows/libkernel32.a dlls/ntdll/i386-windows/libntdll.a -Wl,--disable-stdcall-fixup ../wine/dlls/xaudio2_7/xaudio_dll.c:1390:5: warning: initialization of ‘HRESULT (__attribute__((stdcall)) *)(IXAudio2MasteringVoice *, DWORD *)’ {aka ‘long int (__attribute__((stdcall)) *)(IXAudio2MasteringVoice *, long unsigned int *)’} from incompatible pointer type ‘void (__attribute__((stdcall)) *)(IXAudio2MasteringVoice *, DWORD *)’ {aka ‘void (__attribute__((stdcall)) *)(IXAudio2MasteringVoice *, long unsigned int *)’} [-Wincompatible-pointer-types] 1390 | XA2M_GetChannelMask | ^~~~~~~~~~~~~~~~~~~ -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6088#note_76269
How can I reproduce the compiler error in ArchLinux? The error looks valid to me but I can not reproduce it in ArchLinux. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6088#note_76327
yoloing it... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6088#note_76339
participants (3)
-
Alistair Leslie-Hughes (＠alesliehughes) -
Biswapriyo Nath
-
Biswapriyo Nath (＠Biswa96)