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

Giovanni Mascellani : tests: Pad the constant buffer in test_update_compute_descriptor_tables() to 256 bytes.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: e4e7368c1c1881213a1f12e5db62211b8ec7aab8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4e7368c1c1881213a1f12e5db622… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 15:06:53 2024 +0200 tests: Pad the constant buffer in test_update_compute_descriptor_tables() to 256 bytes. The D3D12 debug layer signals an error otherwise. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f72f3632..8ff6e6ef 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17720,6 +17720,8 @@ static void test_update_compute_descriptor_tables(void) { struct uvec4 srv_size[2]; struct uvec4 uav_size[2]; + /* Constant buffers need to be padded to 256 bytes. */ + char pad[D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 2 * sizeof(struct uvec4[2])]; }; D3D12_ROOT_SIGNATURE_DESC root_signature_desc;

1 0

Giovanni Mascellani : tests: Terminate the Agility SDK path with a slash.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 7e557420b17cbf8b46153711813e2e872562ec58 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e557420b17cbf8b46153711813e2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 14:55:07 2024 +0200 tests: Terminate the Agility SDK path with a slash. That's what the documentation recommends. It used to work for me without the slash, but maybe they changed something in recent versions. --- README | 2 +- tests/d3d12_crosstest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index a3fcedde..86a2bf2e 100644 --- a/README +++ b/README @@ -153,4 +153,4 @@ these steps: * It's also possible to use '-DVKD3D_AGILITY_SDK_PATH=/path/to/sdk/' to specify the directory to load the Agility SDK DLLs from at runtime. If relative, the path is intended to be relative to the executable - path. If unspecified the path defaults to '.'. + path. If unspecified the path defaults to './'. diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 8388a7a7..b42696a8 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -268,7 +268,7 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm VKD3D_EXPORT const char *D3D12SDKPath = VKD3D_EXPAND_AND_STRINGIFY(VKD3D_AGILITY_SDK_PATH); # else # define VKD3D_AGILITY_SDK_EXPORT_PATH \ - VKD3D_EXPORT const char *D3D12SDKPath = "."; + VKD3D_EXPORT const char *D3D12SDKPath = "./"; # endif # define VKD3D_AGILITY_SDK_EXPORTS \ VKD3D_AGILITY_SDK_EXPORT_VERSION \

1 0

Giovanni Mascellani : vkd3d: Document how to install "Graphics Tools" to use the Agility SDK.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 7eb63a7c0d23a83bbdfcfa5ed83b943437051138 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7eb63a7c0d23a83bbdfcfa5ed83b9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 15:14:26 2024 +0200 vkd3d: Document how to install "Graphics Tools" to use the Agility SDK. This is a required step, otherwise the debug layer will not work. --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index 86a2bf2e..f6ded1cd 100644 --- a/README +++ b/README @@ -134,6 +134,10 @@ these steps: [1] https://devblogs.microsoft.com/directx/directx12agility/ + * You also need to enable the "Graphics Tools" optional feature in Windows. + Open the "Settings" applications, then look for "Apps", "Optional features", + "View features" and install "Graphics Tools". + * Configure vkd3d with something like: 'CROSSCC64="x86_64-w64-mingw32-gcc -DVKD3D_AGILITY_SDK_VERSION=<version>"', as well as the equivalent CROSSCC32 variable for the 32-bit

1 0

Conor McCarthy : vkd3d: Create a descriptor pool for static samplers when Vulkan-backed heaps are used.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 15f8657d74aedf6f671d4151fffd6ea565ee25fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/15f8657d74aedf6f671d4151fffd6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 5 00:33:10 2024 +1000 vkd3d: Create a descriptor pool for static samplers when Vulkan-backed heaps are used. Static samplers may be allocated from these pools. --- libs/vkd3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2bbc1705..ff3e41e6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2563,7 +2563,9 @@ static void device_init_descriptor_pool_sizes(struct d3d12_device *device) VKD3D_MAX_UAV_CLEAR_DESCRIPTORS_PER_TYPE); pool_sizes[1].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; pool_sizes[1].descriptorCount = pool_sizes[0].descriptorCount; - device->vk_pool_count = 2; + pool_sizes[2].type = VK_DESCRIPTOR_TYPE_SAMPLER; + pool_sizes[2].descriptorCount = min(limits->sampler_max_descriptors, D3D12_MAX_LIVE_STATIC_SAMPLERS); + device->vk_pool_count = 3; return; }

1 0

Jacek Caban : mshtml: Use host object script bindings for DOM nodes.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 5abc514afdbd767dfa0fb490ce5d05df8cc4e6f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5abc514afdbd767dfa0fb490ce5d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 21:46:57 2024 +0200 mshtml: Use host object script bindings for DOM nodes. --- dlls/mshtml/htmlevent.c | 3 +- dlls/mshtml/htmlnode.c | 6 +- dlls/mshtml/tests/documentmode.js | 160 +++++++++++++++++++------------------- 3 files changed, 87 insertions(+), 82 deletions(-)

1 0

Alistair Leslie-Hughes : odbc32: Handle NULL handles in SQLError/W.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 9d8ad0ef7fb0e7cdce0af6a521616e0ffef0e1e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d8ad0ef7fb0e7cdce0af6a521616e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 12 14:23:01 2024 +1000 odbc32: Handle NULL handles in SQLError/W. --- dlls/odbc32/proxyodbc.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 045738b45f7..46f96651b1d 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1217,8 +1217,16 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S } else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle)) { - ret = env->win32_funcs->SQLError( env->win32_handle, con->win32_handle, stmt->win32_handle, SqlState, - NativeError, MessageText, BufferLength, TextLength ); + const struct win32_funcs *win32_funcs = NULL; + + if (env) win32_funcs = env->win32_funcs; + else if (con) win32_funcs = con->win32_funcs; + else if (stmt) win32_funcs = stmt->win32_funcs; + + ret = win32_funcs->SQLError( env ? env->win32_handle : NULL, + con ? con->win32_handle : NULL, + stmt ? stmt->win32_handle : NULL, + SqlState, NativeError, MessageText, BufferLength, TextLength ); } if (SUCCESS( ret )) @@ -3781,10 +3789,16 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, } else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle)) { - ret = env->win32_funcs->SQLErrorW( env ? env->win32_handle : NULL, - con ? con->win32_handle : NULL, - stmt ? stmt->win32_handle : NULL, - SqlState, NativeError, MessageText, BufferLength, TextLength ); + const struct win32_funcs *win32_funcs = NULL; + + if (env) win32_funcs = env->win32_funcs; + else if (con) win32_funcs = con->win32_funcs; + else if (stmt) win32_funcs = stmt->win32_funcs; + + ret = win32_funcs->SQLErrorW( env ? env->win32_handle : NULL, + con ? con->win32_handle : NULL, + stmt ? stmt->win32_handle : NULL, + SqlState, NativeError, MessageText, BufferLength, TextLength ); } if (SUCCESS(ret ))

1 0

Eric Pouech : cmd: Add success/failure tests for pipes and drive change.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 7b1d6412b52cd12c901f2e3f20a5b186b1f06686 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b1d6412b52cd12c901f2e3f20a5b1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Jul 14 09:23:10 2024 +0200 cmd: Add success/failure tests for pipes and drive change. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 22 ++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 21 +++++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c67fc84988a..945b68e25a9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -467,12 +467,13 @@ if 1==0 (echo q1) else echo q2&echo q3 echo ------------- Testing internal commands return codes setlocal EnableDelayedExpansion -echo --- call and IF/FOR blocks +echo --- success/failure for basics call :setError 0 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! call :setError 33 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! call :setError 666 & (echo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & echo foo >> h:\i\dont\exist\at\all.txt & echo ERRORLEVEL !errorlevel! +echo --- success/failure for IF/FOR blocks call :setError 666 & ((if 1==1 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((if 1==0 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((if 1==1 (call :setError 33)) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) @@ -481,7 +482,6 @@ call :setError 666 & ((for %%i in () do echo "") &&echo SUCCESS !errorlevel!||ec call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 0) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) - echo --- success/failure for external command mkdir foo & cd foo call :setError 666 & (I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) @@ -503,6 +503,18 @@ call :setError 666 & (call cmd.exe /c "echo foo & exit /b 0" &&echo SUCCESS !err call :setError 666 & (call cmd.exe /c "echo foo & exit /b 1025" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (call rmdir foobar.dir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) cd .. && rd /q /s foo +echo --- success/failure for pipes +call :setError 666 & ((echo a | echo b) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((echo a | call :setError 34) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((call :setError 33 | echo a) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((echo a | rmdir I\dont\exist\at\all) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & ((rmdir I\dont\exist\at\all | echo a) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem in a pipe, if LHS or RHS can't be started, the whole cmd is abandonned (not just the pipe!!) +echo ^( %%1 ^| %%2 ^) > foo.bat +echo echo AFTER %%ERRORLEVEL%% >> foo.bat +call :setError 666 & (cmd.exe /q /c "call foo.bat echo I\dont\exist.exe" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cmd.exe /q /c "call foo.bat I\dont\exist.exe echo" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +erase /q foo.bat echo --- success/failure for START command call :setError 666 & (start "" /foobar >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem call :setError 666 & (start /B I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) @@ -568,6 +580,12 @@ call :setError 666 & (erase i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!| call :setError 666 & (erase file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) cd .. && rd /q /s foo +echo --- success/failure for change drive command +call :setError 666 & (c: &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (1: &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call c: &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call 1: &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) + echo --- success/failure for MKDIR,MD command mkdir foo & cd foo call :setError 666 & (mkdir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 84bcdcdf581..58b4dcfb00e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -452,13 +452,14 @@ p2 q2 q3 ------------- Testing internal commands return codes ---- call and IF/FOR blocks +--- success/failure for basics SUCCESS 0 FAILURE 33 foo(a)space@ SUCCESS 666 FAILURE 1 ERRORLEVEL 666 +--- success/failure for IF/FOR blocks SUCCESS 666 SUCCESS 666 FAILURE 33 @@ -485,7 +486,18 @@ SUCCESS 0 foo(a)space@ FAILURE 1025 FAILURE 2 ---- success/failure for START command +--- success/failure for pipes +b +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +a +(a)todo_wine@SUCCESS 0 +FAILURE 3 +a +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 255 +(a)todo_wine@FAILURE 255 +(a)todo_wine@--- success/failure for START command @todo_wine(a)FAILURE 1 foo(a)space@ SUCCESS 1024 @@ -521,6 +533,11 @@ FAILURE 1 SUCCESS 0 FAILURE 1 FAILURE 1 +--- success/failure for change drive command +(a)todo_wine@SUCCESS 666 +FAILURE 1 +(a)todo_wine@SUCCESS 0 +FAILURE 1 --- success/failure for MKDIR,MD command FAILURE 1 SUCCESS 0

1 0

Eric Pouech : cmd: Set success/failure for change drive command.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: a78746972fd19b6facec7e0cc596c3ed27a0f131 URL: https://gitlab.winehq.org/wine/wine/-/commit/a78746972fd19b6facec7e0cc596c3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 15 15:26:04 2024 +0200 cmd: Set success/failure for change drive command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 58b4dcfb00e..0ad3b0c80bd 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -534,9 +534,9 @@ SUCCESS 0 FAILURE 1 FAILURE 1 --- success/failure for change drive command -(a)todo_wine@SUCCESS 666 +SUCCESS 666 FAILURE 1 -(a)todo_wine@SUCCESS 0 +SUCCESS 0 FAILURE 1 --- success/failure for MKDIR,MD command FAILURE 1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f55e4c8d9e..dd49f2ab65d 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1732,7 +1732,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) { RETURN_CODE return_code; WCHAR *cmd, *parms_start; - int status, cmd_index, count; + int cmd_index, count; WCHAR *whichcmd; WCHAR *new_cmd = NULL; BOOL prev_echo_mode; @@ -1767,27 +1767,29 @@ static RETURN_CODE execute_single_command(const WCHAR *command) * else if it exists after whitespace is ignored */ - if ((cmd[1] == ':') && IsCharAlphaW(cmd[0]) && - (!cmd[2] || cmd[2] == ' ' || cmd[2] == '\t')) { + if (cmd[1] == L':' && (!cmd[2] || iswspace(cmd[2]))) { WCHAR envvar[5]; WCHAR dir[MAX_PATH]; /* Ignore potential garbage on the same line */ - cmd[2]=0x00; + cmd[2] = L'\0'; /* According to MSDN CreateProcess docs, special env vars record the current directory on each drive, in the form =C: so see if one specified, and if so go back to it */ lstrcpyW(envvar, L"="); lstrcatW(envvar, cmd); - if (GetEnvironmentVariableW(envvar, dir, MAX_PATH) == 0) { + if (GetEnvironmentVariableW(envvar, dir, ARRAY_SIZE(dir)) == 0) { wsprintfW(cmd, L"%s\\", cmd); WINE_TRACE("No special directory settings, using dir of %s\n", wine_dbgstr_w(cmd)); } WINE_TRACE("Got directory %s as %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(cmd)); - status = SetCurrentDirectoryW(cmd); - if (!status) WCMD_print_error (); - return_code = ERROR_INVALID_FUNCTION; + if (!SetCurrentDirectoryW(cmd)) + { + WCMD_print_error(); + return_code = errorlevel = ERROR_INVALID_FUNCTION; + } + else return_code = NO_ERROR; goto cleanup; }

1 0

Eric Pouech : cmd: Run pipe LHS & RHS outside of any batch context.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 30bbc1804dd631ef7a7a04130e1768e3049b01bf URL: https://gitlab.winehq.org/wine/wine/-/commit/30bbc1804dd631ef7a7a04130e1768… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 15 18:29:19 2024 +0200 cmd: Run pipe LHS & RHS outside of any batch context. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0ad3b0c80bd..33d4609f289 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -489,7 +489,7 @@ FAILURE 2 --- success/failure for pipes b @todo_wine(a)SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 a @todo_wine(a)SUCCESS 0 FAILURE 3 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index dd49f2ab65d..e1c8802f6e8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3700,7 +3700,10 @@ RETURN_CODE node_execute(CMD_NODE *node) WCHAR filename[MAX_PATH]; CMD_REDIRECTION *output; HANDLE saved_output; + BATCH_CONTEXT *saved_context = context; + /* pipe LHS & RHS are run outside of any batch context */ + context = NULL; /* FIXME: a real pipe instead of writing to an intermediate file would be * better. * But waiting for completion of commands will require more work. @@ -3743,6 +3746,7 @@ RETURN_CODE node_execute(CMD_NODE *node) } else return_code = ERROR_INVALID_FUNCTION; redirection_dispose_list(output); + context = saved_context; } break; case CMD_IF:

1 0

Eric Pouech : cmd: Better test error handling for pipes.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 85db1fe1e5bf8edf35661f31ffdda2ea2a338c8a URL: https://gitlab.winehq.org/wine/wine/-/commit/85db1fe1e5bf8edf35661f31ffdda2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jul 13 17:00:40 2024 +0200 cmd: Better test error handling for pipes. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ programs/cmd/wcmdmain.c | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 33d4609f289..5d9629e35a9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -488,16 +488,16 @@ FAILURE 1025 FAILURE 2 --- success/failure for pipes b -(a)todo_wine@SUCCESS 0 +SUCCESS 0 FAILURE 1 a -(a)todo_wine@SUCCESS 0 +SUCCESS 0 FAILURE 3 a -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 255 -(a)todo_wine@FAILURE 255 -(a)todo_wine@--- success/failure for START command +SUCCESS 0 +FAILURE 255 +FAILURE 255 +--- success/failure for START command @todo_wine(a)FAILURE 1 foo(a)space@ SUCCESS 1024 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e1c8802f6e8..d3ad93837d4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3723,12 +3723,13 @@ RETURN_CODE node_execute(CMD_NODE *node) if (set_std_redirections(output)) { RETURN_CODE return_code_left = node_execute(node->left); - return_code = NO_ERROR; - CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); SetStdHandle(STD_OUTPUT_HANDLE, saved_output); - if (return_code == NO_ERROR) + if (errorlevel == RETURN_CODE_CANT_LAUNCH && saved_context) + ExitProcess(255); + return_code = ERROR_INVALID_FUNCTION; + if (return_code_left != RETURN_CODE_ABORTED && errorlevel != RETURN_CODE_CANT_LAUNCH) { HANDLE h = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, @@ -3737,12 +3738,12 @@ RETURN_CODE node_execute(CMD_NODE *node) { SetStdHandle(STD_INPUT_HANDLE, h); return_code = node_execute(node->right); + if (errorlevel == RETURN_CODE_CANT_LAUNCH && saved_context) + ExitProcess(255); } - else return_code = ERROR_INVALID_FUNCTION; } DeleteFileW(filename); - if (return_code_left != NO_ERROR || return_code != NO_ERROR) - errorlevel = ERROR_INVALID_FUNCTION; + errorlevel = return_code; } else return_code = ERROR_INVALID_FUNCTION; redirection_dispose_list(output);

1 0