June 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Store detached args into a scope's specialized buffer.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 1b385fa37c908a1b4501055f64499d398be45521 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b385fa37c908a1b4501055f64499d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:01 2023 +0300 jscript: Store detached args into a scope's specialized buffer. Rather than using the variable obj for it. Since it's an implementation detail, the scope's dispex object accesses them using index props (using same indices as the buffer's). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 8 +++ dlls/jscript/engine.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/engine.h | 9 +++- dlls/jscript/function.c | 42 +++++----------- dlls/jscript/jscript.h | 1 + 5 files changed, 153 insertions(+), 35 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Fix function leak in scope_init_locals.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 08e0ebee494e59814cd2c280c031909e4baaa4db URL: https://gitlab.winehq.org/wine/wine/-/commit/08e0ebee494e59814cd2c280c03190… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Fix function leak in scope_init_locals. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a4b416ba8ed..b48202ed16f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -978,7 +978,10 @@ static HRESULT scope_init_locals(script_ctx_t *ctx) return hres; val = jsval_obj(func_obj); if (detached_vars && FAILED(hres = jsdisp_propput_name(frame->variable_obj, name, jsval_obj(func_obj)))) + { + jsdisp_release(func_obj); return hres; + } } else { @@ -987,7 +990,9 @@ static HRESULT scope_init_locals(script_ctx_t *ctx) if (detached_vars) { - if (FAILED(hres = jsdisp_propput_name(scope->jsobj, name, val))) + hres = jsdisp_propput_name(scope->jsobj, name, val); + jsval_release(val); + if (FAILED(hres)) return hres; } else

1 0

Gabriel Ivăncescu : jscript: Fix addressing invalid memory if ref is an argument.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 2173cac68e668eea3d28c30e9fc11ea8ee13fa51 URL: https://gitlab.winehq.org/wine/wine/-/commit/2173cac68e668eea3d28c30e9fc11e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Fix addressing invalid memory if ref is an argument. `ref` can be negative in case it refers to an argument. Even though scope != frame->base_scope would rule this out (because only base scopes have args), it was checked *after* the memory access, which would read out of bounds memory first. This didn't appear as an issue in practice since it's using the heap pool, so there's probably valid memory before it, but it's still wrong. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9e375294cb5..a4b416ba8ed 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -657,7 +657,7 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ if (FAILED(hres = jsdisp_propput_name(scope->jsobj, name, ctx->stack[local_off(frame, ref)]))) return hres; - if (frame->function->variables[ref].func_id != -1 && scope != frame->base_scope + if (scope != frame->base_scope && frame->function->variables[ref].func_id != -1 && FAILED(hres = jsdisp_propput_name(frame->variable_obj, name, ctx->stack[local_off(frame, ref)]))) return hres; }

1 0

Gabriel Ivăncescu : jscript: Get rid of jsobj in scope_chain_t.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 0e9d221582da5e7ee1b8c7a549b05a8007cb5f56 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e9d221582da5e7ee1b8c7a549b05a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Get rid of jsobj in scope_chain_t. It was confusing and aliased to obj when it was a jsdisp (and shared ref), but we can obtain that already with helpers as needed (as_jsdisp and to_jsdisp), no reason to keep it so confusing and a separate field. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 57 +++++++++++++++++++++++++------------------------ dlls/jscript/engine.h | 1 - dlls/jscript/function.c | 11 +++++----- 3 files changed, 35 insertions(+), 34 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Correctly implement context for indirect eval calls in ES5+ modes.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: a184ace43d1064537e0cf3073e4ee5cc2ed503aa URL: https://gitlab.winehq.org/wine/wine/-/commit/a184ace43d1064537e0cf3073e4ee5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 21 17:58:00 2023 +0300 jscript: Correctly implement context for indirect eval calls in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/compile.c | 14 +++++++---- dlls/jscript/engine.c | 34 ++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/function.c | 6 +++++ dlls/jscript/global.c | 9 +++++-- dlls/jscript/jscript.h | 2 ++ dlls/jscript/tests/api.js | 43 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 51 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 153 insertions(+), 7 deletions(-)

1 0

Rémi Bernon : win32u: Split default UpdateDisplayDevices implementation to a helper.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 08fd8ad0b693e7f166a5cff6cb3167cca06f3661 URL: https://gitlab.winehq.org/wine/wine/-/commit/08fd8ad0b693e7f166a5cff6cb3167… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 20 17:19:50 2023 +0200 win32u: Split default UpdateDisplayDevices implementation to a helper. --- dlls/win32u/sysparams.c | 118 +++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 52 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b941d01e3b7..14ca306219a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1718,11 +1718,75 @@ static BOOL is_same_devmode( const DEVMODEW *a, const DEVMODEW *b ) a->dmDisplayFrequency == b->dmDisplayFrequency; } +static BOOL default_update_display_devices( const struct gdi_device_manager *manager, BOOL force, struct device_manager_ctx *ctx ) +{ + /* default implementation: expose an adapter and a monitor with a few standard modes, + * and read / write current display settings from / to the registry. + */ + static const DEVMODEW modes[] = + { + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 32, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, + { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmBitsPerPel = 16, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, + }; + static const struct gdi_gpu gpu; + static const struct gdi_adapter adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, + }; + struct gdi_monitor monitor = + { + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + }; + DEVMODEW mode = {{0}}; + UINT i; + + if (!force) return TRUE; + + manager->add_gpu( &gpu, ctx ); + manager->add_adapter( &adapter, ctx ); + + if (!read_adapter_mode( ctx->adapter_key, ENUM_CURRENT_SETTINGS, &mode )) + { + mode = modes[2]; + mode.dmFields |= DM_POSITION; + } + monitor.rc_monitor.right = mode.dmPelsWidth; + monitor.rc_monitor.bottom = mode.dmPelsHeight; + monitor.rc_work.right = mode.dmPelsWidth; + monitor.rc_work.bottom = mode.dmPelsHeight; + + manager->add_monitor( &monitor, ctx ); + for (i = 0; i < ARRAY_SIZE(modes); ++i) + { + if (is_same_devmode( modes + i, &mode )) manager->add_mode( &mode, TRUE, ctx ); + else manager->add_mode( modes + i, FALSE, ctx ); + } + + return TRUE; +} + +static BOOL update_display_devices( const struct gdi_device_manager *manager, BOOL force, struct device_manager_ctx *ctx ) +{ + if (user_driver->pUpdateDisplayDevices( manager, force, ctx )) return TRUE; + return default_update_display_devices( manager, force, ctx ); +} + static BOOL update_display_cache( BOOL force ) { HWINSTA winstation = NtUserGetProcessWindowStation(); struct device_manager_ctx ctx = {0}; USEROBJECTFLAGS flags; + BOOL ret; /* services do not have any adapters, only a virtual monitor */ if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) @@ -1735,59 +1799,9 @@ static BOOL update_display_cache( BOOL force ) return TRUE; } - if (!user_driver->pUpdateDisplayDevices( &device_manager, force, &ctx ) && force) - { - /* default implementation: expose an adapter and a monitor with a few standard modes, - * and read / write current display settings from / to the registry. - */ - static const DEVMODEW modes[] = - { - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 32, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmBitsPerPel = 16, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, - }; - static const struct gdi_gpu gpu; - static const struct gdi_adapter adapter = - { - .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, - }; - struct gdi_monitor monitor = - { - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - }; - DEVMODEW mode = {{0}}; - UINT i; - - add_gpu( &gpu, &ctx ); - add_adapter( &adapter, &ctx ); - - if (!read_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode )) - { - mode = modes[2]; - mode.dmFields |= DM_POSITION; - } - monitor.rc_monitor.right = mode.dmPelsWidth; - monitor.rc_monitor.bottom = mode.dmPelsHeight; - monitor.rc_work.right = mode.dmPelsWidth; - monitor.rc_work.bottom = mode.dmPelsHeight; - - add_monitor( &monitor, &ctx ); - for (i = 0; i < ARRAY_SIZE(modes); ++i) - { - if (is_same_devmode( modes + i, &mode )) add_mode( &mode, TRUE, &ctx ); - else add_mode( modes + i, FALSE, &ctx ); - } - } + ret = update_display_devices( &device_manager, force, &ctx ); release_display_manager_ctx( &ctx ); + if (!ret) WARN( "Failed to update display devices\n" ); if (!update_display_cache_from_registry()) {

1 0

Rémi Bernon : win32u: Move virtual desktop display settings logic from winex11.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 9b7669592d6f8b40976b571b70f8543777d35167 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b7669592d6f8b40976b571b70f854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 20 17:23:28 2023 +0200 win32u: Move virtual desktop display settings logic from winex11. --- dlls/win32u/sysparams.c | 253 ++++++++++++++++++++++++++++++++++-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/winstation.c | 2 + dlls/winex11.drv/desktop.c | 300 +------------------------------------------ dlls/winex11.drv/display.c | 45 ++----- dlls/winex11.drv/x11drv.h | 1 - 6 files changed, 258 insertions(+), 344 deletions(-)

1 0

Giovanni Mascellani : dxgi: Rename and split d3d12_swapchain_destroy_buffers().
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: e0ce5e331ae57954773e9c9349d6489b0a910c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ce5e331ae57954773e9c9349d648… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 30 16:11:33 2023 +0200 dxgi: Rename and split d3d12_swapchain_destroy_buffers(). --- dlls/dxgi/swapchain.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 480447342e4..f760e931bb1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1579,7 +1579,7 @@ static VkResult d3d12_swapchain_acquire_next_vulkan_image(struct d3d12_swapchain return vr; } -static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) +static void d3d12_swapchain_destroy_vulkan_resources(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkQueue vk_queue; @@ -1599,34 +1599,41 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } + if (swapchain->vk_device) + { + for (i = 0; i < swapchain->buffer_count; ++i) + { + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } + + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + } +} + +static void d3d12_swapchain_destroy_resources(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + unsigned int i; + + d3d12_swapchain_destroy_vulkan_resources(swapchain); + for (i = 0; i < swapchain->desc.BufferCount; ++i) { - if (swapchain->buffers[i] && destroy_user_buffers) + if (swapchain->buffers[i]) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; } - if (swapchain->vk_device && destroy_user_buffers) + if (swapchain->vk_device) { vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); swapchain->vk_images[i] = VK_NULL_HANDLE; - } - } - if (swapchain->vk_device) - { - for (i = 0; i < swapchain->buffer_count; ++i) - { - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - swapchain->vk_semaphores[i] = VK_NULL_HANDLE; - } - if (destroy_user_buffers) - { vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); swapchain->vk_memory = VK_NULL_HANDLE; } - vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); - swapchain->vk_cmd_pool = VK_NULL_HANDLE; } } @@ -1831,7 +1838,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; - d3d12_swapchain_destroy_buffers(swapchain, TRUE); + d3d12_swapchain_destroy_resources(swapchain); if (swapchain->frame_latency_event) CloseHandle(swapchain->frame_latency_event); @@ -1966,7 +1973,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - d3d12_swapchain_destroy_buffers(swapchain, FALSE); + d3d12_swapchain_destroy_vulkan_resources(swapchain); swapchain->present_mode = present_mode; return d3d12_swapchain_create_vulkan_resources(swapchain); } @@ -2074,7 +2081,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, TRACE("Recreating Vulkan swapchain.\n"); - d3d12_swapchain_destroy_buffers(swapchain, FALSE); + d3d12_swapchain_destroy_vulkan_resources(swapchain); if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; @@ -2352,7 +2359,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) return S_OK; - d3d12_swapchain_destroy_buffers(swapchain, TRUE); + d3d12_swapchain_destroy_resources(swapchain); swapchain->desc = new_desc; return d3d12_swapchain_create_resources(swapchain); }

1 0

Liam Middlebrook : cmd: Fix empty strings between PATH separators.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 0911d462f977aef1071b59b70cfa68398f13663b URL: https://gitlab.winehq.org/wine/wine/-/commit/0911d462f977aef1071b59b70cfa68… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Jun 20 10:33:56 2023 -0700 cmd: Fix empty strings between PATH separators. Previously if an empty string was encountered while parsing out PATH, cmd.exe would ignore the rest of the PATH entirely. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55097 Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> --- programs/cmd/wcmdmain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 022ff6637c5..de6e721b26a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1135,6 +1135,12 @@ void WCMD_run_program (WCHAR *command, BOOL called) else lstrcpyW(temp, thisDir + 1); + /* When temp is an empty string, skip over it. This needs + to be done before the expansion, because WCMD_get_fullpath + fails when given an empty string */ + if (*temp == '\0') + continue; + /* Since you can have eg. ..\.. on the path, need to expand to full information */ if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) return;

1 0

Liam Middlebrook : cmd/tests: Add tests for PATH separator.
by Alexandre Julliard June 21, 2023

June 21, 2023

Module: wine Branch: master Commit: 9aee47f7f6d0122764286e4bffdbfe468e15e6f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9aee47f7f6d0122764286e4bffdbfe… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Jun 20 10:48:45 2023 -0700 cmd/tests: Add tests for PATH separator. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55097 Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> --- programs/cmd/tests/test_builtins.cmd | 23 +++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++++ 2 files changed, 32 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3829be50f1a..fe7bedb1362 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3294,6 +3294,29 @@ path try2 path path=try3 path + +echo ------------ Testing PATH Evaluate ------------ +mkdir folder +echo echo I'm here! > folder\sub1.bat + +echo Test normal PATH usage +set path=%cd%\folder +call sub1.bat + +echo Test PATH usage with leading semicolon +set path=;%cd%\folder +call sub1.bat + +echo Test PATH usage with fallback path +set path=%cd%;%cd%\folder +call sub1.bat + +echo Test PATH usage with double semicolon +set path=%cd%;;%cd%\folder +call sub1.bat + +del folder\sub1.bat +rmdir folder set path=%WINE_backup_path% set WINE_backup_path= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 437ded18000..91570a7990f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1680,6 +1680,15 @@ Finished PATH=original PATH=try2 PATH=try3 +------------ Testing PATH Evaluate ------------ +Test normal PATH usage +I'm here!@space@ +Test PATH usage with leading semicolon +I'm here!@space@ +Test PATH usage with fallback path +I'm here!@space@ +Test PATH usage with double semicolon +I'm here!@space@ ------------ Testing start /W ------------ start /W seems to really wait ------------ Testing changing the drive letter ----------

1 0