wine-commits July 2024

wine-commits@winehq.org

2 participants
519 discussions

Alex Henrie : msi: Initialize size argument to RegGetValueW.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 55525875a5453c9fd2fc7610e3c17839b7bb9d5f URL: https://gitlab.winehq.org/wine/wine/-/commit/55525875a5453c9fd2fc7610e3c178… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 2 23:40:00 2024 -0600 msi: Initialize size argument to RegGetValueW. --- dlls/msi/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 149f9cf9945..ad220eaa756 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1846,6 +1846,7 @@ static UINT check_product_patches(const WCHAR *prodcode, const WCHAR *usersid, M RegOpenKeyExW(localprod, L"Patches", 0, KEY_READ, &localpatch) == ERROR_SUCCESS && RegOpenKeyExW(localpatch, ptr, 0, KEY_READ, &patchkey) == ERROR_SUCCESS) { + size = sizeof(state); res = RegGetValueW(patchkey, NULL, L"State", RRF_RT_REG_DWORD, &type, &state, &size);

1 0

Eric Pouech : cmd: Set success/failure return code for PUSHD command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 44e8133f4f45848367ff35545554958ae4f5adc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/44e8133f4f45848367ff3554555495… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 13:04:28 2024 +0200 cmd: Set success/failure return code for PUSHD command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 20 +++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7b4bc3b61bb..6e0a7830900 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1875,15 +1875,19 @@ RETURN_CODE WCMD_goto(void) * Push a directory onto the stack */ -void WCMD_pushd (const WCHAR *args) +RETURN_CODE WCMD_pushd(const WCHAR *args) { struct env_stack *curdir; WCHAR *thisdir; + RETURN_CODE return_code; + + if (!*args) + return errorlevel = NO_ERROR; if (wcschr(args, '/') != NULL) { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } curdir = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); @@ -1892,18 +1896,19 @@ void WCMD_pushd (const WCHAR *args) LocalFree(curdir); LocalFree(thisdir); WINE_ERR ("out of memory\n"); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Change directory using CD code with /D parameter */ lstrcpyW(quals, L"/D"); GetCurrentDirectoryW (1024, thisdir); - errorlevel = NO_ERROR; - WCMD_setshow_default(args); - if (errorlevel) { + + return_code = WCMD_setshow_default(args); + if (return_code != NO_ERROR) + { LocalFree(curdir); LocalFree(thisdir); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } else { curdir -> next = pushd_directories; curdir -> strings = thisdir; @@ -1914,6 +1919,7 @@ void WCMD_pushd (const WCHAR *args) } pushd_directories = curdir; } + return errorlevel = return_code; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8d5926580d9..eb6abb14dea 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -508,12 +508,12 @@ FAILURE 1 SUCCESS 0 SUCCESS 0 --- success/failure for PUSHD/POPD commands -@todo_wine@SUCCESS 0 SUCCESS 0 +SUCCESS 0 +FAILURE 1 +SUCCESS 666 @todo_wine@FAILURE 1 -@todo_wine@SUCCESS 666 -@todo_wine@FAILURE 1 -@todo_wine@--- success/failure for DIR command +--- success/failure for DIR command FAILURE 1 FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0ca14e9f2ac..93620f05656 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -188,7 +188,7 @@ void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); -void WCMD_pushd (const WCHAR *args); +RETURN_CODE WCMD_pushd(const WCHAR *args); void WCMD_remove_dir (WCHAR *command); RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index dc7da5979be..f8a08878fcb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1909,7 +1909,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_volume (FALSE, parms_start); break; case WCMD_PUSHD: - WCMD_pushd(parms_start); + return_code = WCMD_pushd(parms_start); break; case WCMD_POPD: WCMD_popd();

1 0

Eric Pouech : cmd: Set success/failure return code for DIR command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: c88789c89b1b4d89ce4fa0fcbd65e7a0aa57ebef URL: https://gitlab.winehq.org/wine/wine/-/commit/c88789c89b1b4d89ce4fa0fcbd65e7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:54:53 2024 +0200 cmd: Set success/failure return code for DIR command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/directory.c | 23 ++++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 72542538d5b..fdcae9f6a94 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -631,7 +631,7 @@ static void init_time_format(void) * */ -void WCMD_directory (WCHAR *args) +RETURN_CODE WCMD_directory(WCHAR *args) { WCHAR path[MAX_PATH], cwd[MAX_PATH]; DWORD status; @@ -649,6 +649,7 @@ void WCMD_directory (WCHAR *args) WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; + unsigned num_empty = 0, num_with_data = 0; errorlevel = NO_ERROR; @@ -736,8 +737,7 @@ void WCMD_directory (WCHAR *args) } else { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } break; case 'O': p = p + 1; @@ -756,8 +756,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } p++; } @@ -787,8 +786,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Keep running list of bits we care about */ @@ -806,8 +804,7 @@ void WCMD_directory (WCHAR *args) default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } p = p + 1; } @@ -957,6 +954,10 @@ void WCMD_directory (WCHAR *args) errorlevel = NO_ERROR; prevEntry = thisEntry; thisEntry = WCMD_list_directory (thisEntry, 0); + if (errorlevel) + num_empty++; + else + num_with_data++; } /* Trailer Information */ @@ -964,6 +965,8 @@ void WCMD_directory (WCHAR *args) WCMD_dir_trailer(prevEntry->dirName); } + if (num_empty && !num_with_data) + errorlevel = ERROR_INVALID_FUNCTION; exit: if (paged_mode) WCMD_leave_paged_mode(); @@ -975,4 +978,6 @@ exit: free(prevEntry->fileName); free(prevEntry); } + + return errorlevel; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0397311cf85..8d5926580d9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -514,11 +514,11 @@ SUCCESS 0 @todo_wine@SUCCESS 666 @todo_wine@FAILURE 1 @todo_wine@--- success/failure for DIR command -@todo_wine@FAILURE 1 -@todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 SUCCESS 0 SUCCESS 0 -@todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 @todo_wine@--- ------------ Testing 'set' ------------ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index f538d3069bb..0ca14e9f2ac 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -169,7 +169,7 @@ void WCMD_color (void); RETURN_CODE WCMD_copy(WCHAR *); RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); -void WCMD_directory (WCHAR *); +RETURN_CODE WCMD_directory(WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2228593157e..dc7da5979be 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1833,7 +1833,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_delete(parms_start); break; case WCMD_DIR: - WCMD_directory (parms_start); + return_code = WCMD_directory(parms_start); break; case WCMD_ECHO: return_code = WCMD_echo(&whichcmd[count]);

1 0

Eric Pouech : cmd: Set success/failure return code for CD command.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 3852b24b8e479caa888f0737d751b68d73e401c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3852b24b8e479caa888f0737d751b6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 12:11:01 2024 +0200 cmd: Set success/failure return code for CD command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 17 ++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a023ba917c..7b4bc3b61bb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2414,8 +2414,9 @@ void WCMD_endlocal (void) { * Set/Show the current default directory */ -void WCMD_setshow_default (const WCHAR *args) { - +RETURN_CODE WCMD_setshow_default(const WCHAR *args) +{ + RETURN_CODE return_code; BOOL status; WCHAR string[1024]; WCHAR cwd[1024]; @@ -2436,6 +2437,7 @@ void WCMD_setshow_default (const WCHAR *args) { } GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + return_code = NO_ERROR; if (!*args) { lstrcatW(cwd, L"\r\n"); @@ -2466,7 +2468,9 @@ void WCMD_setshow_default (const WCHAR *args) { WCHAR ext[MAX_PATH]; /* Convert path into actual directory spec */ - if (!WCMD_get_fullpath(string, ARRAY_SIZE(fpath), fpath, NULL)) return; + if (!WCMD_get_fullpath(string, ARRAY_SIZE(fpath), fpath, NULL)) + return errorlevel = ERROR_INVALID_FUNCTION; + _wsplitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ @@ -2482,9 +2486,8 @@ void WCMD_setshow_default (const WCHAR *args) { status = SetCurrentDirectoryW(string); if (!status) { - errorlevel = ERROR_INVALID_FUNCTION; WCMD_print_error (); - return; + return_code = ERROR_INVALID_FUNCTION; } else { /* Save away the actual new directory, to store as current location */ @@ -2511,8 +2514,8 @@ void WCMD_setshow_default (const WCHAR *args) { SetEnvironmentVariableW(env, string); } - } - return; + } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ef93def2732..0397311cf85 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -503,10 +503,10 @@ FAILURE 1 FAILURE 1 SUCCESS 0 --- success/failure for CD command -@todo_wine@SUCCESS 0 -@todo_wine@FAILURE 1 -@todo_wine@SUCCESS 0 -@todo_wine@SUCCESS 0 +SUCCESS 0 +FAILURE 1 +SUCCESS 0 +SUCCESS 0 --- success/failure for PUSHD/POPD commands @todo_wine@SUCCESS 0 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8fe2eb3f322..f538d3069bb 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -194,7 +194,7 @@ RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); void WCMD_setlocal (const WCHAR *args); void WCMD_setshow_date (void); -void WCMD_setshow_default (const WCHAR *args); +RETURN_CODE WCMD_setshow_default(const WCHAR *args); void WCMD_setshow_env (WCHAR *command); void WCMD_setshow_path (const WCHAR *args); void WCMD_setshow_prompt (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ededdcd2177..2228593157e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1814,7 +1814,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_CD: case WCMD_CHDIR: - WCMD_setshow_default (parms_start); + return_code = WCMD_setshow_default(parms_start); break; case WCMD_CLS: WCMD_clear_screen ();

1 0

Eric Pouech : cmd: Add success/failure return code for MKDIR/MD commands.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: db929054baa61c500e3ccaf572914bd180a4c925 URL: https://gitlab.winehq.org/wine/wine/-/commit/db929054baa61c500e3ccaf572914b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 12:00:01 2024 +0200 cmd: Add success/failure return code for MKDIR/MD commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 21 ++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 10 +++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index faff537be73..7a023ba917c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1158,23 +1158,30 @@ static BOOL create_full_path(WCHAR* path) return FALSE; } -void WCMD_create_dir (WCHAR *args) { +RETURN_CODE WCMD_create_dir(WCHAR *args) +{ int argno = 0; WCHAR *argN = args; + RETURN_CODE return_code; - if (param1[0] == 0x00) { + if (param1[0] == L'\0') + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } + return_code = NO_ERROR; /* Loop through all args */ - while (TRUE) { + for (;;) + { WCHAR *thisArg = WCMD_parameter(args, argno++, &argN, FALSE, FALSE); if (!argN) break; - if (!create_full_path(thisArg)) { - WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + if (!create_full_path(thisArg)) + { + WCMD_print_error(); + return_code = ERROR_INVALID_FUNCTION; } } + return errorlevel = return_code; } /* Parse the /A options given by the user on the commandline diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8be714a9158..ef93def2732 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -497,11 +497,11 @@ SUCCESS 0 FAILURE 1 FAILURE 1 --- success/failure for MKDIR,MD command -@todo_wine@FAILURE 1 -@todo_wine@SUCCESS 0 -@todo_wine@FAILURE 1 -@todo_wine@FAILURE 1 -@todo_wine@SUCCESS 0 +FAILURE 1 +SUCCESS 0 +FAILURE 1 +FAILURE 1 +SUCCESS 0 --- success/failure for CD command @todo_wine@SUCCESS 0 @todo_wine@FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0b0a96c5fb8..8fe2eb3f322 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -167,7 +167,7 @@ void WCMD_choice (const WCHAR *); void WCMD_clear_screen (void); void WCMD_color (void); RETURN_CODE WCMD_copy(WCHAR *); -void WCMD_create_dir (WCHAR *); +RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); void WCMD_directory (WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c096abe3431..ededdcd2177 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1849,7 +1849,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_MD: case WCMD_MKDIR: - WCMD_create_dir (parms_start); + return_code = WCMD_create_dir(parms_start); break; case WCMD_MOVE: return_code = WCMD_move();

1 0

Eric Pouech : cmd: Add success/failure tests for dir related commands.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 22bb6ce6e9efcbe9b440d46ee9a3475a00a1fc69 URL: https://gitlab.winehq.org/wine/wine/-/commit/22bb6ce6e9efcbe9b440d46ee9a347… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 13:01:32 2024 +0200 cmd: Add success/failure tests for dir related commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 24 ++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ccdddd289bd..d5f8cef8eab 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -524,6 +524,48 @@ 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 MKDIR,MD command +mkdir foo & cd foo +call :setError 666 & (mkdir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir @:\cba\abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for CD command +mkdir foo & cd foo +mkdir abc +call :setError 666 & (cd abc >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd abc >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd .. >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for PUSHD/POPD commands +mkdir foo & cd foo +mkdir abc +call :setError 666 & (pushd &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (popd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (popd &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for DIR command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +mkdir dir +echo b > dir\fileB +call :setError 666 & (dir /e >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir fileA zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir zzz fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir dir\zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir file* >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b281907624..8be714a9158 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -496,6 +496,30 @@ FAILURE 1 SUCCESS 0 FAILURE 1 FAILURE 1 +--- success/failure for MKDIR,MD command +@todo_wine@FAILURE 1 +@todo_wine@SUCCESS 0 +@todo_wine@FAILURE 1 +@todo_wine@FAILURE 1 +@todo_wine@SUCCESS 0 +--- success/failure for CD command +@todo_wine@SUCCESS 0 +@todo_wine@FAILURE 1 +@todo_wine@SUCCESS 0 +@todo_wine@SUCCESS 0 +--- success/failure for PUSHD/POPD commands +@todo_wine@SUCCESS 0 +SUCCESS 0 +@todo_wine@FAILURE 1 +@todo_wine@SUCCESS 666 +@todo_wine@FAILURE 1 +@todo_wine@--- success/failure for DIR command +@todo_wine@FAILURE 1 +@todo_wine@FAILURE 1 +SUCCESS 0 +SUCCESS 0 +@todo_wine@FAILURE 1 +SUCCESS 0 @todo_wine@--- ------------ Testing 'set' ------------ 1

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetOutputStreamInfo.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 3a69b0914f96acc0877a8d004cf450d14205c7c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a69b0914f96acc0877a8d004cf450… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:32:55 2024 +0800 winegstreamer/video_encoder: Implement GetOutputStreamInfo. --- dlls/winegstreamer/video_encoder.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 512a4dcfa4d..2cb73ca89db 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -46,6 +46,7 @@ struct video_encoder IMFMediaType *input_type; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; + MFT_OUTPUT_STREAM_INFO output_info; IMFAttributes *attributes; }; @@ -179,8 +180,12 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p.\n", iface, id, info); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + *info = encoder->output_info; + return S_OK; } static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) @@ -545,6 +550,10 @@ HRESULT h264_encoder_create(REFIID riid, void **out) h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), &encoder))) return hr; + /* FIXME: Hardcode a size that is large enough to make things work for now. + * The right way is to calculate the size based on output frame size. */ + encoder->output_info.cbSize = 0x3bc400; + TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface); hr = IMFTransform_QueryInterface(&encoder->IMFTransform_iface, riid, out);

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetInputStreamInfo.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 44f1af1cf45965cb42969e6a51fe6ebf9720c6fc URL: https://gitlab.winehq.org/wine/wine/-/commit/44f1af1cf45965cb42969e6a51fe6e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:12:32 2024 +0800 winegstreamer/video_encoder: Implement GetInputStreamInfo. --- dlls/winegstreamer/video_encoder.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index d852a2d0a69..512a4dcfa4d 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -44,6 +44,7 @@ struct video_encoder UINT output_type_count; IMFMediaType *input_type; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; IMFAttributes *attributes; @@ -168,8 +169,12 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p.\n", iface, id, info); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + *info = encoder->input_info; + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)

1 0

Ziqing Hui : winegstreamer/video_encoder: Check more attributes in SetInputType.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: c45cf47a6134eb9be5745786deee2395e4133042 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45cf47a6134eb9be5745786deee23… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:08:58 2024 +0800 winegstreamer/video_encoder: Check more attributes in SetInputType. --- dlls/winegstreamer/video_encoder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index c880cd062ce..d852a2d0a69 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -248,8 +248,10 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct video_encoder *encoder = impl_from_IMFTransform(iface); + IMFMediaType *good_input_type; GUID major, subtype; - UINT64 ratio; + BOOL result; + HRESULT hr; ULONG i; TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); @@ -281,8 +283,12 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == encoder->input_type_count) return MF_E_INVALIDMEDIATYPE; - if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &ratio)) - || FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &ratio))) + if (FAILED(hr = create_input_type(encoder, &subtype, &good_input_type))) + return hr; + hr = IMFMediaType_Compare(good_input_type, (IMFAttributes *)type, + MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + IMFMediaType_Release(good_input_type); + if (FAILED(hr) || !result) return MF_E_INVALIDMEDIATYPE; if (flags & MFT_SET_TYPE_TEST_ONLY)

1 0

Ziqing Hui : winegstreamer/video_encoder: Introduce create_input_type.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 689824bdcfeed481f1d09304d352c92beff27e6d URL: https://gitlab.winehq.org/wine/wine/-/commit/689824bdcfeed481f1d09304d352c9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 12:24:53 2024 +0800 winegstreamer/video_encoder: Introduce create_input_type. --- dlls/winegstreamer/video_encoder.c | 74 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index cfdd5be9d50..c880cd062ce 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -54,6 +54,45 @@ static inline struct video_encoder *impl_from_IMFTransform(IMFTransform *iface) return CONTAINING_RECORD(iface, struct video_encoder, IMFTransform_iface); } +static HRESULT create_input_type(struct video_encoder *encoder, const GUID *subtype, IMFMediaType **out) +{ + IMFVideoMediaType *input_type; + UINT64 ratio; + UINT32 value; + HRESULT hr; + + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(subtype, &input_type))) + return hr; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_SIZE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_RATE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_RATE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_INTERLACE_MODE, &value)) + || FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_INTERLACE_MODE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_VIDEO_NOMINAL_RANGE, &value))) + value = MFNominalRange_Wide; + if (FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_VIDEO_NOMINAL_RANGE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) + ratio = (UINT64)1 << 32 | 1; + if (FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) + goto done; + + IMFMediaType_AddRef((*out = (IMFMediaType *)input_type)); + +done: + IMFVideoMediaType_Release(input_type); + return hr; +} + static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) { struct video_encoder *encoder = impl_from_IMFTransform(iface); @@ -180,10 +219,6 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD IMFMediaType **type) { struct video_encoder *encoder = impl_from_IMFTransform(iface); - IMFVideoMediaType *input_type; - UINT64 ratio; - UINT32 value; - HRESULT hr; TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); @@ -194,36 +229,7 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD if (index >= encoder->input_type_count) return MF_E_NO_MORE_TYPES; - if (!(hr = MFCreateVideoMediaTypeFromSubtype(encoder->input_types[index], &input_type))) - return hr; - - if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_SIZE, &ratio)) - || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, ratio))) - goto done; - - if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_RATE, &ratio)) - || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_RATE, ratio))) - goto done; - - if (FAILED(hr = IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_INTERLACE_MODE, &value)) - || FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_INTERLACE_MODE, value))) - goto done; - - if (FAILED(IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_VIDEO_NOMINAL_RANGE, &value))) - value = MFNominalRange_Wide; - if (FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_VIDEO_NOMINAL_RANGE, value))) - goto done; - - if (FAILED(IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) - ratio = (UINT64)1 << 32 | 1; - if (FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) - goto done; - - IMFMediaType_AddRef((*type = (IMFMediaType *)input_type)); - -done: - IMFVideoMediaType_Release(input_type); - return hr; + return create_input_type(encoder, encoder->input_types[index], type); } static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2024