Paul Gofman : winhttp: Send notifications from receive_response() directly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ee2de0b8fe93c84df3d7c4a3da0840ad27864f02
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ee2de0b8fe93c84df3d7c4a3da0840a...

Author: Paul Gofman 
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