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

Ziqing Hui : mf/tests: Add more tests for h264 encoder type attributes.
by Alexandre Julliard July 3, 2024

July 3, 2024

Module: wine Branch: master Commit: 6e66b66e6c85d15b7ebdc2e62e6b509b27cd4bbc URL: https://gitlab.winehq.org/wine/wine/-/commit/6e66b66e6c85d15b7ebdc2e62e6b50… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 12:07:28 2024 +0800 mf/tests: Add more tests for h264 encoder type attributes. --- dlls/mf/tests/transform.c | 49 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index deec2c7dd92..515b309add2 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3886,6 +3886,14 @@ static void test_h264_encoder(void) ATTR_UINT32(test_attr_guid, 0), {0}, }; + static const struct attribute_desc test_attributes[] = + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_RATIO(MF_MT_FRAME_RATE, 10, 1), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_MixedInterlaceOrProgressive), + ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, MFNominalRange_Normal), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 2, 1), + }; const struct attribute_desc expect_input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -3907,7 +3915,7 @@ static void test_h264_encoder(void) ATTR_UINT32(test_attr_guid, 0), {0}, }; - static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000}; + static const MFT_OUTPUT_STREAM_INFO expect_output_info[] = {{.cbSize = 0x8000}, {.cbSize = 0x3bc400}}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_NV12}; IMFMediaType *media_type; @@ -3970,7 +3978,7 @@ static void test_h264_encoder(void) check_mft_set_output_type_required(transform, output_type_desc); check_mft_set_output_type(transform, output_type_desc, S_OK); check_mft_get_output_current_type(transform, expect_output_type_desc); - check_mft_get_output_stream_info(transform, S_OK, &expect_output_info); + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); /* Input types can now be enumerated. */ i = -1; @@ -3993,6 +4001,43 @@ static void test_h264_encoder(void) check_mft_get_input_current_type(transform, expect_input_type_desc); check_mft_get_input_stream_info(transform, S_OK, NULL); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#lx.\n", hr); + + /* Input type attributes should match output type attributes. */ + for (i = 0; i < ARRAY_SIZE(test_attributes); ++i) + { + winetest_push_context("attr %lu", i); + + init_media_type(media_type, input_type_desc, -1); + hr = IMFMediaType_SetItem(media_type, test_attributes[i].key, &test_attributes[i].value); + ok(hr == S_OK, "SetItem returned %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); + + winetest_pop_context(); + } + + /* Output info cbSize will change only if we change output type frame size. */ + for (i = 0; i < ARRAY_SIZE(test_attributes); ++i) + { + winetest_push_context("attr %lu", i); + + init_media_type(media_type, output_type_desc, -1); + hr = IMFMediaType_SetItem(media_type, test_attributes[i].key, &test_attributes[i].value); + ok(hr == S_OK, "SetItem returned %#lx.\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); + + if (IsEqualGUID(test_attributes[i].key, &MF_MT_FRAME_SIZE)) + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[1]); + else + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); + + winetest_pop_context(); + } + + IMFMediaType_Release(media_type); ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Paul Gofman : winhttp/tests: Add test for trailing spaces in reply header.
by Alexandre Julliard July 3, 2024

July 3, 2024

Module: wine Branch: master Commit: a550c11e78a5d4c4bf1b0c640ed6f2c2771d7b80 URL: https://gitlab.winehq.org/wine/wine/-/commit/a550c11e78a5d4c4bf1b0c640ed6f2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 2 15:31:17 2024 -0600 winhttp/tests: Add test for trailing spaces in reply header. --- dlls/winhttp/tests/winhttp.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1fb9dad115f..5ca19aa8c8b 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -609,6 +609,7 @@ static void test_WinHttpAddHeaders(void) L"field: value ", L"name: value", L"name:", + L"g : value", }; static const WCHAR test_indices[][6] = { @@ -950,6 +951,9 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n"); + ret = WinHttpAddRequestHeaders(request, test_headers[16], ~0u, WINHTTP_ADDREQ_FLAG_ADD); + ok(!ret, "adding %s succeeded.\n", debugstr_w(test_headers[16])); + index = 0; buffer[0] = 0; len = sizeof(buffer); @@ -2287,6 +2291,13 @@ static const char redirectmsg[] = "Location: /temporary\r\n" "Connection: close\r\n\r\n"; +static const char badreplyheadermsg[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"SpaceAfterHdr : bad\r\n" +"OkHdr: ok\r\n" +"\r\n"; + static const char proxy_pac[] = "function FindProxyForURL(url, host) {\r\n" " url = url.replace(/[:/]/g, '_');\r\n" @@ -2558,7 +2569,7 @@ static DWORD CALLBACK server_thread(LPVOID param) ok(!!strstr(buffer, "Test5: Value5\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Test6: Value6\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); ok(!!strstr(buffer, "Cookie: 111\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); - send(c, okmsg, sizeof(okmsg) - 1, 0); + send(c, badreplyheadermsg, sizeof(badreplyheadermsg) - 1, 0); } if (strstr(buffer, "GET /proxy.pac")) { @@ -3852,8 +3863,17 @@ static void test_not_modified(int port) static void test_bad_header( int port ) { - WCHAR buffer[32]; + static const WCHAR expected_headers[] = + { + L"HTTP/1.1 200 OK\r\n" + L"Server: winetest\r\n" + L"SpaceAfterHdr: bad\r\n" + L"OkHdr: ok\r\n" + L"\r\n" + }; + HINTERNET ses, con, req; + WCHAR buffer[512]; DWORD index, len; unsigned int i; BOOL ret; @@ -3912,6 +3932,20 @@ static void test_bad_header( int port ) ret = WinHttpReceiveResponse( req, NULL ); ok( ret, "failed to receive response %lu\n", GetLastError() ); + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, L"OkHdr", buffer, &len, WINHTTP_NO_HEADER_INDEX ); + todo_wine ok( ret, "got error %lu.\n", GetLastError() ); + + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_RAW_HEADERS_CRLF, WINHTTP_HEADER_NAME_BY_INDEX, buffer, &len, WINHTTP_NO_HEADER_INDEX ); + ok( ret, "got error %lu.\n", GetLastError() ); + todo_wine ok( !wcscmp( buffer, expected_headers ), "got %s.\n", debugstr_w(buffer) ); + + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, L"SpaceAfterHdr", buffer, &len, WINHTTP_NO_HEADER_INDEX ); + todo_wine ok( ret, "got error %lu.\n", GetLastError() ); + todo_wine ok( !wcscmp( buffer, L"bad" ), "got %s.\n", debugstr_w(buffer) ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -6035,6 +6069,7 @@ START_TEST (winhttp) CloseHandle(thread); return; } + test_IWinHttpRequest(si.port); test_connection_info(si.port); test_basic_request(si.port, NULL, L"/basic");

1 0

Paul Gofman : winhttp: Skip trailing spaces in reply header names.
by Alexandre Julliard July 3, 2024

July 3, 2024

Module: wine Branch: master Commit: 8b3152cb5f0610d48827eb3ddb6fc5b4a7097424 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b3152cb5f0610d48827eb3ddb6fc5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 2 14:04:51 2024 -0600 winhttp: Skip trailing spaces in reply header names. --- dlls/winhttp/request.c | 23 ++++++++++++++++------- dlls/winhttp/tests/winhttp.c | 8 ++++---- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2b8fa168947..b86ff0beb1e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -303,9 +303,9 @@ static BOOL valid_token_char( WCHAR c ) } } -static struct header *parse_header( const WCHAR *string, size_t string_len ) +static struct header *parse_header( const WCHAR *string, size_t string_len, BOOL reply ) { - const WCHAR *p, *q; + const WCHAR *p, *q, *name_end; struct header *header; int len; @@ -315,12 +315,21 @@ static struct header *parse_header( const WCHAR *string, size_t string_len ) WARN("no ':' in line %s\n", debugstr_w(string)); return NULL; } - if (q == string) + name_end = q; + if (reply) + { + while (name_end != string) + { + if (name_end[-1] != ' ') break; + --name_end; + } + } + if (name_end == string) { WARN("empty field name in line %s\n", debugstr_w(string)); return NULL; } - while (*p != ':') + while (p != name_end) { if (!valid_token_char( *p )) { @@ -329,7 +338,7 @@ static struct header *parse_header( const WCHAR *string, size_t string_len ) } p++; } - len = q - string; + len = name_end - string; if (!(header = calloc( 1, sizeof(*header) ))) return NULL; if (!(header->field = malloc( (len + 1) * sizeof(WCHAR) ))) { @@ -491,7 +500,7 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD while (*q == '\r' || *q == '\n') ++q; - if ((header = parse_header( p, end - p ))) + if ((header = parse_header( p, end - p, FALSE ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); free_header( header ); @@ -2691,7 +2700,7 @@ static DWORD read_reply( struct request *request ) } lenW = MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); - if (!(header = parse_header( raw_headers + offset, lenW - 1 ))) break; + if (!(header = parse_header( raw_headers + offset, lenW - 1, TRUE ))) break; if ((ret = process_header( request, header->field, header->value, WINHTTP_ADDREQ_FLAG_ADD, FALSE ))) { free_header( header ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5ca19aa8c8b..2252551f32c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3934,17 +3934,17 @@ static void test_bad_header( int port ) len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, L"OkHdr", buffer, &len, WINHTTP_NO_HEADER_INDEX ); - todo_wine ok( ret, "got error %lu.\n", GetLastError() ); + ok( ret, "got error %lu.\n", GetLastError() ); len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_RAW_HEADERS_CRLF, WINHTTP_HEADER_NAME_BY_INDEX, buffer, &len, WINHTTP_NO_HEADER_INDEX ); ok( ret, "got error %lu.\n", GetLastError() ); - todo_wine ok( !wcscmp( buffer, expected_headers ), "got %s.\n", debugstr_w(buffer) ); + ok( !wcscmp( buffer, expected_headers ), "got %s.\n", debugstr_w(buffer) ); len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, L"SpaceAfterHdr", buffer, &len, WINHTTP_NO_HEADER_INDEX ); - todo_wine ok( ret, "got error %lu.\n", GetLastError() ); - todo_wine ok( !wcscmp( buffer, L"bad" ), "got %s.\n", debugstr_w(buffer) ); + ok( ret, "got error %lu.\n", GetLastError() ); + ok( !wcscmp( buffer, L"bad" ), "got %s.\n", debugstr_w(buffer) ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Paul Gofman : winhttp: Construct raw header from the parse result in read_reply().
by Alexandre Julliard July 3, 2024

July 3, 2024

Module: wine Branch: master Commit: 76b20aa032b3ad2e99b47f270732332d89880308 URL: https://gitlab.winehq.org/wine/wine/-/commit/76b20aa032b3ad2e99b47f27073233… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 2 13:30:13 2024 -0600 winhttp: Construct raw header from the parse result in read_reply(). --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 207f1ec5c61..2b8fa168947 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2697,9 +2697,29 @@ static DWORD read_reply( struct request *request ) free_header( header ); break; } + + lenW = wcslen( header->field ); + assert( len - offset >= lenW + 1 ); + memcpy( raw_headers + offset, header->field, lenW * sizeof(WCHAR) ); + offset += lenW; + + lenW = 2; + assert( len - offset >= lenW + 1 ); + memcpy( raw_headers + offset, L": ", lenW * sizeof(WCHAR) ); + offset += lenW; + + lenW = wcslen( header->value ); + assert( len - offset >= lenW + 1 ); + memcpy( raw_headers + offset, header->value, lenW * sizeof(WCHAR) ); + offset += lenW; + + lenW = crlf_len; + assert( len - offset >= lenW + 1 ); + memcpy( raw_headers + offset, L"\r\n", lenW * sizeof(WCHAR) ); + offset += lenW; + + raw_headers[offset] = 0; free_header( header ); - memcpy( raw_headers + offset + buflen - 1, L"\r\n", sizeof(L"\r\n") ); - offset += buflen + crlf_len - 1; } TRACE("raw headers: %s\n", debugstr_w(raw_headers));

1 0

Piotr Caban : ucrtbase: Store exception record in ExceptionInformation[6] during unwinding.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 979a40c398d4b31253bca0aa6133b54813c52c7d URL: https://gitlab.winehq.org/wine/wine/-/commit/979a40c398d4b31253bca0aa6133b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 2 18:14:50 2024 +0200 ucrtbase: Store exception record in ExceptionInformation[6] during unwinding. --- dlls/msvcrt/except.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 374357ed096..50f131efdc7 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -211,8 +211,8 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG_PTR frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; - EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; - EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6]; + EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[4]; + EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[6]; CONTEXT *context = (void*)rec->ExceptionInformation[7]; int *unwind_help = (int *)(frame + descr->unwind_help); EXCEPTION_POINTERS ep = { prev_rec, context }; @@ -323,9 +323,10 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = (ULONG_PTR)descr; catch_record.ExceptionInformation[3] = tryblock->start_level; - catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; + catch_record.ExceptionInformation[4] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)handler; - catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; + /* tyFlow expects ExceptionInformation[6] to contain exception record */ + catch_record.ExceptionInformation[6] = (ULONG_PTR)rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; catch_record.ExceptionInformation[10] = -1; RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL);

1 0

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

July 2, 2024

Module: wine Branch: master Commit: e65bcb688a4145e32564adbcebfd845147b48b2a URL: https://gitlab.winehq.org/wine/wine/-/commit/e65bcb688a4145e32564adbcebfd84… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 18:03:53 2024 +0200 cmd: Set success/failure return code for RENAME command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 21 +++++++++------------ programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b14aa477380..77f40a87fd0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2144,10 +2144,9 @@ void WCMD_remove_dir (WCHAR *args) { * Rename a file. */ -void WCMD_rename (void) +RETURN_CODE WCMD_rename(void) { - BOOL status; - HANDLE hff; + HANDLE hff; WIN32_FIND_DATAW fd; WCHAR input[MAX_PATH]; WCHAR *dotDst = NULL; @@ -2161,20 +2160,18 @@ void WCMD_rename (void) /* Must be at least two args */ if (param1[0] == 0x00 || param2[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Destination cannot contain a drive letter or directory separator */ if ((wcschr(param2,':') != NULL) || (wcschr(param2,'\\') != NULL)) { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* Convert partial path to full path */ - if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL)) return; + if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL)) return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Rename from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(param2)); dotDst = wcschr(param2, '.'); @@ -2184,8 +2181,9 @@ void WCMD_rename (void) hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) - return; + return errorlevel = ERROR_INVALID_FUNCTION; + errorlevel = NO_ERROR; do { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; @@ -2228,15 +2226,14 @@ void WCMD_rename (void) WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src)); WINE_TRACE("Dest '%s'\n", wine_dbgstr_w(dest)); - status = MoveFileW(src, dest); - - if (!status) { + if (!MoveFileW(src, dest)) { WCMD_print_error (); errorlevel = ERROR_INVALID_FUNCTION; } } while (FindNextFileW(hff, &fd) != 0); FindClose(hff); + return errorlevel; } /***************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0c6362d227a..c17f00c0c02 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -486,10 +486,10 @@ FAILURE 1 FAILURE 1 FAILURE 1 --- success/failure for RENAME command -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 SUCCESS 0 --- success/failure for ERASE command FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d2ef5b46b86..752ee251cd2 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -190,7 +190,7 @@ void WCMD_popd (void); void WCMD_print_error (void); void WCMD_pushd (const WCHAR *args); void WCMD_remove_dir (WCHAR *command); -void WCMD_rename (void); +RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); void WCMD_setlocal (const WCHAR *args); void WCMD_setshow_date (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 18315e9ce2b..5e429c2f3f0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1867,7 +1867,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_REN: case WCMD_RENAME: - WCMD_rename (); + return_code = WCMD_rename(); break; case WCMD_RD: case WCMD_RMDIR:

1 0

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

July 2, 2024

Module: wine Branch: master Commit: 692f4384e409ab3e43b752e4ea7bc1183dd428c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/692f4384e409ab3e43b752e4ea7bc1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 18:16:49 2024 +0200 cmd: Set success/failure return code for COPY command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 45 ++++++++++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 8 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 77f40a87fd0..faff537be73 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -606,8 +606,8 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app * */ -void WCMD_copy(WCHAR * args) { - +RETURN_CODE WCMD_copy(WCHAR * args) +{ BOOL opt_d, opt_v, opt_n, opt_z, opt_y, opt_noty; WCHAR *thisparam; int argno = 0; @@ -639,15 +639,15 @@ void WCMD_copy(WCHAR * args) { COPY_FILES *destination = NULL; COPY_FILES *thiscopy = NULL; COPY_FILES *prevcopy = NULL; + RETURN_CODE return_code; /* Assume we were successful! */ - errorlevel = NO_ERROR; + return_code = NO_ERROR; /* If no args supplied at all, report an error */ if (param1[0] == 0x00) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NOARG)); - errorlevel = ERROR_INVALID_FUNCTION; - return; + return errorlevel = ERROR_INVALID_FUNCTION; } opt_d = opt_v = opt_n = opt_z = opt_y = opt_noty = FALSE; @@ -726,7 +726,7 @@ void WCMD_copy(WCHAR * args) { if (*thisparam=='+') { if (lastcopyentry == NULL) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; goto exitreturn; } else { concatnextfilename = TRUE; @@ -781,7 +781,7 @@ void WCMD_copy(WCHAR * args) { } else { /* We have processed sources and destinations and still found more to do - invalid */ WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; goto exitreturn; } concatnextfilename = FALSE; @@ -798,7 +798,7 @@ void WCMD_copy(WCHAR * args) { /* Ensure we have at least one source file */ if (!sourcelist) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; goto exitreturn; } @@ -828,6 +828,7 @@ void WCMD_copy(WCHAR * args) { if (destination == NULL) { WINE_TRACE("No destination supplied, so need to calculate it\n"); + lstrcpyW(destname, L"."); lstrcatW(destname, L"\\"); @@ -846,7 +847,8 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Destination supplied, processing to see if file or directory\n"); /* Convert to fully qualified path/filename */ - if (!WCMD_get_fullpath(destination->name, ARRAY_SIZE(destname), destname, &filenamepart)) return; + if (!WCMD_get_fullpath(destination->name, ARRAY_SIZE(destname), destname, &filenamepart)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Full dest name is '%s'\n", wine_dbgstr_w(destname)); /* If parameter is a directory, ensure it ends in \ */ @@ -914,6 +916,7 @@ void WCMD_copy(WCHAR * args) { thiscopy = sourcelist; prevcopy = NULL; + return_code = NO_ERROR; while (thiscopy != NULL) { WCHAR srcpath[MAX_PATH]; @@ -928,7 +931,8 @@ void WCMD_copy(WCHAR * args) { /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing to where the filename portion begins (used for wildcard expansion). */ - if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return; + if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); /* If parameter is a directory, ensure it ends in \* */ @@ -938,7 +942,8 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append * and recalculate the full resulting path */ lstrcatW(thiscopy->name, L"*"); - if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return; + if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } else if ((wcspbrk(srcpath, L"*?") == NULL) && @@ -948,7 +953,8 @@ void WCMD_copy(WCHAR * args) { /* We need to know where the filename part starts, so append \* and recalculate the full resulting path */ lstrcatW(thiscopy->name, L"\\*"); - if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) return; + if (!WCMD_get_fullpath(thiscopy->name, ARRAY_SIZE(srcpath), srcpath, &filenamepart)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(srcpath)); } @@ -1046,7 +1052,7 @@ void WCMD_copy(WCHAR * args) { } if (!status) { WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; } else { WINE_TRACE("Copied successfully\n"); if (anyconcats) writtenoneconcat = TRUE; @@ -1058,11 +1064,12 @@ void WCMD_copy(WCHAR * args) { if (!destination->binarycopy && !anyconcats && !thiscopy->binarycopy) { if (!WCMD_AppendEOF(outname)) { WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; } } } - } + } else if (prompt) + return_code = ERROR_INVALID_FUNCTION; } } while (!srcisdevice && FindNextFileW(hff, &fd) != 0); if (!srcisdevice) FindClose (hff); @@ -1070,7 +1077,7 @@ void WCMD_copy(WCHAR * args) { /* Error if the first file was not found */ if (!anyconcats || !writtenoneconcat) { WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; } } @@ -1079,10 +1086,10 @@ void WCMD_copy(WCHAR * args) { } /* Append EOF if ascii destination and we were concatenating */ - if (!errorlevel && !destination->binarycopy && anyconcats && writtenoneconcat) { + if (!return_code && !destination->binarycopy && anyconcats && writtenoneconcat) { if (!WCMD_AppendEOF(destination->name)) { WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; } } @@ -1104,7 +1111,7 @@ exitreturn: free(destination); } - return; + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c17f00c0c02..8b281907624 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -474,11 +474,11 @@ FAILURE 1 @todo_wine(a)--- FAILURE 1 --- success/failure for COPY command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 --- success/failure for MOVE command FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 752ee251cd2..0b0a96c5fb8 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -166,7 +166,7 @@ void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); void WCMD_clear_screen (void); void WCMD_color (void); -void WCMD_copy (WCHAR *); +RETURN_CODE WCMD_copy(WCHAR *); void WCMD_create_dir (WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); void WCMD_directory (WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5e429c2f3f0..c096abe3431 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1820,7 +1820,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_clear_screen (); break; case WCMD_COPY: - WCMD_copy (parms_start); + return_code = WCMD_copy(parms_start); break; case WCMD_CTTY: WCMD_change_tty ();

1 0

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

July 2, 2024

Module: wine Branch: master Commit: 90d278f9326f582b8d60a86dab6eb0317d4b88df URL: https://gitlab.winehq.org/wine/wine/-/commit/90d278f9326f582b8d60a86dab6eb0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:46:11 2024 +0200 cmd: Set success/failure return code for MOVE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 25 +++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 10 +++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2a7e08da898..b14aa477380 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1928,11 +1928,10 @@ void WCMD_popd (void) { * Move a file, directory tree or wildcarded set of files. */ -void WCMD_move (void) +RETURN_CODE WCMD_move(void) { - BOOL status; WIN32_FIND_DATAW fd; - HANDLE hff; + HANDLE hff; WCHAR input[MAX_PATH]; WCHAR output[MAX_PATH]; WCHAR drive[10]; @@ -1942,7 +1941,7 @@ void WCMD_move (void) if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* If no destination supplied, assume current directory */ @@ -1953,7 +1952,8 @@ void WCMD_move (void) /* If 2nd parm is directory, then use original filename */ /* Convert partial path to full path */ if (!WCMD_get_fullpath(param1, ARRAY_SIZE(input), input, NULL) || - !WCMD_get_fullpath(param2, ARRAY_SIZE(output), output, NULL)) return; + !WCMD_get_fullpath(param2, ARRAY_SIZE(output), output, NULL)) + return errorlevel = ERROR_INVALID_FUNCTION; WINE_TRACE("Move from '%s'('%s') to '%s'\n", wine_dbgstr_w(input), wine_dbgstr_w(param1), wine_dbgstr_w(output)); @@ -1962,8 +1962,9 @@ void WCMD_move (void) hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) - return; + return errorlevel = ERROR_INVALID_FUNCTION; + errorlevel = NO_ERROR; do { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; @@ -2036,19 +2037,15 @@ void WCMD_move (void) flags |= MOVEFILE_REPLACE_EXISTING; } - if (ok) { - status = MoveFileExW(src, dest, flags); - } else { - status = TRUE; - } - - if (!status) { - WCMD_print_error (); + if (!ok || !MoveFileExW(src, dest, flags)) + { + if (!ok) WCMD_print_error(); errorlevel = ERROR_INVALID_FUNCTION; } } while (FindNextFileW(hff, &fd) != 0); FindClose(hff); + return errorlevel; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8d23e7efaf8..0c6362d227a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -480,11 +480,11 @@ SUCCESS 0 @todo_wine(a)FAILURE 1 @todo_wine(a)FAILURE 1 --- success/failure for MOVE command -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 +FAILURE 1 +SUCCESS 0 +FAILURE 1 +FAILURE 1 +FAILURE 1 --- success/failure for RENAME command @todo_wine(a)FAILURE 1 @todo_wine(a)FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index db63966bffe..d2ef5b46b86 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -179,7 +179,7 @@ void WCMD_give_help (const WCHAR *args); RETURN_CODE WCMD_goto(void); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); -void WCMD_move (void); +RETURN_CODE WCMD_move (void); WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); void WINAPIV WCMD_output (const WCHAR *format, ...); void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0ec3b014283..18315e9ce2b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1852,7 +1852,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_create_dir (parms_start); break; case WCMD_MOVE: - WCMD_move (); + return_code = WCMD_move(); break; case WCMD_PATH: WCMD_setshow_path (parms_start);

1 0

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

July 2, 2024

Module: wine Branch: master Commit: 0b6fc4cd1cc6ac4c0410fa99e517a23184efe488 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b6fc4cd1cc6ac4c0410fa99e517a2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 17:28:53 2024 +0200 cmd: Set success/failure return code for TYPE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 708e3c6dce6..2510735f00d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3490,21 +3490,22 @@ void WCMD_title (const WCHAR *args) { * Copy a file to standard output. */ -void WCMD_type (WCHAR *args) { - +RETURN_CODE WCMD_type(WCHAR *args) +{ + RETURN_CODE return_code; int argno = 0; WCHAR *argN = args; BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } if (param2[0] != 0x00) writeHeaders = TRUE; /* Loop through all args */ - errorlevel = NO_ERROR; + return_code = NO_ERROR; while (argN) { WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE); @@ -3520,7 +3521,7 @@ void WCMD_type (WCHAR *args) { if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); - errorlevel = ERROR_INVALID_FUNCTION; + return errorlevel = ERROR_INVALID_FUNCTION; } else { if (writeHeaders) { WCMD_output_stderr(L"\n%1\n\n\n", thisArg); @@ -3533,6 +3534,7 @@ void WCMD_type (WCHAR *args) { CloseHandle (h); } } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 58e115642b2..5919bcf4f77 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -465,14 +465,14 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for TYPE command -(a)todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 @todo_wine(a)a@space@ @todo_wine(a)b@space@ @todo_wine(a)FAILURE 1 @todo_wine(a)--- -(a)todo_wine@FAILURE 1 +FAILURE 1 --- success/failure for COPY command @todo_wine(a)FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9f8bdd46044..44cdd415fbe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ void WCMD_setshow_time (void); void WCMD_shift (const WCHAR *args); void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); -void WCMD_type (WCHAR *); +RETURN_CODE WCMD_type(WCHAR *); void WCMD_verify (const WCHAR *args); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 46ec53587e7..cd2043b02f3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1896,7 +1896,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_title(&whichcmd[count+1]); break; case WCMD_TYPE: - WCMD_type (parms_start); + return_code = WCMD_type(parms_start); break; case WCMD_VER: WCMD_output_asis(L"\r\n");

1 0

Eric Pouech : cmd: Add success/failure tests for file related commands.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: a132d9c37ebc5638244dd9223edf39e7665bad86 URL: https://gitlab.winehq.org/wine/wine/-/commit/a132d9c37ebc5638244dd9223edf39… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 11:06:03 2024 +0200 cmd: Add success/failure tests for file related commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 58 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 34 ++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d31cb3ef72a..ccdddd289bd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -466,6 +466,64 @@ 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 TYPE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (type &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (type file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- +call :setError 666 & (type i\dont\exist\at\all.txt file* &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for COPY command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (copy fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileA+fileD fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (copy fileD+fileA fileZ /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +if exist fileD echo Unexpected fileD +cd .. && rd /q /s foo + +echo --- success/failure for MOVE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (move >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileA fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC nowhere\fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileD fileE >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (move fileC fileB /-Y >NUL <NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for RENAME command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +call :setError 666 & (rename fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB nowhere\fileB >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileD fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rename fileB fileC >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for ERASE command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +echo e > fileE +call :setError 666 & (erase &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase fileE &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (erase file* i\dont\exist\at\all.txt &&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 c2dba03b740..58e115642b2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -464,7 +464,39 @@ SUCCESS 666 SUCCESS 666 SUCCESS 0 FAILURE 33 ---- +--- success/failure for TYPE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@a(a)space@ +(a)todo_wine@b(a)space@ +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- +(a)todo_wine@FAILURE 1 +--- success/failure for COPY command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for MOVE command +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for RENAME command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +SUCCESS 0 +--- success/failure for ERASE command +(a)todo_wine@FAILURE 1 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0