[RFC PATCH 11/11] server: Replace redundant recv_socket status fields with force_async boolean field.

[Jinoh Kang]

The 'status' field of recv_socket_request is always either
STATUS_PENDING or STATUS_DEVICE_NOT_READY, and the 'total' field is
always zero.

Replace the 'status' field with 'force_async' boolean field, and get rid
of the 'total' field entirely.

Also, clean up the recv_socket handler code a bit.

Signed-off-by: Jinoh Kang <jinoh.kang.kr at gmail.com>
---

Notes:
    Patch split as per review feedback:
    https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html

 dlls/ntdll/unix/socket.c |  5 +----
 server/protocol.def      |  3 +--
 server/request.h         |  3 +--
 server/sock.c            | 24 ++++++++++--------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index a5f808c265d..a78f4c733a6 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -740,13 +740,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi
         }
     }
 
-    status = force_async ? STATUS_PENDING : STATUS_DEVICE_NOT_READY;
-
     memset( &inline_apc, 0, sizeof(inline_apc) );
     SERVER_START_REQ( recv_socket )
     {
-        req->status = status;
-        req->total  = 0;
+        req->force_async = force_async;
         req->async  = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) );
         req->oob    = !!(unix_flags & MSG_OOB);
         wine_server_set_reply( req, &inline_apc, sizeof(inline_apc) );
diff --git a/server/protocol.def b/server/protocol.def
index 348791c28da..13a70e8c576 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1442,8 +1442,7 @@ enum server_fd_type
 @REQ(recv_socket)
     int          oob;           /* are we receiving OOB data? */
     async_data_t async;         /* async I/O parameters */
-    unsigned int status;        /* status of initial call */
-    unsigned int total;         /* number of bytes already read */
+    int          force_async;   /* Force asynchronous mode? */
 @REPLY
     obj_handle_t wait;          /* handle to wait on for blocking recv */
     unsigned int options;       /* device open options */
diff --git a/server/request.h b/server/request.h
index dd11a919361..c273da9884a 100644
--- a/server/request.h
+++ b/server/request.h
@@ -1043,8 +1043,7 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 );
 C_ASSERT( sizeof(struct unlock_file_request) == 32 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 );
-C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 );
-C_ASSERT( FIELD_OFFSET(struct recv_socket_request, total) == 60 );
+C_ASSERT( FIELD_OFFSET(struct recv_socket_request, force_async) == 56 );
 C_ASSERT( sizeof(struct recv_socket_request) == 64 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 );
 C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 );
diff --git a/server/sock.c b/server/sock.c
index 683cbb21aa6..10e7b31c44b 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -3397,8 +3397,8 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
 DECL_HANDLER(recv_socket)
 {
     struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops );
-    unsigned int status = req->status;
-    int pending = 0;
+    unsigned int status = STATUS_PENDING;
+    int pending = req->force_async;
     timeout_t timeout = 0;
     struct async *async;
     struct fd *fd;
@@ -3406,8 +3406,8 @@ DECL_HANDLER(recv_socket)
     if (!sock) return;
     fd = sock->fd;
 
-    /* recv() returned EWOULDBLOCK, i.e. no data available yet */
-    if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking)
+    /* Synchronous, *blocking* I/O requested? */
+    if (!req->force_async && !sock->nonblocking)
     {
         /* Set a timeout on the async if necessary.
          *
@@ -3418,16 +3418,16 @@ DECL_HANDLER(recv_socket)
         if (is_fd_overlapped( fd ))
             timeout = (timeout_t)sock->rcvtimeo * -10000;
 
-        status = STATUS_PENDING;
+        pending = 1;
     }
 
-    if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->rd_shutdown)
+    if (status == STATUS_PENDING && sock->rd_shutdown)
         status = STATUS_PIPE_DISCONNECTED;
 
     /* NOTE: If read_q is not empty, we cannot really tell if the already queued asyncs
      * NOTE: will not consume all available data; if there's no data available,
      * NOTE: the current request won't be immediately satiable. */
-    if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && !async_queued( &sock->read_q ))
+    if (status == STATUS_PENDING && !async_queued( &sock->read_q ))
     {
         struct pollfd pollfd;
         pollfd.fd = get_unix_fd( sock->fd );
@@ -3438,22 +3438,18 @@ DECL_HANDLER(recv_socket)
             /* Give the client opportunity to complete synchronously.
              * If it turns out that the I/O request is not actually immediately satiable,
              * the client may then choose to re-queue the async (with STATUS_PENDING). */
-            pending = status == STATUS_PENDING;
             status = STATUS_ALERTED;
         }
     }
 
+    if (!pending && status == STATUS_PENDING)
+        status = STATUS_DEVICE_NOT_READY;  /* -> WSAEWOULDBLOCK */
+
     sock->pending_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ);
     sock->reported_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ);
 
     if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async )))
     {
-        if (status == STATUS_SUCCESS)
-        {
-            struct iosb *iosb = async_get_iosb( async );
-            iosb->result = req->total;
-            release_object( iosb );
-        }
         set_error( status );
 
         if (timeout)
-- 
2.31.1