- Wine-Commits - list.winehq.org

Eric Pouech : cmd: Improve return code/errorlevel support for external commands.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 25275895273360f70969d0dca88be3d3d49524a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/25275895273360f70969d0dca88be3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 10:21:30 2024 +0200 cmd: Improve return code/errorlevel support for external commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 31 ++++++++++++++----------------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d028c3fe1e6..a96c7dde10b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -466,9 +466,9 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for external command -(a)todo_wine@FAILURE 1 +FAILURE 1 @todo_wine(a)ERRORLEVEL 3 -(a)todo_wine@FAILURE 1 +FAILURE 1 ERRORLEVEL 9009 foo(a)space@ SUCCESS 0 @@ -482,7 +482,7 @@ foo(a)space@ SUCCESS 0 foo(a)space@ FAILURE 1025 -(a)todo_wine@FAILURE 2 +FAILURE 2 --- success/failure for START command @todo_wine(a)FAILURE 1 foo(a)space@ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c61f9b41cd5..dfa4c00e4cd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -193,7 +193,7 @@ void WCMD_print_error (void); RETURN_CODE WCMD_pushd(const WCHAR *args); RETURN_CODE WCMD_remove_dir(WCHAR *command); RETURN_CODE WCMD_rename(void); -void WCMD_run_program (WCHAR *command, BOOL called); +RETURN_CODE WCMD_run_program (WCHAR *command, BOOL called); RETURN_CODE WCMD_setlocal(WCHAR *args); RETURN_CODE WCMD_setshow_date(void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 53b08c0b137..d53072ca567 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1413,7 +1413,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command); * so go back through wcmd_execute. */ -void WCMD_run_program (WCHAR *command, BOOL called) +RETURN_CODE WCMD_run_program(WCHAR *command, BOOL called) { WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; @@ -1432,7 +1432,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); - if (!firstParam[0]) return; + if (!firstParam[0]) return NO_ERROR; /* Calculate the search path and stem to search for */ if (wcspbrk(firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */ @@ -1445,7 +1445,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (lstrlenW(firstParam) >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); - return; + return ERROR_INVALID_FUNCTION; } lstrcpyW(stemofsearch, firstParam); @@ -1453,7 +1453,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } else { /* Convert eg. ..\fred to include a directory by removing file part */ - if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) return; + if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) + return ERROR_INVALID_FUNCTION; lastSlash = wcsrchr(pathtosearch, '\\'); if (lastSlash && wcschr(lastSlash, '.') != NULL) extensionsupplied = TRUE; lstrcpyW(stemofsearch, lastSlash+1); @@ -1527,7 +1528,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* 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; + if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) + return ERROR_INVALID_FUNCTION; } /* 1. If extension supplied, see if that file exists */ @@ -1600,7 +1602,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) } if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) errorlevel = return_code; - return; + return return_code; } else { DWORD exit_code; /* thisDir contains the file to be launched, but with what? @@ -1625,8 +1627,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* strip first and last quote WCHARacters and try again */ WCMD_strip_quotes(command); opt_s = TRUE; - WCMD_run_program(command, called); - return; + return WCMD_run_program(command, called); } if (!status) @@ -1641,16 +1642,14 @@ void WCMD_run_program (WCHAR *command, BOOL called) CloseHandle(pe.hProcess); CloseHandle(pe.hThread); - return; + return errorlevel; } } } /* Not found anywhere - were we called? */ - if (called) { - execute_single_command(command); - return; - } + if (called) + return errorlevel = execute_single_command(command); /* Not found anywhere - give up */ WCMD_output_stderr(WCMD_LoadMessage(WCMD_NO_COMMAND_FOUND), command); @@ -1658,8 +1657,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* If a command fails to launch, it sets errorlevel 9009 - which does not seem to have any associated constant definition */ errorlevel = RETURN_CODE_CANT_LAUNCH; - return; - + return ERROR_INVALID_FUNCTION; } /* this is obviously wrong... will require more work to be fixed */ @@ -1931,8 +1929,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; default: prev_echo_mode = echo_mode; - WCMD_run_program (whichcmd, FALSE); - return_code = errorlevel; + return_code = WCMD_run_program(whichcmd, FALSE); echo_mode = prev_echo_mode; }

1 0

Eric Pouech : cmd: Set success/failure return code for MKLINK command.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: cd331dd3a47bdcd7e53f95fb52628db3cf05d5af URL: https://gitlab.winehq.org/wine/wine/-/commit/cd331dd3a47bdcd7e53f95fb52628d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:44:44 2024 +0200 cmd: Set success/failure return code for MKLINK command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 35 ++++++++++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d1be9aab967..869c3d9d088 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4088,7 +4088,7 @@ RETURN_CODE WCMD_color(void) * WCMD_mklink */ -void WCMD_mklink(WCHAR *args) +RETURN_CODE WCMD_mklink(WCHAR *args) { int argno = 0; WCHAR *argN = args; @@ -4099,11 +4099,6 @@ void WCMD_mklink(WCHAR *args) WCHAR file1[MAX_PATH]; WCHAR file2[MAX_PATH]; - if (param1[0] == 0x00 || param2[0] == 0x00) { - WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; - } - file1[0] = 0; while (argN) { @@ -4119,7 +4114,12 @@ void WCMD_mklink(WCHAR *args) hard = TRUE; else if (lstrcmpiW(thisArg, L"/J") == 0) junction = TRUE; - else { + else if (*thisArg == L'/') + { + return errorlevel = ERROR_INVALID_FUNCTION; + } + else + { if(!file1[0]) lstrcpyW(file1, thisArg); else @@ -4127,13 +4127,18 @@ void WCMD_mklink(WCHAR *args) } } - if(hard) - ret = CreateHardLinkW(file1, file2, NULL); - else if(!junction) - ret = CreateSymbolicLinkW(file1, file2, isdir); - else - WINE_TRACE("Juction links currently not supported.\n"); + if (*file1 && *file2) + { + if (hard) + ret = CreateHardLinkW(file1, file2, NULL); + else if(!junction) + ret = CreateSymbolicLinkW(file1, file2, isdir); + else + TRACE("Junction links currently not supported.\n"); + } + + if (ret) return errorlevel = NO_ERROR; - if(!ret) - WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1); + return errorlevel = ERROR_INVALID_FUNCTION; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ed0e7d8d1e3..d028c3fe1e6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -558,13 +558,13 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 --- success/failure for MKLINK command -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +SUCCESS 0 +FAILURE 1 --- success/failure for SETLOCAL/ENDLOCAL commands FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5a54fc5e925..a727a651516 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -208,7 +208,7 @@ RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); RETURN_CODE WCMD_version(void); RETURN_CODE WCMD_volume(void); -void WCMD_mklink(WCHAR *args); +RETURN_CODE WCMD_mklink(WCHAR *args); WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 505d816eabb..2826f9a609a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1928,7 +1928,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_choice(parms_start); break; case WCMD_MKLINK: - WCMD_mklink(parms_start); + return_code = WCMD_mklink(parms_start); break; case WCMD_EXIT: return_code = WCMD_exit();

1 0

Eric Pouech : cmd: Set success/failure return code for START command.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: f0eb0c3ec9d3a37769c35ae0da49fa15864a704b URL: https://gitlab.winehq.org/wine/wine/-/commit/f0eb0c3ec9d3a37769c35ae0da49fa… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 15:06:18 2024 +0200 cmd: Set success/failure return code for START command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 11 +++++++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 869c3d9d088..17671c32eba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3408,8 +3408,9 @@ RETURN_CODE WCMD_shift(const WCHAR *args) /**************************************************************************** * WCMD_start */ -void WCMD_start(WCHAR *args) +RETURN_CODE WCMD_start(WCHAR *args) { + RETURN_CODE return_code = NO_ERROR; int argno; int have_title; WCHAR file[MAX_PATH]; @@ -3457,6 +3458,11 @@ void WCMD_start(WCHAR *args) * * WCMD_parameter_with_delims will take care of everything for us. */ + /* FIXME: using an external start.exe has several caveats: + * - cannot discriminate syntax error in arguments from child's return code + * - need to access start.exe's child to get its running state + * (not start.exe itself) + */ have_title = FALSE; for (argno=0; ; argno++) { WCHAR *thisArg, *argN; @@ -3521,9 +3527,10 @@ void WCMD_start(WCHAR *args) { SetLastError(ERROR_FILE_NOT_FOUND); WCMD_print_error (); - errorlevel = RETURN_CODE_CANT_LAUNCH; + return_code = errorlevel = ERROR_INVALID_FUNCTION; } free(cmdline); + return return_code; } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index a727a651516..c61f9b41cd5 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ RETURN_CODE WCMD_setshow_path(const WCHAR *args); RETURN_CODE WCMD_setshow_prompt(void); RETURN_CODE WCMD_setshow_time(void); RETURN_CODE WCMD_shift(const WCHAR *args); -void WCMD_start (WCHAR *args); +RETURN_CODE WCMD_start(WCHAR *args); RETURN_CODE WCMD_title(const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2826f9a609a..b1d3ff81c04 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1886,7 +1886,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_shift(parms_start); break; case WCMD_START: - WCMD_start (parms_start); + return_code = WCMD_start(parms_start); break; case WCMD_TIME: return_code = WCMD_setshow_time();

1 0

Eric Pouech : cmd: Move empty batch command handling to WCMD_batch() callers.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: c8681975147f567b8ad95a6e04386f9502df28d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8681975147f567b8ad95a6e04386f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 12:22:07 2024 +0200 cmd: Move empty batch command handling to WCMD_batch() callers. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 18 +++++++++++++----- programs/cmd/wcmdmain.c | 6 +----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 17ef569dc3f..d2ad690967d 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -664,11 +664,19 @@ RETURN_CODE WCMD_call(WCHAR *command) /* Run other program if no leading ':' */ if (*command != ':') { - WCMD_run_program(buffer, TRUE); - /* If the thing we try to run does not exist, call returns 1 */ - if (errorlevel == RETURN_CODE_CANT_LAUNCH) - errorlevel = ERROR_INVALID_FUNCTION; - return_code = errorlevel; + if (*WCMD_skip_leading_spaces(buffer) == L'\0') + /* FIXME it's incomplete as (call) should return 1, and (call ) should return 0... + * but we need to get the untouched string in command + */ + return_code = errorlevel = NO_ERROR; + else + { + WCMD_run_program(buffer, TRUE); + /* If the thing we try to run does not exist, call returns 1 */ + if (errorlevel == RETURN_CODE_CANT_LAUNCH) + errorlevel = ERROR_INVALID_FUNCTION; + return_code = errorlevel; + } } else if (context) { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b1d3ff81c04..53b08c0b137 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1431,12 +1431,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Quick way to get the filename is to extract the first argument. */ WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); - if (!firstParam) return; - if (!firstParam[0]) { - errorlevel = NO_ERROR; - return; - } + if (!firstParam[0]) return; /* Calculate the search path and stem to search for */ if (wcspbrk(firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */

1 0

Eric Pouech : cmd: Add more tests for return codes in builtin commands.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 66042a1184ab80ae7639bf90a15bd6a7c83c82b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/66042a1184ab80ae7639bf90a15bd6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jul 9 11:46:57 2024 +0200 cmd: Add more tests for return codes in builtin commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 41 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 30 +++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b43848575fc..66d5e894662 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -468,6 +468,35 @@ call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !error 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!) +call :setError 666 & I\dont\exist.exe & echo ERRORLEVEL !errorlevel! +call :setError 666 & (Idontexist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & Idontexist.exe & echo ERRORLEVEL !errorlevel! +call :setError 666 & (cmd.exe /c "echo foo & exit /b 0" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cmd.exe /c "echo foo & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo +echo --- success/failure for CALL command +mkdir foo & cd foo +echo exit /b %%1 > foobar.bat +rem call :setError 666 & (call I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem terminates batch exec on native... +call :setError 666 & (call Idontexist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call .\foobar.bat 0 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call .\foobar.bat 1024 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call cmd.exe /c "echo foo & exit /b 0" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +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 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!) +rem can't run this test, generates a nice popup under windows +call :setError 666 & (start "" /B /WAIT cmd.exe /c "echo foo & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem A call :setError 666 & (start "" /B cmd.exe /c "(choice /C:YN /T:3 /D:Y > NUL) & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem can't do on Wine until /T is properly handled in CHOICE +rem SUCCESS 666 echo --- success/failure for TYPE command mkdir foo & cd foo echo a > fileA @@ -591,6 +620,18 @@ call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! call :setError 666 & rmdir @:\cba\abc & echo ERRORLEVEL !errorlevel! cd .. && rd /q /s foo +echo --- success/failure for MKLINK command +mkdir foo & cd foo +call :setError 666 & (mklink &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /z foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo bar > foo +call :setError 666 & (mklink /h foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h bar foo >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h bar foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + echo --- success/failure for SETLOCAL/ENDLOCAL commands call :setError 666 & (setlocal foobar &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (setlocal &&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 4b162af9a8e..ed0e7d8d1e3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -465,6 +465,28 @@ SUCCESS 666 SUCCESS 666 SUCCESS 0 FAILURE 33 +--- success/failure for external command +(a)todo_wine@FAILURE 1 +(a)todo_wine@ERRORLEVEL 3 +(a)todo_wine@FAILURE 1 +ERRORLEVEL 9009 +foo(a)space@ +SUCCESS 0 +foo(a)space@ +FAILURE 1024 +--- success/failure for CALL command +FAILURE 1 +SUCCESS 0 +FAILURE 1024 +foo(a)space@ +SUCCESS 0 +foo(a)space@ +FAILURE 1025 +(a)todo_wine@FAILURE 2 +--- success/failure for START command +(a)todo_wine@FAILURE 1 +foo(a)space@ +SUCCESS 1024 --- success/failure for TYPE command FAILURE 1 SUCCESS 0 @@ -535,6 +557,14 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 +--- success/failure for MKLINK command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 --- success/failure for SETLOCAL/ENDLOCAL commands FAILURE 1 SUCCESS 0

1 0

Eric Pouech : cmd: Get rid of CTTY command.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 2547209674cf38f1f8ceef39be9e076678d4d901 URL: https://gitlab.winehq.org/wine/wine/-/commit/2547209674cf38f1f8ceef39be9e07… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:58:30 2024 +0200 cmd: Get rid of CTTY command. Looks a sane operation as: - it's not supported in modern Windows' cmd.exe, - could only find reference from DOS interpreter, - and it's not implemented in Wine. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- po/ar.po | 180 +++++++++++++++++++++++------------------------- po/ast.po | 180 +++++++++++++++++++++++------------------------- po/bg.po | 180 +++++++++++++++++++++++------------------------- po/ca.po | 180 +++++++++++++++++++++++------------------------- po/cs.po | 180 +++++++++++++++++++++++------------------------- po/da.po | 180 +++++++++++++++++++++++------------------------- po/de.po | 180 +++++++++++++++++++++++------------------------- po/el.po | 180 +++++++++++++++++++++++------------------------- po/en.po | 180 +++++++++++++++++++++++------------------------- po/en_US.po | 180 +++++++++++++++++++++++------------------------- po/eo.po | 180 +++++++++++++++++++++++------------------------- po/es.po | 180 +++++++++++++++++++++++------------------------- po/fa.po | 180 +++++++++++++++++++++++------------------------- po/fi.po | 180 +++++++++++++++++++++++------------------------- po/fr.po | 180 +++++++++++++++++++++++------------------------- po/he.po | 180 +++++++++++++++++++++++------------------------- po/hi.po | 180 +++++++++++++++++++++++------------------------- po/hr.po | 180 +++++++++++++++++++++++------------------------- po/hu.po | 180 +++++++++++++++++++++++------------------------- po/it.po | 180 +++++++++++++++++++++++------------------------- po/ja.po | 180 +++++++++++++++++++++++------------------------- po/ka.po | 180 +++++++++++++++++++++++------------------------- po/ko.po | 180 +++++++++++++++++++++++------------------------- po/lt.po | 180 +++++++++++++++++++++++------------------------- po/ml.po | 180 +++++++++++++++++++++++------------------------- po/nb_NO.po | 180 +++++++++++++++++++++++------------------------- po/nl.po | 180 +++++++++++++++++++++++------------------------- po/or.po | 180 +++++++++++++++++++++++------------------------- po/pa.po | 180 +++++++++++++++++++++++------------------------- po/pl.po | 180 +++++++++++++++++++++++------------------------- po/pt_BR.po | 180 +++++++++++++++++++++++------------------------- po/pt_PT.po | 180 +++++++++++++++++++++++------------------------- po/rm.po | 180 +++++++++++++++++++++++------------------------- po/ro.po | 180 +++++++++++++++++++++++------------------------- po/ru.po | 180 +++++++++++++++++++++++------------------------- po/si.po | 180 +++++++++++++++++++++++------------------------- po/sk.po | 180 +++++++++++++++++++++++------------------------- po/sl.po | 180 +++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 180 +++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 180 +++++++++++++++++++++++------------------------- po/sv.po | 180 +++++++++++++++++++++++------------------------- po/ta.po | 180 +++++++++++++++++++++++------------------------- po/te.po | 180 +++++++++++++++++++++++------------------------- po/th.po | 180 +++++++++++++++++++++++------------------------- po/tr.po | 180 +++++++++++++++++++++++------------------------- po/uk.po | 180 +++++++++++++++++++++++------------------------- po/wa.po | 180 +++++++++++++++++++++++------------------------- po/wine.pot | 180 +++++++++++++++++++++++------------------------- po/zh_CN.po | 180 +++++++++++++++++++++++------------------------- po/zh_TW.po | 180 +++++++++++++++++++++++------------------------- programs/cmd/builtins.c | 14 +--- programs/cmd/cmd.rc | 3 - programs/cmd/wcmd.h | 3 +- programs/cmd/wcmdmain.c | 5 +- 54 files changed, 4403 insertions(+), 4622 deletions(-)

1 0

Marc-Aurel Zent : ntdll: Implement futex_wait() and futex_wake_one() on macOS.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 2fb62cf9a5328328e7291d00bce0f449046d3a79 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fb62cf9a5328328e7291d00bce0f4… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Tue Mar 5 14:12:51 2024 +0100 ntdll: Implement futex_wait() and futex_wake_one() on macOS. --- README.md | 2 +- dlls/ntdll/unix/sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8a804b30dfc..28ab8fe7299 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To compile and run Wine, you must have one of the following: - FreeBSD 12.4 or later - Solaris x86 9 or later - NetBSD-current -- Mac OS X 10.8 or later +- Mac OS X 10.12 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 3a4eb21c3c4..21e66f01875 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -130,7 +130,71 @@ static inline int futex_wake_one( const LONG *addr ) return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, 1, NULL, 0, 0 ); } -#endif /* __linux__ */ +#elif defined(__APPLE__) + +#define USE_FUTEX + +#include <AvailabilityMacros.h> + +#ifdef MAC_OS_VERSION_14_4 +#include <os/os_sync_wait_on_address.h> +#endif + +#define UL_COMPARE_AND_WAIT 1 + +extern int __ulock_wait( uint32_t operation, void *addr, uint64_t value, uint32_t timeout ); + +extern int __ulock_wake( uint32_t operation, void *addr, uint64_t wake_value ); + +static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) +{ +#ifdef MAC_OS_VERSION_14_4 + if (__builtin_available( macOS 14.4, * )) + { + /* 18446744073 seconds could overflow a uint64_t in nanoseconds */ + if (timeout && timeout->tv_sec < 18446744073) + { + uint64_t ns_timeout = (timeout->tv_sec * 1000000000) + timeout->tv_nsec; + + if (!ns_timeout) + { + errno = ETIMEDOUT; + return -1; + } + return os_sync_wait_on_address_with_timeout( (void *)addr, (uint64_t)val, 4, OS_SYNC_WAIT_ON_ADDRESS_NONE, + OS_CLOCK_MACH_ABSOLUTE_TIME, ns_timeout ); + } + + return os_sync_wait_on_address( (void *)addr, (uint64_t)val, 4, OS_SYNC_WAIT_ON_ADDRESS_NONE ); + } +#endif + + /* 4294 seconds could overflow a uint32_t in microseconds */ + if (timeout && timeout->tv_sec < 4294) + { + uint32_t us_timeout = ((uint32_t)timeout->tv_sec * 1000000) + ((uint32_t)timeout->tv_nsec / 1000); + + if (!us_timeout) + { + errno = ETIMEDOUT; + return -1; + } + return __ulock_wait( UL_COMPARE_AND_WAIT, (void *)addr, (uint64_t)val, us_timeout ); + } + + return __ulock_wait( UL_COMPARE_AND_WAIT, (void *)addr, (uint64_t)val, 0 ); +} + +static inline int futex_wake_one( const LONG *addr ) +{ +#ifdef MAC_OS_VERSION_14_4 + if (__builtin_available( macOS 14.4, * )) + return os_sync_wake_by_address_any( (void *)addr, 4, OS_SYNC_WAKE_BY_ADDRESS_NONE ); +#endif + return __ulock_wake( UL_COMPARE_AND_WAIT, (void *)addr, 0 ); +} + +#endif /* __APPLE__ */ /* create a struct security_descriptor and contained information in one contiguous piece of memory */ unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,

1 0

Marc-Aurel Zent : ntdll: Use USE_FUTEX to indicate futex support.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 9707a93948afce592c2aeb2f254467d9112c1c1e URL: https://gitlab.winehq.org/wine/wine/-/commit/9707a93948afce592c2aeb2f254467… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Tue Mar 5 13:17:55 2024 +0100 ntdll: Use USE_FUTEX to indicate futex support. --- dlls/ntdll/unix/sync.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1cad7dc8662..70203450615 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -103,9 +103,10 @@ static inline ULONGLONG monotonic_counter(void) return ticks_from_time_t( now.tv_sec ) + now.tv_usec * 10 - server_start_time; } - #ifdef __linux__ +#define USE_FUTEX + #include <linux/futex.h> static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) @@ -129,8 +130,7 @@ static inline int futex_wake( const LONG *addr, int val ) return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, val, NULL, 0, 0 ); } -#endif - +#endif /* __linux__ */ /* create a struct security_descriptor and contained information in one contiguous piece of memory */ unsigned int alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, @@ -2409,7 +2409,7 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { -#ifdef __linux__ +#ifdef USE_FUTEX LONG futex; #elif defined(HAVE_KQUEUE) int kq; @@ -2450,7 +2450,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; -#ifdef __linux__ +#ifdef USE_FUTEX return entry; #elif defined(HAVE_KQUEUE) if (!entry->kq) @@ -2509,7 +2509,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; -#ifdef __linux__ +#ifdef USE_FUTEX { LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) @@ -2537,7 +2537,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) } -#if defined(__linux__) || defined(HAVE_KQUEUE) +#if defined(USE_FUTEX) || defined(HAVE_KQUEUE) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2571,7 +2571,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG if (!entry) return STATUS_INVALID_CID; -#ifdef __linux__ +#ifdef USE_FUTEX { LONG *futex = &entry->futex; ULONGLONG end;

1 0

Marc-Aurel Zent : ntdll: Simplify futex interface from futex_wake() to futex_wake_one().
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 410790a4f3f425adc52454f70ea56f4c8f040dab URL: https://gitlab.winehq.org/wine/wine/-/commit/410790a4f3f425adc52454f70ea56f… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Wed Mar 6 08:35:58 2024 +0100 ntdll: Simplify futex interface from futex_wake() to futex_wake_one(). --- dlls/ntdll/unix/sync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 70203450615..3a4eb21c3c4 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -125,9 +125,9 @@ static inline int futex_wait( const LONG *addr, int val, struct timespec *timeou return syscall( __NR_futex, addr, FUTEX_WAIT_PRIVATE, val, timeout, 0, 0 ); } -static inline int futex_wake( const LONG *addr, int val ) +static inline int futex_wake_one( const LONG *addr ) { - return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, val, NULL, 0, 0 ); + return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, 1, NULL, 0, 0 ); } #endif /* __linux__ */ @@ -2513,7 +2513,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) { LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) - futex_wake( futex, 1 ); + futex_wake_one( futex ); return STATUS_SUCCESS; } #elif defined(HAVE_KQUEUE)

1 0

Hans Leidekker : odbc32: Implement SQLSetEnvAttr(SQL_ATTR_ODBC_VERSION).
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: b5710c548d9652bf1481601598e1313b79bcbc61 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5710c548d9652bf1481601598e131… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 10:16:50 2024 +0200 odbc32: Implement SQLSetEnvAttr(SQL_ATTR_ODBC_VERSION). --- dlls/odbc32/proxyodbc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/odbc32/tests/odbc32.c | 25 +++++++++++++++++++++ dlls/odbc32/unixlib.h | 2 ++ 3 files changed, 79 insertions(+), 2 deletions(-)

1 0