December 2022 - Wine-commits

Jacek Caban : win32u: Move GetShellWindow implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 67c3fff7cdcbceb80368ed6b6501978aeed41fff URL: https://gitlab.winehq.org/wine/wine/-/commit/67c3fff7cdcbceb80368ed6b650197… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:36:22 2022 +0100 win32u: Move GetShellWindow implementation from user32. --- dlls/user32/focus.c | 12 +----------- dlls/win32u/input.c | 15 +++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 2d15aa9c6e7..e79f6f68dc2 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -112,17 +112,7 @@ BOOL WINAPI SetShellWindow(HWND hwndShell) */ HWND WINAPI GetShellWindow(void) { - HWND hwndShell = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - hwndShell = wine_server_ptr_handle( reply->old_shell_window ); - } - SERVER_END_REQ; - - return hwndShell; + return NtUserGetShellWindow(); } diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 75230e961e0..fb87d6395d3 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2150,3 +2150,18 @@ void toggle_caret( HWND hwnd ) if (ret && !hidden) display_caret( hwnd, &r ); } + +HWND get_shell_window(void) +{ + HWND hwnd = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + hwnd = wine_server_ptr_handle( reply->old_shell_window ); + } + SERVER_END_REQ; + + return hwnd; +} diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5854e000fea..89be3bbc6ed 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5437,6 +5437,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetProcessDefaultLayout: return process_layout; + case NtUserCallNoParam_GetShellWindow: + return HandleToUlong( get_shell_window() ); + case NtUserCallNoParam_ReleaseCapture: return release_capture(); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 8fc00cf3296..1fe2f80da61 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -271,6 +271,7 @@ extern HWND get_capture(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; extern HWND get_focus(void) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; +extern HWND get_shell_window(void) DECLSPEC_HIDDEN; extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 5b2b24a7f33..94d5326fc6e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -910,6 +910,7 @@ enum NtUserCallNoParam_GetDialogBaseUnits, NtUserCallNoParam_GetInputState, NtUserCallNoParam_GetProcessDefaultLayout, + NtUserCallNoParam_GetShellWindow, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -941,6 +942,11 @@ static inline DWORD NtUserGetProcessDefaultLayout(void) return NtUserCallNoParam( NtUserCallNoParam_GetProcessDefaultLayout ); } +static inline HWND NtUserGetShellWindow(void) +{ + return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetShellWindow )); +} + static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );

1 0

Alex Henrie : wsdapi: Annotate duplicate_(string|name) with __WINE_MALLOC.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 702b92ad23030da73f49a547b1a141465679c268 URL: https://gitlab.winehq.org/wine/wine/-/commit/702b92ad23030da73f49a547b1a141… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 8 20:37:09 2022 -0700 wsdapi: Annotate duplicate_(string|name) with __WINE_MALLOC. --- dlls/wsdapi/wsdapi_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 2bab54ffda6..b9301501585 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -95,8 +95,8 @@ HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_l /* xml.c */ -LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); -WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name); +WCHAR *duplicate_string(void *parent_memory_block, const WCHAR *value) __WINE_MALLOC; +WSDXML_NAME *duplicate_name(void *parent_memory_block, WSDXML_NAME *name) __WINE_MALLOC; WSDXML_NAMESPACE *xml_context_find_namespace_by_prefix(IWSDXMLContext *context, LPCWSTR prefix); #endif

1 0

Alex Henrie : cmd: Use standard C functions for memory allocation.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 579278587995a132cdc1489c849b61eefbe60ffa URL: https://gitlab.winehq.org/wine/wine/-/commit/579278587995a132cdc1489c849b61… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 22:47:19 2022 -0700 cmd: Use standard C functions for memory allocation. --- programs/cmd/batch.c | 16 ++++----- programs/cmd/builtins.c | 94 ++++++++++++++++++++++++------------------------ programs/cmd/directory.c | 44 +++++++++++------------ programs/cmd/wcmd.h | 7 ++-- programs/cmd/wcmdmain.c | 66 +++++++++++++++++----------------- 5 files changed, 113 insertions(+), 114 deletions(-)

1 0

Etaash Mathamsetty : ntoskrnl.exe: Use KeQueryMaximumProcessorCountEx for KeQueryMaximumProcessorCount.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5fd79c32ed6dd2940344a67c217977832c29e0ae URL: https://gitlab.winehq.org/wine/wine/-/commit/5fd79c32ed6dd2940344a67c217977… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Thu Dec 1 12:45:42 2022 -0500 ntoskrnl.exe: Use KeQueryMaximumProcessorCountEx for KeQueryMaximumProcessorCount. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 66c39996d59..ce92f6805ab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3437,7 +3437,7 @@ ULONG WINAPI KeQueryMaximumProcessorCountEx(USHORT group_number) */ ULONG WINAPI KeQueryMaximumProcessorCount(void) { - return KeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); + return KeQueryMaximumProcessorCountEx(0); } /***********************************************************************

1 0

Paul Gofman : winhttp: Do not open connection in handle_redirect().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 9caf603ad69e2de9109886331539954328e6881f URL: https://gitlab.winehq.org/wine/wine/-/commit/9caf603ad69e2de910988633153995… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 12:37:33 2022 -0600 winhttp: Do not open connection in handle_redirect(). Let send_request() do it. --- dlls/winhttp/request.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1a9b4e14ee8..e04d5a04e9d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2733,7 +2733,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else free( hostname ); if ((ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; - if ((ret = open_connection( request ))) goto end; free( request->path ); request->path = NULL;

1 0

Paul Gofman : winhttp: Don't refill buffer after receiving server response.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 0ed844712fbef442d9670f665e126c06a5256e3c URL: https://gitlab.winehq.org/wine/wine/-/commit/0ed844712fbef442d9670f665e126c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 18:49:35 2022 -0600 winhttp: Don't refill buffer after receiving server response. --- dlls/winhttp/request.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e04d5a04e9d..37508f1c81c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1795,6 +1795,38 @@ static DWORD discard_eol( struct request *request, BOOL notify ) return ERROR_SUCCESS; } +static void update_value_from_digit( DWORD *value, char ch ) +{ + if (ch >= '0' && ch <= '9') *value = *value * 16 + ch - '0'; + else if (ch >= 'a' && ch <= 'f') *value = *value * 16 + ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') *value = *value * 16 + ch - 'A' + 10; +} + +/* read chunk size if already in the read buffer */ +static BOOL get_chunk_size( struct request *request ) +{ + DWORD chunk_size; + char *p, *eol; + + if (request->read_chunked_size != ~0ul) return TRUE; + + eol = memchr( request->read_buf + request->read_pos, '\n', request->read_size ); + if (!eol) return FALSE; + + chunk_size = 0; + for (p = request->read_buf + request->read_pos; p != eol; ++p) + { + if (*p == ';' || *p == '\r') break; + update_value_from_digit( &chunk_size, *p ); + } + + request->read_chunked_size = chunk_size; + if (!chunk_size) request->read_chunked_eof = TRUE; + + remove_data( request, (eol + 1) - (request->read_buf + request->read_pos) ); + return TRUE; +} + /* read the size of the next chunk */ static DWORD start_next_chunk( struct request *request, BOOL notify ) { @@ -1812,10 +1844,8 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) while (request->read_size) { char ch = request->read_buf[request->read_pos]; - if (ch >= '0' && ch <= '9') chunk_size = chunk_size * 16 + ch - '0'; - else if (ch >= 'a' && ch <= 'f') chunk_size = chunk_size * 16 + ch - 'a' + 10; - else if (ch >= 'A' && ch <= 'F') chunk_size = chunk_size * 16 + ch - 'A' + 10; - else if (ch == ';' || ch == '\r' || ch == '\n') + + if (ch == ';' || ch == '\r' || ch == '\n') { TRACE( "reading %lu byte chunk\n", chunk_size ); @@ -1827,6 +1857,7 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) return discard_eol( request, notify ); } + update_value_from_digit( &chunk_size, ch ); remove_data( request, 1 ); } if ((ret = read_more_data( request, -1, notify ))) return ret; @@ -1902,7 +1933,11 @@ static void finished_reading( struct request *request ) /* return the size of data available to be read immediately */ static DWORD get_available_data( struct request *request ) { - if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); + if (request->read_chunked) + { + if (!get_chunk_size( request )) return 0; + return min( request->read_chunked_size, request->read_size ); + } return request->read_size; } @@ -1920,6 +1955,9 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD int count, bytes_read = 0; DWORD ret = ERROR_SUCCESS; + if (request->read_chunked && request->read_chunked_size == ~0u + && (ret = start_next_chunk( request, async ))) goto done; + if (end_of_read_data( request )) goto done; while (size) @@ -2842,7 +2880,6 @@ static DWORD receive_response( struct request *request, BOOL async ) } if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - if (request->content_length) ret = refill_buffer( request, FALSE ); if (async) {

1 0

Paul Gofman : winhttp: Send notifications from receive_response() directly.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: ee2de0b8fe93c84df3d7c4a3da0840ad27864f02 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee2de0b8fe93c84df3d7c4a3da0840… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 20:19:52 2022 -0600 winhttp: Send notifications from receive_response() directly. --- dlls/winhttp/request.c | 8 +++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 37508f1c81c..2e68decb761 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1772,6 +1772,7 @@ static DWORD read_more_data( struct request *request, int maxlen, BOOL notify ) maxlen - request->read_size, 0, &len ); if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &len, sizeof(len) ); + request->read_reply_len += len; request->read_size += len; return ret; @@ -2212,6 +2213,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + request->read_reply_len = 0; + if (request->flags & REQUEST_FLAG_WEBSOCKET_UPGRADE && request->websocket_set_send_buffer_size < MIN_WEBSOCKET_SEND_BUFFER_SIZE) { @@ -2530,7 +2533,7 @@ static DWORD read_line( struct request *request, char *buffer, DWORD *len ) remove_data( request, bytes_read ); if (eol) break; - if ((ret = read_more_data( request, -1, TRUE ))) return ret; + if ((ret = read_more_data( request, -1, FALSE ))) return ret; if (!request->read_size) { *len = 0; @@ -2841,6 +2844,9 @@ static DWORD receive_response( struct request *request, BOOL async ) netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, + &request->read_reply_len, sizeof(request->read_reply_len) ); if ((ret = read_reply( request ))) break; size = sizeof(DWORD); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0326a8fc1e3..88b5c890945 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -220,6 +220,7 @@ struct request } creds[TARGET_MAX][SCHEME_MAX]; unsigned int websocket_receive_buffer_size; unsigned int websocket_send_buffer_size, websocket_set_send_buffer_size; + int read_reply_len; }; enum socket_state

1 0

Paul Gofman : winhttp: Receive server reply in send_request().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: aa8f97e8294b0618de0e8a45ff2adef0c4e516da URL: https://gitlab.winehq.org/wine/wine/-/commit/aa8f97e8294b0618de0e8a45ff2ade… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 19:33:18 2022 -0600 winhttp: Receive server reply in send_request(). --- dlls/winhttp/request.c | 30 +++++++++++++++++++++++++----- dlls/winhttp/session.c | 1 + dlls/winhttp/tests/winhttp.c | 8 ++++---- dlls/winhttp/winhttp_private.h | 8 ++++++++ 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2e68decb761..265a92c0d79 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -800,6 +800,13 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, const WCHAR *n SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } + if (request->state < REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED && !(level & WINHTTP_QUERY_FLAG_REQUEST_HEADERS) + && ((level & ~QUERY_MODIFIER_MASK) != WINHTTP_QUERY_REQUEST_METHOD)) + { + release_object( &request->hdr ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } ret = query_headers( request, level, name, buffer, buflen, index ); @@ -2213,7 +2220,9 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; request->read_reply_len = 0; + request->state = REQUEST_RESPONSE_STATE_NONE; if (request->flags & REQUEST_FLAG_WEBSOCKET_UPGRADE && request->websocket_set_send_buffer_size < MIN_WEBSOCKET_SEND_BUFFER_SIZE) @@ -2293,6 +2302,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->optional_len = optional_len; len += optional_len; } + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); end: @@ -2839,15 +2850,20 @@ static DWORD receive_response( struct request *request, BOOL async ) { DWORD ret, size, query, status; - if (!request->netconn) return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + TRACE( "request state %d.\n", request->state ); + + if (request->state >= REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &request->read_reply_len, sizeof(request->read_reply_len) ); - if ((ret = read_reply( request ))) break; + if ((ret = request->read_reply_status)) break; size = sizeof(DWORD); query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; @@ -2885,8 +2901,12 @@ static DWORD receive_response( struct request *request, BOOL async ) break; } - if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - +done: + if (!ret) + { + request->state = REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED; + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + } if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NULL, 0 ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8aa99f0ece7..65e471f7ee5 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1271,6 +1271,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, const WCHAR *verb, cons request->websocket_receive_buffer_size = connect->session->websocket_receive_buffer_size; request->websocket_send_buffer_size = connect->session->websocket_send_buffer_size; request->websocket_set_send_buffer_size = request->websocket_send_buffer_size; + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; if (!verb || !verb[0]) verb = L"GET"; if (!(request->verb = wcsdup( verb ))) goto end; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b7deaea324a..76f12837e86 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3277,14 +3277,14 @@ static void test_websocket(int port) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3312,14 +3312,14 @@ static void test_websocket(int port) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; buf[0] = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 88b5c890945..9c6d30eca77 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -174,6 +174,12 @@ enum request_flags REQUEST_FLAG_WEBSOCKET_UPGRADE = 0x01, }; +enum request_response_state +{ + REQUEST_RESPONSE_STATE_NONE, + REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, +}; + struct request { struct object_header hdr; @@ -221,6 +227,8 @@ struct request unsigned int websocket_receive_buffer_size; unsigned int websocket_send_buffer_size, websocket_set_send_buffer_size; int read_reply_len; + DWORD read_reply_status; + enum request_response_state state; }; enum socket_state

1 0

Paul Gofman : winhttp: Factor out queue_receive_response().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5a94affcfd0bed29aed5e93aa58e3534ad9c7f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a94affcfd0bed29aed5e93aa58e35… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 20:53:35 2022 -0600 winhttp: Factor out queue_receive_response(). --- dlls/winhttp/request.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 265a92c0d79..c8e19b6f0a8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2846,6 +2846,19 @@ static DWORD handle_passport_redirect( struct request *request ) return ERROR_SUCCESS; } +static void task_receive_response( void *ctx, BOOL abort ); + +static DWORD queue_receive_response( struct request *request ) +{ + struct receive_response *r; + DWORD ret; + + if (!(r = malloc( sizeof(*r) ))) return ERROR_OUTOFMEMORY; + if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) + free( r ); + return ret; +} + static DWORD receive_response( struct request *request, BOOL async ) { DWORD ret, size, query, status; @@ -2954,20 +2967,8 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) - { - struct receive_response *r; - - if (!(r = malloc( sizeof(*r) ))) - { - release_object( &request->hdr ); - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) - free( r ); - } - else ret = receive_response( request, FALSE ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) ret = queue_receive_response( request ); + else ret = receive_response( request, FALSE ); release_object( &request->hdr ); SetLastError( ret );

1 0

Paul Gofman : winhttp: Call receive_response() recursively instead of looping.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: c43dd486be7827eb038436929270c751fbeed30c URL: https://gitlab.winehq.org/wine/wine/-/commit/c43dd486be7827eb038436929270c7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 20:02:18 2022 -0600 winhttp: Call receive_response() recursively instead of looping. --- dlls/winhttp/request.c | 76 +++++++++++++++++++++++------------------- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c8e19b6f0a8..130adeee8a2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2859,8 +2859,9 @@ static DWORD queue_receive_response( struct request *request ) return ret; } -static DWORD receive_response( struct request *request, BOOL async ) +static DWORD receive_response( struct request *request ) { + BOOL async_mode = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; DWORD ret, size, query, status; TRACE( "request state %d.\n", request->state ); @@ -2871,48 +2872,53 @@ static DWORD receive_response( struct request *request, BOOL async ) goto done; } - for (;;) + if (request->state == REQUEST_RESPONSE_RECURSIVE_REQUEST) { - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, - &request->read_reply_len, sizeof(request->read_reply_len) ); - if ((ret = request->read_reply_status)) break; - - size = sizeof(DWORD); - query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; - if ((ret = query_headers( request, query, NULL, &status, &size, NULL ))) break; + TRACE( "Sending request.\n" ); + if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done; + } - set_content_length( request, status ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, + &request->read_reply_len, sizeof(request->read_reply_len) ); + if ((ret = request->read_reply_status)) goto done; - if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); + size = sizeof(DWORD); + query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; + if ((ret = query_headers( request, query, NULL, &status, &size, NULL ))) goto done; - if (status == HTTP_STATUS_REDIRECT && is_passport_request( request )) - { - ret = handle_passport_redirect( request ); - } - else if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) - { - if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || - request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) break; + set_content_length( request, status ); - if (++request->redirect_count > request->max_redirects) return ERROR_WINHTTP_REDIRECT_FAILED; + if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); - if ((ret = handle_redirect( request, status ))) break; + if (status == HTTP_STATUS_REDIRECT && is_passport_request( request )) + { + ret = handle_passport_redirect( request ); + goto done; + } + if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) + { + if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || + request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) goto done; - /* recurse synchronously */ - if (!(ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; - } - else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) + if (++request->redirect_count > request->max_redirects) { - if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; + ret = ERROR_WINHTTP_REDIRECT_FAILED; + goto done; + } - if (handle_authorization( request, status )) break; + if ((ret = handle_redirect( request, status ))) goto done; + } + else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) + { + if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) goto done; - /* recurse synchronously */ - if (!(ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; - } - break; + if (handle_authorization( request, status )) goto done; } + else goto done; + + request->state = REQUEST_RESPONSE_RECURSIVE_REQUEST; + return receive_response( request ); done: if (!ret) @@ -2920,7 +2926,7 @@ done: request->state = REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED; if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); } - if (async) + if (async_mode) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NULL, 0 ); else @@ -2942,7 +2948,7 @@ static void task_receive_response( void *ctx, BOOL abort ) if (abort) return; TRACE("running %p\n", ctx); - receive_response( request, TRUE ); + receive_response( request ); } /*********************************************************************** @@ -2968,7 +2974,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) } if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) ret = queue_receive_response( request ); - else ret = receive_response( request, FALSE ); + else ret = receive_response( request ); release_object( &request->hdr ); SetLastError( ret ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9c6d30eca77..cc2187d4200 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -177,6 +177,7 @@ enum request_flags enum request_response_state { REQUEST_RESPONSE_STATE_NONE, + REQUEST_RESPONSE_RECURSIVE_REQUEST, REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, };

1 0