[PATCH 1/2] winhttp: Handle state in a single switch in receive_response().

[Paul Gofman]

From: Paul Gofman

---
 dlls/winhttp/request.c | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index c99cb7ee195..5af2609158a 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -2871,38 +2871,39 @@ 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 );

-    if (request->state >= REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED)
+    switch (request->state)
     {
-        ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE;
-        goto done;
-    }
+        case REQUEST_RESPONSE_RECURSIVE_REQUEST:
+            TRACE( "Sending request.\n" );
+            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 );
+            break;

-    if (request->state == REQUEST_RESPONSE_RECURSIVE_REQUEST)
-    {
-        TRACE( "Sending request.\n" );
-        if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done;
-    }
+        case REQUEST_RESPONSE_STATE_SENDING_REQUEST:
+            if (!async_mode)
+            {
+                ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE;
+                goto done;
+            }
+            send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 );
+            request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED;
+            return queue_receive_response( request );

-    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 );
+        case REQUEST_RESPONSE_STATE_REQUEST_SENT:
+            send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 );
+            break;

-    if (return_to_send)
-    {
-        request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED;
-        return queue_receive_response( request );
+        case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT:
+            request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT;
+            break;
+
+        default:
+            ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE;
+            goto done;
     }

send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED,