- Wine-Commits - list.winehq.org

Paul Gofman : xaudio2: Use FAudioVoice_DestroyVoiceSafeEXT() in destroy_voice().
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: b928f0eb08da9a10dae3cb7b33ec16b164a2fddd URL: https://gitlab.winehq.org/wine/wine/-/commit/b928f0eb08da9a10dae3cb7b33ec16… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 19:34:40 2024 -0600 xaudio2: Use FAudioVoice_DestroyVoiceSafeEXT() in destroy_voice(). --- dlls/xaudio2_7/tests/xaudio2.c | 29 ++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 2b3102d21fe..62f766a827a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -837,7 +837,9 @@ static void test_submix(IXAudio2 *xa) HRESULT hr; IXAudio2MasteringVoice *master; XAUDIO2_VOICE_DETAILS details; - IXAudio2SubmixVoice *sub; + IXAudio2SubmixVoice *sub, *sub2; + XAUDIO2_SEND_DESCRIPTOR send_desc = { 0 }; + XAUDIO2_VOICE_SENDS sends = { 1, &send_desc }; IXAudio2_StopEngine(xa); @@ -855,6 +857,31 @@ static void test_submix(IXAudio2 *xa) ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); + hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 0, NULL, NULL); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + send_desc.pOutputVoice = (IXAudio2Voice *)sub2; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + IXAudio2SubmixVoice_DestroyVoice(sub2); + /* The voice is not destroyed. */ + memset(&details, 0xcc, sizeof(details)); + IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details); + ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); + ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); + + sends.SendCount = 0; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + IXAudio2SubmixVoice_DestroyVoice(sub2); + if (0) + { + /* Crashes on Windows and thus suggests that now the voice is actually destroyed. */ + IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details); + } + IXAudio2SubmixVoice_DestroyVoice(sub); IXAudio2MasteringVoice_DestroyVoice(master); } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index cd1c62f3cd4..a51bb499793 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,7 +499,11 @@ static const FAudioEngineCallback FAudioEngineCallback_Vtbl = { static inline void destroy_voice(XA2VoiceImpl *This) { - FAudioVoice_DestroyVoice(This->faudio_voice); + if (FAILED(FAudioVoice_DestroyVoiceSafeEXT(This->faudio_voice))) + { + ERR("Destroying voice %p failed.\n", This); + return; + } free_effect_chain(This->effect_chain); This->effect_chain = NULL; This->in_use = FALSE;

1 0

Alexandre Julliard : ntdll: Build the SMBIOS table incrementally.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 8e5f84ea3c0886131a367354943561eda3246720 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e5f84ea3c0886131a367354943561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 15:12:09 2024 +0200 ntdll: Build the SMBIOS table incrementally. With helpers to create the various sections. --- dlls/ntdll/unix/system.c | 478 ++++++++++++++++++++--------------------------- 1 file changed, 204 insertions(+), 274 deletions(-)

1 0

Alexandre Julliard : ntdll: Generate dummy SMBIOS data on non-supported platforms.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 6ab9a50d480107aaacf134ba74bc950b6c7c4235 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ab9a50d480107aaacf134ba74bc95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 15:17:32 2024 +0200 ntdll: Generate dummy SMBIOS data on non-supported platforms. --- dlls/ntdll/unix/system.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index ead3c97d9f2..280d1b7323a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1818,8 +1818,21 @@ static struct smbios_prologue *create_smbios_data(void) static struct smbios_prologue *create_smbios_data(void) { - FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION\n"); - return NULL; + static const char *vendor = "The Wine project"; + static const char *product = "Wine"; + static const char *version = PACKAGE_VERSION; + static const char *serial = "0"; + GUID uuid = { 0 }; + BYTE chassis; + struct smbios_buffer buf = { 0 }; + + append_smbios_bios( &buf, vendor, version, "01/01/2021" ); + append_smbios_system( &buf, vendor, product, version, serial, "", "", &uuid ); + chassis = append_smbios_chassis( &buf, 0, vendor, version, serial, "" ); + append_smbios_board( &buf, chassis, vendor, product, version, serial, "" ); + append_smbios_boot_info( &buf ); + append_smbios_end( &buf ); + return buf.prologue; } #endif

1 0

Alexandre Julliard : ntdll: Use null-terminated strings instead of explicit lengths to build SMBIOS data.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: b70f01cc122c0edb5a6db58707c2bfa23f082319 URL: https://gitlab.winehq.org/wine/wine/-/commit/b70f01cc122c0edb5a6db58707c2bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 13:40:14 2024 +0200 ntdll: Use null-terminated strings instead of explicit lengths to build SMBIOS data. --- dlls/ntdll/unix/system.c | 242 +++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 143 deletions(-)

1 0

Eric Pouech : cmd/tests: Test success/failure of commands.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 6f0e9e5e4e5db8cfbddad65d9bd10b00e1666dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/6f0e9e5e4e5db8cfbddad65d9bd10b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun May 5 09:08:23 2024 +0200 cmd/tests: Test success/failure of commands. The || and && operators to chain commands rely on the LHS command to be successful (or unsucessful) to decide upon launching the RHS command. Unfortunately, success/failure is not always when errorlevel is 0 (non zero). Some exmaples: - if a redirection fails (eg. appending to a non existing file), the command (builtin/external) is always unsuccessful (and the error level is untouched, - external command (when redirection is ok) is succesful when program exit code is zero, - ditto for a call to a label inside the batch file, with the 'exit /b' parameter, - it's way more complicated for builtins. Eg 'type' is unsuccessful on a non existing file, while 'dir' (on the same unexisting file) succeeds. So start adding some tests about success / failure of some commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 77207318223..8fa724c2682 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -450,6 +450,15 @@ if 1==0 (echo o1) else echo o2&&echo o3 if 1==0 (echo p1) else echo p2||echo p3 echo --- if 1==0 (echo q1) else echo q2&echo q3 +echo ------------- Testing internal commands return codes +call :setError 0 &&echo SUCCESS||echo FAILURE %errorlevel% +call :setError 33 &&echo SUCCESS||echo FAILURE %errorlevel% +call :setError 666 +echo foo &&echo SUCCESS||echo FAILURE %errorlevel% +echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% +type NUL &&echo SUCCESS||echo FAILURE %errorlevel% +type h:\i\dont\exist\at\all.txt &&echo SUCCESS||echo FAILURE %errorlevel% +echo --- echo ------------ Testing 'set' ------------ call :setError 0 rem Remove any WINE_FOO* WINE_BA* environment variables from shell before proceeding diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 026befada11..76665765b26 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -449,6 +449,15 @@ p2 @todo_wine(a)--- q2 q3 +------------- Testing internal commands return codes +SUCCESS +FAILURE 0 +(a)todo_wine@foo(a)space@ +(a)todo_wine@SUCCESS +(a)todo_wine@FAILURE 666 +SUCCESS +(a)todo_wine@FAILURE 0 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0

Eric Pouech : cmd/tests: Test calling batch files named as builtin commands.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 289c49ee211d3d8b57a8fe85a5bc73323a11201e URL: https://gitlab.winehq.org/wine/wine/-/commit/289c49ee211d3d8b57a8fe85a5bc73… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 9 10:48:07 2024 +0200 cmd/tests: Test calling batch files named as builtin commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 11 +++++++++++ 2 files changed, 31 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c0707e129b5..77207318223 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2711,7 +2711,13 @@ echo>robinfile if 1==1 call del batfile dir /b if exist batfile echo batfile shouldn't exist +rem arcane command, first resets errorlevel, second sets it to one +(call ) +echo %ErrorLevel% +(call) +echo %ErrorLevel% rem ... but not for 'if' or 'for' +call :setError 0 call if 1==1 echo bar 2> nul echo %ErrorLevel% call :setError 0 @@ -2738,6 +2744,20 @@ call if 1==1 ( call call call echo passed cd .. & rd /s/q foobar +echo --- mixing batch and builtins +erase /q echo.bat test.bat 2> NUL +echo @echo foo> echo.bat +echo @echo bar> test.bat & call test.bat +echo @echo.bat bar> test.bat & call test.bat +echo @call echo bar> test.bat & call test.bat +echo @call echo.bat bar> test.bat & call test.bat +erase /q echo.bat 2> NUL +echo @echo bar> test.bat & call test.bat +echo @echo.bat bar> test.bat & call test.bat +echo @call echo bar> test.bat & call test.bat +echo @call echo.bat bar> test.bat & call test.bat +erase /q test.bat 2> NUL + echo ------------ Testing SHIFT ------------ call :shiftFun p1 p2 p3 p4 p5 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7146bdaf26b..026befada11 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1537,6 +1537,8 @@ foo created Should expand foobaz batfile robinfile +0 +(a)todo_wine@1 1 1 non-builtin dir @@ -1545,6 +1547,15 @@ Line two Get if ... and else! passed +--- mixing batch and builtins +bar(a)space@ +(a)todo_wine@foo +foo +foo +bar(a)space@ +bat bar(a)space@ +bar(a)space@ +bat bar(a)space@ ------------ Testing SHIFT ------------ 'p1' 'p2' 'p3' 'p4' 'p5' 'p2' 'p3' 'p4' 'p5' ''

1 0

Rémi Bernon : win32u: Return STATUS_ALREADY_COMPLETE from UpdateDisplayDevices.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 9c93676d0c2a3e33dfdeaba2b3f9ce06226e3f9d URL: https://gitlab.winehq.org/wine/wine/-/commit/9c93676d0c2a3e33dfdeaba2b3f9ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 2 16:22:28 2024 +0200 win32u: Return STATUS_ALREADY_COMPLETE from UpdateDisplayDevices. When no display cache update is needed. --- dlls/win32u/driver.c | 6 +++--- dlls/win32u/sysparams.c | 21 ++++++++++++--------- dlls/wineandroid.drv/init.c | 6 ++++-- dlls/winemac.drv/display.c | 8 ++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winewayland.drv/display.c | 8 +++++--- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winex11.drv/display.c | 11 +++++++---- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 10 files changed, 39 insertions(+), 29 deletions(-)

1 0

Eric Pouech : cmd/tests: Test delayed expansion with spaces in IF and FOR.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 8bbd48bfd870b8fde94abf7e87e29a7afbcd114a URL: https://gitlab.winehq.org/wine/wine/-/commit/8bbd48bfd870b8fde94abf7e87e29a… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 11:16:52 2024 +0200 cmd/tests: Test delayed expansion with spaces in IF and FOR. Based on a patch by Alex Henrie. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 00d87a805d8..c0707e129b5 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -744,6 +744,17 @@ echo '%~xs1' goto :eof :endEchoFuns +setlocal EnableDelayedExpansion +set WINE_FOO=foo bar +for %%i in ("!WINE_FOO!") do echo %%i +for %%i in (!WINE_FOO!) do echo %%i +rem tests disabled for now... wine's cmd loops endlessly here +rem set WINE_FOO=4 4 4 +rem for /l %%i in (!WINE_FOO!) do echo %%i +rem set WINE_FOO=4 +rem for /l %%i in (1 2 !WINE_FOO!) do echo %%i +setlocal DisableDelayedExpansion + echo --- in digit variables for %%0 in (a b) do echo %%0 %%1 %%2 echo ------------ Testing parameter zero ------------ @@ -794,6 +805,12 @@ set WINE_FOO=foo echo %WINE_FOO% echo !WINE_FOO! set WINE_FOO= + +setlocal EnableDelayedExpansion +set WINE_FOO=foo bar +if !WINE_FOO!=="" (echo empty) else echo not empty +setlocal DisableDelayedExpansion + echo --- using /V cmd flag echo @echo off> tmp.cmd echo set WINE_FOO=foo>> tmp.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fab7c8742ec..7146bdaf26b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -600,6 +600,9 @@ N @drive@ '' '.eh'@or_broken@'' +"foo bar" +(a)todo_wine@foo +(a)todo_wine@bar --- in digit variables @todo_wine(a)a %1 %2 @todo_wine(a)b %1 %2 @@ -621,6 +624,7 @@ bar(a)or_broken@foo 0(a)or_broken@1 foo !WINE_FOO! +(a)todo_wine@not empty --- using /V cmd flag foo foo(a)or_broken@!WINE_FOO!

1 0

Akihiro Sagawa : winegstreamer: Seek to the end after MPEG splitter connection.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 7c03bca53bbd115d58a4a54beb5a8cbf82b9f875 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c03bca53bbd115d58a4a54beb5a8c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 31 21:02:42 2024 +0900 winegstreamer: Seek to the end after MPEG splitter connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56485 --- dlls/quartz/tests/mpegsplit.c | 2 +- dlls/winegstreamer/quartz_parser.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 8799c6afb8f..3d4ba8b7959 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -2183,7 +2183,7 @@ static void test_video_read_position(void) hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsource.read_position == total, "Got 0x%s, expected 0x%s.\n", wine_dbgstr_longlong(testsource.read_position), wine_dbgstr_longlong(total)); + ok(testsource.read_position == total, "Got 0x%s, expected 0x%s.\n", wine_dbgstr_longlong(testsource.read_position), wine_dbgstr_longlong(total)); IAsyncReader_Release(testsource.reader); IPin_Release(sink); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 32eb6e1a4a0..2c9fb896b1e 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2380,11 +2380,29 @@ static HRESULT mpeg_splitter_sink_get_media_type(struct strmbase_pin *pin, return S_OK; } +static HRESULT mpeg_splitter_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) +{ + struct parser *filter = impl_from_strmbase_sink(iface); + HRESULT hr = parser_sink_connect(iface, peer, pmt); + + /* Seek the reader to the end. RE:D Cherish! depends on this. */ + if (SUCCEEDED(hr) + && IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_MPEG1System) + && IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream)) + { + LONGLONG file_size, unused; + IAsyncReader_Length(filter->reader, &file_size, &unused); + IAsyncReader_SyncRead(filter->reader, file_size, 0, NULL); + } + + return hr; +} + static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, .base.pin_get_media_type = mpeg_splitter_sink_get_media_type, - .sink_connect = parser_sink_connect, + .sink_connect = mpeg_splitter_sink_connect, .sink_disconnect = parser_sink_disconnect, };

1 0

Jacek Caban : winecrt0: Support __os_arm64x_dispatch_call symbol on ARM64EC.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 8ed36639cb095d89ae58c33077c204bfe8008129 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ed36639cb095d89ae58c33077c204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 20:09:35 2024 +0200 winecrt0: Support __os_arm64x_dispatch_call symbol on ARM64EC. This is needed for hybrid patchable guest exit thunks generated by the compiler. --- dlls/winecrt0/arm64ec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/arm64ec.c b/dlls/winecrt0/arm64ec.c index 64bb001274a..38903ac17f0 100644 --- a/dlls/winecrt0/arm64ec.c +++ b/dlls/winecrt0/arm64ec.c @@ -24,7 +24,6 @@ #include "winnt.h" #include "wine/asm.h" -void *__os_arm64x_check_call = 0; void *__os_arm64x_check_icall_cfg = 0; void *__os_arm64x_dispatch_call_no_redirect = 0; void *__os_arm64x_dispatch_fptr = 0; @@ -51,6 +50,11 @@ asm( ".section .data,\"drw\"\n" "__os_arm64x_dispatch_icall:\n" ".globl __os_arm64x_check_icall\n" "__os_arm64x_check_icall:\n" + ".xword 0\n" + ".globl __os_arm64x_dispatch_call\n" + "__os_arm64x_dispatch_call:\n" + ".globl __os_arm64x_check_call\n" + "__os_arm64x_check_call:\n" ".xword 0\n" ); __ASM_GLOBAL_FUNC( __icall_helper_arm64ec,

1 0