[PATCH 0/1] MR3478: include: Add missing default value in IXAudio2.
This was removed in 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 commit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478
From: Biswapriyo Nath <nathbappai(a)gmail.com> This was removed in 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 commit. --- include/xaudio2.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index d0e781fe1c6..277fc450469 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -555,7 +555,7 @@ interface IXAudio2 : IUnknown #endif [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain #if XAUDIO2_VER >= 8 - , AUDIO_STREAM_CATEGORY category + , [in, defaultvalue(AudioCategory_GameEffects)] AUDIO_STREAM_CATEGORY category #endif ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3478
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=135525 Your paranoid android. === debian11b (64 bit WoW report) === wmvcore: wmvcore.c:3516: Test failed: Output 0: Got hr 0xc00d0041.
@zfigura Would you like to review this merge request please? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478#note_40974
IXAudio2 is a local interface; this doesn't do anything. Nor do any of the other annotations, for that matter. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478#note_40979
This change fixes the following compiler error with rpcs3 project. ``` rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp: In member function 'virtual bool XAudio2Backend::Open(std::string_view, AudioFreq, AudioSampleSize, AudioChannelCnt)': rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp:244:66: error: no matching function for call to 'IXAudio2::CreateMasteringVoice(IXAudio2MasteringVoice**, int, int, int, const wchar_t*)' 244 | if (HRESULT hr = m_xaudio2_instance->CreateMasteringVoice(&m_master_voice, 0, 0, 0, utf8_to_wchar(use_default_device ? selected_dev_id : dev_id).c_str()); FAILED(hr)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h:14, from rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp:11: xaudio2.h:1571:39: note: candidate: 'virtual HRESULT IXAudio2::CreateMasteringVoice(IXAudio2MasteringVoice**, UINT32, UINT32, UINT32, LPCWSTR, const XAUDIO2_EFFECT_CHAIN*, AUDIO_STREAM_CATEGORY)' 1571 | virtual HRESULT STDMETHODCALLTYPE CreateMasteringVoice( | ^~~~~~~~~~~~~~~~~~~~ xaudio2.h:1571:39: note: candidate expects 7 arguments, 5 provided ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478#note_40995
Okay, I wasn't aware that [defaultvalue] had any effect outside of Automation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478#note_40996
participants (4)
-
Biswapriyo Nath -
Biswapriyo Nath (@Biswa96) -
Marvin -
Zebediah Figura (@zfigura)