May 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Remove driver-specific id from struct gdi_gpu.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 0300016ac54502200b37dd9bd8e4a97cfa41cc10 URL: https://gitlab.winehq.org/wine/wine/-/commit/0300016ac54502200b37dd9bd8e4a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 18:16:07 2024 +0200 win32u: Remove driver-specific id from struct gdi_gpu. --- dlls/winemac.drv/display.c | 1 - dlls/winewayland.drv/display.c | 3 +-- dlls/winex11.drv/display.c | 13 ++++++++++--- dlls/winex11.drv/x11drv.h | 13 +++++++++++-- dlls/winex11.drv/xinerama.c | 6 +++--- dlls/winex11.drv/xrandr.c | 14 +++++++------- include/wine/gdi_driver.h | 1 - 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b52bb39c0f6..fc2e680ca88 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1141,7 +1141,6 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage { struct gdi_gpu gdi_gpu = { - .id = gpu->id, .pci_id = { .vendor = gpu->vendor_id, diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 535a3c80ce3..efe5683d4eb 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -204,8 +204,7 @@ static void wayland_add_device_gpu(const struct gdi_device_manager *device_manag struct gdi_gpu gpu = {0}; lstrcpyW(gpu.name, wayland_gpuW); - TRACE("id=0x%s name=%s\n", - wine_dbgstr_longlong(gpu.id), wine_dbgstr_w(gpu.name)); + TRACE("name=%s\n", wine_dbgstr_w(gpu.name)); device_manager->add_gpu(&gpu, param); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 3ec20743f66..d64f6bb92d6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -395,7 +395,7 @@ POINT root_to_virtual_screen(INT x, INT y) RECT get_host_primary_monitor_rect(void) { INT gpu_count, adapter_count, monitor_count; - struct gdi_gpu *gpus = NULL; + struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; struct gdi_monitor *monitors = NULL; RECT rect = {0}; @@ -497,7 +497,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage { struct x11drv_adapter *adapters; struct gdi_monitor *monitors; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; DEVMODEW *modes; @@ -514,7 +514,14 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (gpu = 0; gpu < gpu_count; gpu++) { - device_manager->add_gpu( &gpus[gpu], param ); + struct gdi_gpu gdi_gpu = + { + .pci_id = gpus[gpu].pci_id, + .vulkan_uuid = gpus[gpu].vulkan_uuid, + .memory_size = gpus[gpu].memory_size, + }; + memcpy( gdi_gpu.name, gpus[gpu].name, sizeof(gdi_gpu.name) ); + device_manager->add_gpu( &gdi_gpu, param ); /* Initialize adapters */ if (!host_handler.get_adapters( gpus[gpu].id, &adapters, &adapter_count )) break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 384074becad..b4e63f1fbce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -764,6 +764,15 @@ void init_user_driver(void); /* X11 display device handler. Used to initialize display device registry data */ +struct x11drv_gpu +{ + ULONG_PTR id; + WCHAR name[128]; + struct pci_id pci_id; + GUID vulkan_uuid; + ULONGLONG memory_size; +}; + struct x11drv_adapter { ULONG_PTR id; @@ -782,7 +791,7 @@ struct x11drv_display_device_handler /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*get_gpus)(struct gdi_gpu **gpus, int *count, BOOL get_properties); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count, BOOL get_properties); /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. @@ -797,7 +806,7 @@ struct x11drv_display_device_handler BOOL (*get_monitors)(ULONG_PTR adapter_id, struct gdi_monitor **monitors, int *count); /* free_gpus will be called to free a GPU list from get_gpus */ - void (*free_gpus)(struct gdi_gpu *gpus); + void (*free_gpus)(struct x11drv_gpu *gpus); /* free_adapters will be called to free an adapter list from get_adapters */ void (*free_adapters)(struct x11drv_adapter *adapters); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index fbf80819204..5f489feb59d 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -190,10 +190,10 @@ done: return ret; } -static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_properties ) +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL get_properties ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; /* Xinerama has no support for GPU, faking one */ gpus = calloc( 1, sizeof(*gpus) ); @@ -208,7 +208,7 @@ static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_p return TRUE; } -static void xinerama_free_gpus( struct gdi_gpu *gpus ) +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) { free( gpus ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e183501b23f..51b316e71bd 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -627,8 +627,8 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info, - struct gdi_gpu *prev_gpus, int prev_gpu_count ) +static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRProviderInfo *provider_info, + struct x11drv_gpu *prev_gpus, int prev_gpu_count ) { static const char *extensions[] = { @@ -768,10 +768,10 @@ done: /* Get a list of GPUs reported by XRandR 1.4. Set get_properties to FALSE if GPU properties are * not needed to avoid unnecessary querying */ -static BOOL xrandr14_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_properties ) +static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL get_properties ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; - struct gdi_gpu *gpus = NULL; + struct x11drv_gpu *gpus = NULL; XRRScreenResources *screen_resources = NULL; XRRProviderResources *provider_resources = NULL; XRRProviderInfo *provider_info = NULL; @@ -844,7 +844,7 @@ static BOOL xrandr14_get_gpus( struct gdi_gpu **new_gpus, int *count, BOOL get_p /* Make primary GPU the first */ if (primary_provider > 0) { - struct gdi_gpu tmp = gpus[0]; + struct x11drv_gpu tmp = gpus[0]; gpus[0] = gpus[primary_provider]; gpus[primary_provider] = tmp; } @@ -865,7 +865,7 @@ done: return ret; } -static void xrandr14_free_gpus( struct gdi_gpu *gpus ) +static void xrandr14_free_gpus( struct x11drv_gpu *gpus ) { free( gpus ); } @@ -1253,7 +1253,7 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_s INT gpu_count, adapter_count, new_current_mode_count = 0; INT gpu_idx, adapter_idx, display_idx; struct x11drv_adapter *adapters; - struct gdi_gpu *gpus; + struct x11drv_gpu *gpus; WCHAR *end; /* Parse \\.\DISPLAY%d */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 447b5a86988..714db83e89c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -247,7 +247,6 @@ struct pci_id struct gdi_gpu { - ULONG_PTR id; WCHAR name[128]; struct pci_id pci_id; GUID vulkan_uuid; /* Vulkan device UUID */

1 0

Rémi Bernon : win32u: Pass gdi_gpu structure members as add_gpu parameters.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: d525da59075fc4baba95e19125ad23f0d96e6157 URL: https://gitlab.winehq.org/wine/wine/-/commit/d525da59075fc4baba95e19125ad23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 18:27:46 2024 +0200 win32u: Pass gdi_gpu structure members as add_gpu parameters. --- dlls/win32u/sysparams.c | 17 +++++++++-------- dlls/wineandroid.drv/init.c | 4 ++-- dlls/winemac.drv/display.c | 16 ++++++---------- dlls/winewayland.drv/display.c | 8 +++----- dlls/winex11.drv/display.c | 16 +++++----------- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xinerama.c | 7 +++---- dlls/winex11.drv/xrandr.c | 16 ++++++---------- include/wine/gdi_driver.h | 10 +--------- 9 files changed, 37 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : win32u: Return STATUS_ALREADY_COMPLETE from UpdateDisplayDevices.
by Alexandre Julliard 07 May '24

07 May '24

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

Akihiro Sagawa : quartz/tests: Test read position after MPEG splitter connection.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 3547dfc5299214b6fec2682401e82fe56a218311 URL: https://gitlab.winehq.org/wine/wine/-/commit/3547dfc5299214b6fec2682401e82f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 21:02:39 2024 +0900 quartz/tests: Test read position after MPEG splitter connection. To demonstrate the difference in behavior, we need a special MPEG program stream that is at least 32kB over in size. --- dlls/quartz/tests/mpegsplit.c | 50 +++++++++++++++++++++++++++++++++++++++++- dlls/quartz/tests/rsrc.rc | 4 ++++ dlls/quartz/tests/test2.mpg | Bin 0 -> 34816 bytes 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 8fd0202c58e..8799c6afb8f 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1084,6 +1084,7 @@ struct testfilter HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count, byte_count; REFERENCE_TIME segment_start, segment_end_min, segment_end_max, seek_start, seek_end; + LONGLONG read_position; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1318,7 +1319,9 @@ static HRESULT WINAPI async_reader_SyncReadAligned(IAsyncReader *iface, IMediaSa static HRESULT WINAPI async_reader_SyncRead(IAsyncReader *iface, LONGLONG position, LONG length, BYTE *buffer) { - return IAsyncReader_SyncRead(impl_from_IAsyncReader(iface)->reader, position, length, buffer); + struct testfilter *filter = impl_from_IAsyncReader(iface); + filter->read_position = position + length; + return IAsyncReader_SyncRead(filter->reader, position, length, buffer); } static HRESULT WINAPI async_reader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) @@ -2148,6 +2151,50 @@ static void test_no_acceptable_type(void) DeleteFileW(filename); } +static void test_video_read_position(void) +{ + IBaseFilter *filter = create_mpeg_splitter(), *reader; + const WCHAR *filename = load_resource(L"test2.mpg"); + struct IFileSourceFilter *filesource; + struct testfilter testsource; + LONGLONG total, avail; + IFilterGraph2 *graph; + IPin *sink, *source; + HRESULT hr; + BOOL ret; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsource); + IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"splitter"); + hr = IBaseFilter_FindPin(filter, L"Input", &sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IFileSourceFilter_Release(filesource); + IBaseFilter_FindPin(reader, L"Output", &source); + IPin_QueryInterface(source, &IID_IAsyncReader, (void **)&testsource.reader); + IAsyncReader_Length(testsource.reader, &total, &avail); + IPin_Release(source); + + 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)); + + IAsyncReader_Release(testsource.reader); + IPin_Release(sink); + IFilterGraph2_Release(graph); + IBaseFilter_Release(reader); + IBaseFilter_Release(filter); + IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); +} + START_TEST(mpegsplit) { IBaseFilter *filter; @@ -2176,6 +2223,7 @@ START_TEST(mpegsplit) test_large_file(); test_video_file(); test_no_acceptable_type(); + test_video_read_position(); CoUninitialize(); } diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 2cc0d789ff0..a16edacf1d1 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -35,3 +35,7 @@ test.mp3 RCDATA "test.mp3" /* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ /* @makedep: test.wav */ test.wav RCDATA "test.wav" + +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 2.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=64x48 -acodec mp2 -ar 32k -ab 96k test2.mpg */ +/* @makedep: test2.mpg */ +test2.mpg RCDATA "test2.mpg" diff --git a/dlls/quartz/tests/test2.mpg b/dlls/quartz/tests/test2.mpg new file mode 100644 index 00000000000..5122b6845a8 Binary files /dev/null and b/dlls/quartz/tests/test2.mpg differ

1 0

Akihiro Sagawa : winegstreamer: Seek to the end after MPEG splitter connection.
by Alexandre Julliard 07 May '24

07 May '24

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 07 May '24

07 May '24

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

Eric Pouech : cmd/tests: Test using %%0-%%9 as loop variables.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 14bdf6e725bf876d93fce25cb30cbdf967c4e001 URL: https://gitlab.winehq.org/wine/wine/-/commit/14bdf6e725bf876d93fce25cb30cbd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 11:02:43 2024 +0200 cmd/tests: Test using %%0-%%9 as loop variables. Based on a test case from Dimitry Sokolov. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7517cca343f..3b5fd384b54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -744,6 +744,8 @@ echo '%~xs1' goto :eof :endEchoFuns +echo --- in digit variables +for %%0 in (a b) do echo %%0 %%1 %%2 echo ------------ Testing parameter zero ------------ call :func parm1 parm2 goto :endParm0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1365a5c3474..3e5cdbe9942 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@'' +--- in digit variables +(a)todo_wine@a %1 %2 +(a)todo_wine@b %1 %2 ------------ Testing parameter zero ------------ :func parm1 [:func] [@drive@] [@path@] [test] [.cmd] [@drive@@shortpath(a)test.cmd]

1 0

Eric Pouech : cmd/tests: Test nested loop variables expansion.
by Alexandre Julliard 07 May '24

07 May '24

Module: wine Branch: master Commit: 232f282585fc008cef2c65d5d0b08ed569f7bc23 URL: https://gitlab.winehq.org/wine/wine/-/commit/232f282585fc008cef2c65d5d0b08e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 11:06:07 2024 +0200 cmd/tests: Test nested loop variables expansion. Based on a patch by Dimitry Sokolov. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 15 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3b5fd384b54..00d87a805d8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1403,6 +1403,18 @@ goto :endForTestFun2 echo %1 %2 goto :eof :endForTestFun2 +echo --- nested FORs and args tempering +set "WINE_ARGS= -foo=bar -x=y" +:test_for_loop_params_parse +for /F "tokens=1,* delims= " %%a in ("%WINE_ARGS%") do ( + for /F "tokens=1,2 delims==" %%1 in ("%%a") do ( + echo inner argument {%%1, %%2} + ) + set "WINE_ARGS=%%b" + goto :test_for_loop_params_parse +) +set "WINE_ARGS=" + mkdir foobar & cd foobar mkdir foo mkdir bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3e5cdbe9942..fab7c8742ec 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1000,6 +1000,9 @@ A C A D B C B D +--- nested FORs and args tempering +(a)todo_wine@inner argument {-foo, bar} +(a)todo_wine@inner argument {-x, y} --- basic wildcards bazbaz --- wildcards in subdirs

1 0

Eric Pouech : cmd/tests: Test delayed expansion with spaces in IF and FOR.
by Alexandre Julliard 07 May '24

07 May '24

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

Eric Pouech : cmd/tests: Test calling batch files named as builtin commands.
by Alexandre Julliard 07 May '24

07 May '24

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