- Wine-Commits - list.winehq.org

Ivo Ivanov : wineusb.sys: Pass interface and interface_index from the event data to the usb device data.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: ddb3a5ee895c7dc4be1d5d2cd91fc235670127f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddb3a5ee895c7dc4be1d5d2cd91fc2… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Aug 20 06:13:13 2022 +0300 wineusb.sys: Pass interface and interface_index from the event data to the usb device data. --- dlls/wineusb.sys/wineusb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 9512ecc8d12..05a9d81dcd6 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -127,6 +127,9 @@ static void add_unix_device(const struct usb_add_device_event *event) InitializeListHead(&device->irp_list); device->removed = FALSE; + device->interface = event->interface; + device->interface_index = event->interface_index; + device->class = event->class; device->subclass = event->subclass; device->protocol = event->protocol;

1 0

Ivo Ivanov : wineusb.sys: Implement DevClass compatible id for devices with multiple interfaces.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: a51af111ab2fa7d63be5cab60950880d0f88c785 URL: https://gitlab.winehq.org/wine/wine/-/commit/a51af111ab2fa7d63be5cab6095088… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Aug 20 10:19:42 2022 +0300 wineusb.sys: Implement DevClass compatible id for devices with multiple interfaces. Fixes also single interface devices not showing class, subclass, protocol of the first interface, which is the behavior on Windows. --- dlls/wineusb.sys/unixlib.c | 25 ++++++++++++++++++++++--- dlls/wineusb.sys/unixlib.h | 2 +- dlls/wineusb.sys/wineusb.c | 20 +++++++++++++++----- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f72686b5a78..406049d2fe3 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -143,10 +143,28 @@ static void add_usb_device(libusb_device *libusb_device) usb_event.u.added_device.subclass = device_desc.bDeviceSubClass; usb_event.u.added_device.protocol = device_desc.bDeviceProtocol; usb_event.u.added_device.interface = false; - queue_event(&usb_event); + usb_event.u.added_device.interface_index = -1; if (!(ret = libusb_get_active_config_descriptor(libusb_device, &config_desc))) { + const struct libusb_interface *interface; + const struct libusb_interface_descriptor *iface_desc; + + if (config_desc->bNumInterfaces == 1) + { + interface = &config_desc->interface[0]; + if (interface->num_altsetting != 1) + FIXME("Interface 0 has %u alternate settings; using the first one.\n", + interface->num_altsetting); + iface_desc = &interface->altsetting[0]; + + usb_event.u.added_device.class = iface_desc->bInterfaceClass; + usb_event.u.added_device.subclass = iface_desc->bInterfaceSubClass; + usb_event.u.added_device.protocol = iface_desc->bInterfaceProtocol; + usb_event.u.added_device.interface_index = iface_desc->bInterfaceNumber; + } + queue_event(&usb_event); + /* Create new devices for interfaces of composite devices. * * On Windows this is the job of usbccgp.sys, a separate driver that @@ -163,10 +181,9 @@ static void add_usb_device(libusb_device *libusb_device) for (i = 0; i < config_desc->bNumInterfaces; ++i) { - const struct libusb_interface *interface = &config_desc->interface[i]; - const struct libusb_interface_descriptor *iface_desc; struct unix_device *unix_iface; + interface = &config_desc->interface[i]; if (interface->num_altsetting != 1) FIXME("Interface %u has %u alternate settings; using the first one.\n", i, interface->num_altsetting); @@ -196,6 +213,8 @@ static void add_usb_device(libusb_device *libusb_device) } else { + queue_event(&usb_event); + ERR("Failed to get configuration descriptor: %s\n", libusb_strerror(ret)); } } diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index 3d27d3715c3..9941bd138ed 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -45,7 +45,7 @@ struct usb_event UINT16 vendor, product, revision; UINT8 class, subclass, protocol; bool interface; - UINT8 interface_index; + INT16 interface_index; } added_device; struct unix_device *removed_device; IRP *completed_irp; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 05a9d81dcd6..5447fabacda 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -76,7 +76,7 @@ struct usb_device DEVICE_OBJECT *device_obj; bool interface; - uint8_t interface_index; + int16_t interface_index; uint8_t class, subclass, protocol; @@ -377,10 +377,20 @@ static void get_hardware_ids(const struct usb_device *device, struct string_buff static void get_compatible_ids(const struct usb_device *device, struct string_buffer *buffer) { - append_id(buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - device->class, device->subclass, device->protocol); - append_id(buffer, L"USB\\Class_%02x&SubClass_%02x", device->class, device->subclass); - append_id(buffer, L"USB\\Class_%02x", device->class); + if (device->interface_index != -1) + { + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", + device->class, device->subclass, device->protocol); + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x", device->class, device->subclass); + append_id(buffer, L"USB\\Class_%02x", device->class); + } + else + { + append_id(buffer, L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", + device->class, device->subclass, device->protocol); + append_id(buffer, L"USB\\DevClass_%02x&SubClass_%02x", device->class, device->subclass); + append_id(buffer, L"USB\\DevClass_%02x", device->class); + } append_id(buffer, L""); }

1 0

Etaash Mathamsetty : ntoskrnl.exe: Use KeQueryMaximumProcessorCountEx for KeQueryMaximumProcessorCount.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

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

Alex Henrie : wsdapi: Annotate duplicate_(string|name) with __WINE_MALLOC.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

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 Dec. 9, 2022

Dec. 9, 2022

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

Rémi Bernon : opengl32: Avoid calling functions that have not been queried yet.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 640e9766fd6aa998d345656bfa76e037989e2706 URL: https://gitlab.winehq.org/wine/wine/-/commit/640e9766fd6aa998d345656bfa76e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 9 12:59:36 2022 +0100 opengl32: Avoid calling functions that have not been queried yet. The glMapBuffer and al. functions are all duplicated between EXT/ARB and core functions, and we reduced code duplication by redirecting the EXT to the core functions. The internal function table is only filled as the functions are queried, and it causes crahes when games are using the EXT functions without querying the core function first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53990 --- dlls/opengl32/unix_wgl.c | 105 ++++++++++++++++++++++++++++++++++------------- dlls/opengl32/wgl.c | 61 +++++++++++++++++++-------- 2 files changed, 119 insertions(+), 47 deletions(-)

1 0

Paul Gofman : winhttp/tests: Test calling WinHttpReceiveResponse() recursively from various send callbacks.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 8254905b120faf35ba92d4580339a9ffeb63fea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8254905b120faf35ba92d4580339a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 16 14:21:21 2022 -0600 winhttp/tests: Test calling WinHttpReceiveResponse() recursively from various send callbacks. --- dlls/winhttp/tests/notification.c | 86 +++++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 0c5ab64ac0e..dbdb958f061 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1848,6 +1848,10 @@ struct test_recursion_context LONG recursion_count, max_recursion_query, max_recursion_read; BOOL read_from_callback; BOOL have_sync_callback; + DWORD call_receive_response_status; + DWORD main_thread_id; + DWORD receive_response_thread_id; + BOOL headers_available; }; /* The limit is 128 before Win7 and 3 on newer Windows. */ @@ -1863,8 +1867,25 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex switch (status) { + case WINHTTP_CALLBACK_STATUS_SENDING_REQUEST: + case WINHTTP_CALLBACK_STATUS_REQUEST_SENT: case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: + if (status == context->call_receive_response_status) + { + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + } + break; + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: + if (context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) + ok( GetCurrentThreadId() == context->receive_response_thread_id, + "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); + else + ok( GetCurrentThreadId() != context->main_thread_id, + "expected callback to be called from the other thread, got main.\n" ); + context->headers_available = TRUE; SetEvent( context->wait ); break; @@ -1911,20 +1932,35 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; + case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: + case WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: + if (!context->headers_available + && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) + ok( GetCurrentThreadId() == context->receive_response_thread_id, + "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); + break; } } static void test_recursion(void) { + static DWORD request_callback_status_tests[] = + { + WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, + WINHTTP_CALLBACK_STATUS_REQUEST_SENT, + }; struct test_recursion_context context; HANDLE session, connection, request; DWORD size, status, err; + char buffer[1024]; + unsigned int i; BOOL ret; BYTE b; memset( &context, 0, sizeof(context) ); context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + context.main_thread_id = GetCurrentThreadId(); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok( !!session, "failed to open session, GetLastError() %lu\n", GetLastError() ); @@ -1938,6 +1974,11 @@ static void test_recursion(void) ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); context.request = request; + + ret = WinHttpReceiveResponse( request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + + context.call_receive_response_status = WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE; ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) @@ -1954,11 +1995,6 @@ static void test_recursion(void) WaitForSingleObject( context.wait, INFINITE ); - ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); - - WaitForSingleObject( context.wait, INFINITE ); - size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); @@ -1981,9 +2017,45 @@ static void test_recursion(void) } else skip( "no sync callbacks\n"); - WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); - WinHttpCloseHandle( request ); + + for (i = 0; i < ARRAY_SIZE(request_callback_status_tests); ++i) + { + winetest_push_context( "i %u", i ); + + request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); + ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); + + context.request = request; + context.call_receive_response_status = request_callback_status_tests[i]; + context.headers_available = FALSE; + + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip("Connection failed, skipping\n"); + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); + winetest_pop_context(); + return; + } + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReadData( request, buffer, sizeof(buffer), NULL ); + ok( ret, "failed to read data, GetLastError() %lu\n", GetLastError() ); + + WaitForSingleObject( context.wait, INFINITE ); + + WinHttpCloseHandle( request ); + winetest_pop_context(); + } + + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); WinHttpCloseHandle( connection ); WinHttpCloseHandle( session ); CloseHandle( context.wait );

1 0

Paul Gofman : winhttp: Execute receive_response() synchronously when possible.
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: wine Branch: master Commit: 32141dfa93f4b086a976c24769ca83d73f77a689 URL: https://gitlab.winehq.org/wine/wine/-/commit/32141dfa93f4b086a976c24769ca83… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 20:43:15 2022 -0600 winhttp: Execute receive_response() synchronously when possible. --- dlls/winhttp/request.c | 34 ++++++++++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 4 ++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d5eb1bfce3a..c99cb7ee195 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2220,6 +2220,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + TRACE( "request state %d.\n", request->state ); + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; request->read_reply_len = 0; request->state = REQUEST_RESPONSE_STATE_NONE; @@ -2289,6 +2291,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD } TRACE("full request: %s\n", debugstr_a(wire_req)); + request->state = REQUEST_RESPONSE_STATE_SENDING_REQUEST; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); ret = netconn_send( request->netconn, wire_req, len, &bytes_sent, NULL ); @@ -2306,6 +2309,11 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + else + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + end: if (async) { @@ -2863,6 +2871,7 @@ static DWORD receive_response( struct request *request ) { BOOL async_mode = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; DWORD ret, size, query, status; + BOOL return_to_send; TRACE( "request state %d.\n", request->state ); @@ -2878,7 +2887,24 @@ static DWORD receive_response( struct request *request ) if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + return_to_send = async_mode && request->state == REQUEST_RESPONSE_STATE_SENDING_REQUEST; + if (request->state < REQUEST_RESPONSE_STATE_REQUEST_SENT && !return_to_send) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } + + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT) + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + else + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + + if (return_to_send) + { + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED; + return queue_receive_response( request ); + } + 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; @@ -2918,7 +2944,7 @@ static DWORD receive_response( struct request *request ) else goto done; request->state = REQUEST_RESPONSE_RECURSIVE_REQUEST; - return receive_response( request ); + return async_mode ? queue_receive_response( request ) : receive_response( request ); done: if (!ret) @@ -2936,6 +2962,7 @@ done: result.dwError = ret; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } + return ERROR_SUCCESS; } return ret; } @@ -2973,8 +3000,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) ret = queue_receive_response( request ); - else ret = receive_response( request ); + 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 cc2187d4200..8e4789356ec 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -177,6 +177,10 @@ enum request_flags enum request_response_state { REQUEST_RESPONSE_STATE_NONE, + REQUEST_RESPONSE_STATE_SENDING_REQUEST, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED, + REQUEST_RESPONSE_STATE_REQUEST_SENT, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT, REQUEST_RESPONSE_RECURSIVE_REQUEST, REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, };

1 0

Paul Gofman : winhttp: Factor out queue_receive_response().
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

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 Dec. 9, 2022

Dec. 9, 2022

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