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

Rémi Bernon : winegstreamer: Normalize both input and output media types stride at once.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 19fc2c56a17a086835b59406131077cf0c681075 URL: https://gitlab.winehq.org/wine/wine/-/commit/19fc2c56a17a086835b59406131077… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 2 09:25:33 2024 +0200 winegstreamer: Normalize both input and output media types stride at once. --- dlls/winegstreamer/video_processor.c | 42 +++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index 4afdddcb036..5555cef8303 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -91,34 +91,47 @@ struct video_processor IMFVideoSampleAllocatorEx *allocator; }; -static HRESULT normalize_stride(IMFMediaType *media_type, BOOL bottom_up, IMFMediaType **ret) +static HRESULT normalize_media_types(BOOL bottom_up, IMFMediaType **input_type, IMFMediaType **output_type) { - MFVIDEOFORMAT *format; - LONG stride; + MFVIDEOFORMAT *input_format, *output_format; + BOOL normalize_input, normalize_output; UINT32 size; HRESULT hr; - if (SUCCEEDED(hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride))) + normalize_input = FAILED(IMFMediaType_GetItem(*input_type, &MF_MT_DEFAULT_STRIDE, NULL)); + normalize_output = FAILED(IMFMediaType_GetItem(*output_type, &MF_MT_DEFAULT_STRIDE, NULL)); + + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(*input_type, &input_format, &size))) + return hr; + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(*output_type, &output_format, &size))) { - *ret = media_type; - IMFMediaType_AddRef(media_type); + CoTaskMemFree(input_format); return hr; } - if (SUCCEEDED(hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &format, &size))) + if (bottom_up && normalize_input) + input_format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; + if (bottom_up && normalize_output) + output_format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; + + if (FAILED(hr = MFCreateVideoMediaType(input_format, (IMFVideoMediaType **)input_type))) + goto done; + if (FAILED(hr = MFCreateVideoMediaType(output_format, (IMFVideoMediaType **)output_type))) { - if (bottom_up) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; - hr = MFCreateVideoMediaType(format, (IMFVideoMediaType **)ret); - CoTaskMemFree(format); + IMFMediaType_Release(*input_type); + *input_type = NULL; } +done: + CoTaskMemFree(input_format); + CoTaskMemFree(output_format); return hr; } static HRESULT try_create_wg_transform(struct video_processor *impl) { BOOL bottom_up = !impl->device_manager; /* when not D3D-enabled, the transform outputs bottom up RGB buffers */ - IMFMediaType *input_type, *output_type; + IMFMediaType *input_type = impl->input_type, *output_type = impl->output_type; struct wg_transform_attrs attrs = {0}; HRESULT hr; @@ -128,13 +141,8 @@ static HRESULT try_create_wg_transform(struct video_processor *impl) impl->wg_transform = 0; } - if (FAILED(hr = normalize_stride(impl->input_type, bottom_up, &input_type))) - return hr; - if (FAILED(hr = normalize_stride(impl->output_type, bottom_up, &output_type))) - { - IMFMediaType_Release(input_type); + if (FAILED(hr = normalize_media_types(bottom_up, &input_type, &output_type))) return hr; - } hr = wg_transform_create_mf(input_type, output_type, &attrs, &impl->wg_transform); IMFMediaType_Release(output_type); IMFMediaType_Release(input_type);

1 0

Paul Gofman : winhttp/tests: Add test for trailing spaces in reply header.
by Alexandre Julliard 03 Jul '24

03 Jul '24

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: Construct raw header from the parse result in read_reply().
by Alexandre Julliard 03 Jul '24

03 Jul '24

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

Paul Gofman : winhttp: Skip trailing spaces in reply header names.
by Alexandre Julliard 03 Jul '24

03 Jul '24

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

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

02 Jul '24

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 02 Jul '24

02 Jul '24

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

Piotr Caban : ucrtbase: Store exception record in ExceptionInformation[6] during unwinding.
by Alexandre Julliard 02 Jul '24

02 Jul '24

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

Alexandros Frantzis : opengl32: Add default implementation for wglChoosePixelFormatARB.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 272c55ac257315ef8393df357a79aac4e0d6cd76 URL: https://gitlab.winehq.org/wine/wine/-/commit/272c55ac257315ef8393df357a79aa… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 25 13:45:02 2024 +0300 opengl32: Add default implementation for wglChoosePixelFormatARB. The default implementation will be used automatically if the driver populates the wgl_pixel_format ARB fields. --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/thunks.c | 10 +- dlls/opengl32/wgl.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 285 insertions(+), 9 deletions(-)

1 0

Alexandros Frantzis : winex11: Remove driver wglChoosePixelFormatARB implementation.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 3832320559de56703d829fc434d1ebfe6f39be86 URL: https://gitlab.winehq.org/wine/wine/-/commit/3832320559de56703d829fc434d1eb… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 25 13:59:38 2024 +0300 winex11: Remove driver wglChoosePixelFormatARB implementation. The driver uses the default implementation provided by opengl32.dll. --- dlls/winex11.drv/opengl.c | 382 +--------------------------------------------- 1 file changed, 1 insertion(+), 381 deletions(-)

1 0

Alexandros Frantzis : winewayland: Support WGL_ARB_pixel_format.
by Alexandre Julliard 02 Jul '24

02 Jul '24

Module: wine Branch: master Commit: 7d1dec86de97545171927320a8b38a7e87e6a393 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d1dec86de97545171927320a8b38a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 26 10:49:58 2024 +0300 winewayland: Support WGL_ARB_pixel_format. Populate wgl_pixel_format ARB attributes to enable the default implementation of WGL_ARB_pixel_format. --- dlls/winewayland.drv/opengl.c | 77 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 3cb8b1e8a0d..e714b2cb952 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -707,14 +707,17 @@ static BOOL wayland_wglSwapIntervalEXT(int interval) static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt) { - EGLint value; + EGLint value, surface_type; PIXELFORMATDESCRIPTOR *pfd = &fmt->pfd; - memset(pfd, 0, sizeof(*pfd)); + /* If we can't get basic information, there is no point continuing */ + if (!p_eglGetConfigAttrib(egl_display, config, EGL_SURFACE_TYPE, &surface_type)) return; + + memset(fmt, 0, sizeof(*fmt)); pfd->nSize = sizeof(*pfd); pfd->nVersion = 1; - pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | - PFD_SUPPORT_COMPOSITION; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_SUPPORT_COMPOSITION; + if (surface_type & EGL_WINDOW_BIT) pfd->dwFlags |= PFD_DRAW_TO_WINDOW; pfd->iPixelType = PFD_TYPE_RGBA; pfd->iLayerType = PFD_MAIN_PLANE; @@ -722,6 +725,9 @@ static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt value = 0; \ p_eglGetConfigAttrib(egl_display, config, attrib, &value); \ pfd->field = value; +#define SET_ATTRIB_ARB(field, attrib) \ + if (!p_eglGetConfigAttrib(egl_display, config, attrib, &value)) value = -1; \ + fmt->field = value; /* Although the documentation describes cColorBits as excluding alpha, real * drivers tend to return the full pixel size, so do the same. */ @@ -743,7 +749,65 @@ static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt SET_ATTRIB(cDepthBits, EGL_DEPTH_SIZE); SET_ATTRIB(cStencilBits, EGL_STENCIL_SIZE); + fmt->swap_method = WGL_SWAP_UNDEFINED_ARB; + + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_TYPE, &value)) + { + switch (value) + { + case EGL_TRANSPARENT_RGB: fmt->transparent = GL_TRUE; break; + case EGL_NONE: fmt->transparent = GL_FALSE; break; + default: + ERR("unexpected transparency type 0x%x\n", value); + fmt->transparent = -1; + break; + } + } + else fmt->transparent = -1; + + /* TODO: Support floating point pixel components */ + fmt->pixel_type = WGL_TYPE_RGBA_ARB; + + fmt->draw_to_pbuffer = !!(surface_type & EGL_PBUFFER_BIT); + SET_ATTRIB_ARB(max_pbuffer_pixels, EGL_MAX_PBUFFER_PIXELS); + SET_ATTRIB_ARB(max_pbuffer_width, EGL_MAX_PBUFFER_WIDTH); + SET_ATTRIB_ARB(max_pbuffer_height, EGL_MAX_PBUFFER_HEIGHT); + + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_RED_VALUE, &value)) + { + fmt->transparent_red_value_valid = GL_TRUE; + fmt->transparent_red_value = value; + } + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_GREEN_VALUE, &value)) + { + fmt->transparent_green_value_valid = GL_TRUE; + fmt->transparent_green_value = value; + } + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_BLUE_VALUE, &value)) + { + fmt->transparent_blue_value_valid = GL_TRUE; + fmt->transparent_blue_value = value; + } + fmt->transparent_alpha_value_valid = GL_TRUE; + fmt->transparent_alpha_value = 0; + fmt->transparent_index_value_valid = GL_TRUE; + fmt->transparent_index_value = 0; + + SET_ATTRIB_ARB(sample_buffers, EGL_SAMPLE_BUFFERS); + SET_ATTRIB_ARB(samples, EGL_SAMPLES); + + SET_ATTRIB_ARB(bind_to_texture_rgb, EGL_BIND_TO_TEXTURE_RGB); + SET_ATTRIB_ARB(bind_to_texture_rgba, EGL_BIND_TO_TEXTURE_RGBA); + fmt->bind_to_texture_rectangle_rgb = fmt->bind_to_texture_rgb; + fmt->bind_to_texture_rectangle_rgba = fmt->bind_to_texture_rgba; + + /* TODO: Support SRGB surfaces and enable the attribute */ + fmt->framebuffer_srgb_capable = GL_FALSE; + + fmt->float_components = GL_FALSE; + #undef SET_ATTRIB +#undef SET_ATTRIB_ARB } static BOOL has_opengl(void); @@ -827,6 +891,11 @@ static BOOL init_opengl_funcs(void) opengl_funcs.ext.p_wglGetSwapIntervalEXT = wayland_wglGetSwapIntervalEXT; opengl_funcs.ext.p_wglSwapIntervalEXT = wayland_wglSwapIntervalEXT; + register_extension("WGL_ARB_pixel_format"); + opengl_funcs.ext.p_wglChoosePixelFormatARB = (void *)1; /* never called */ + opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = (void *)1; /* never called */ + opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = (void *)1; /* never called */ + return TRUE; }

1 0