Zebediah Figura : server: Remove the no longer used set_socket_deferred request.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9827081305c86b85886ff9541b50382fe7bdf16d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9827081305c86b85886ff9541...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Thu Jun 17 20:58:24 2021 -0500

server: Remove the no longer used set_socket_deferred request.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/wine/server_protocol.h | 18 +-----------------
 server/protocol.def            |  6 ------
 server/request.h               |  5 -----
 server/sock.c                  | 18 ------------------
 server/trace.c                 |  9 ---------
 5 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 1f0e25c31fa..d23603248bb 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -1762,19 +1762,6 @@ struct get_socket_info_reply
 };
 
 
-struct set_socket_deferred_request
-{
-    struct request_header __header;
-    obj_handle_t handle;
-    obj_handle_t deferred;
-    char __pad_20[4];
-};
-struct set_socket_deferred_reply
-{
-    struct reply_header __header;
-};
-
-
 
 struct recv_socket_request
 {
@@ -5487,7 +5474,6 @@ enum request
     REQ_unlock_file,
     REQ_get_socket_event,
     REQ_get_socket_info,
-    REQ_set_socket_deferred,
     REQ_recv_socket,
     REQ_poll_socket,
     REQ_send_socket,
@@ -5769,7 +5755,6 @@ union generic_request
     struct unlock_file_request unlock_file_request;
     struct get_socket_event_request get_socket_event_request;
     struct get_socket_info_request get_socket_info_request;
-    struct set_socket_deferred_request set_socket_deferred_request;
     struct recv_socket_request recv_socket_request;
     struct poll_socket_request poll_socket_request;
     struct send_socket_request send_socket_request;
@@ -6049,7 +6034,6 @@ union generic_reply
     struct unlock_file_reply unlock_file_reply;
     struct get_socket_event_reply get_socket_event_reply;
     struct get_socket_info_reply get_socket_info_reply;
-    struct set_socket_deferred_reply set_socket_deferred_reply;
     struct recv_socket_reply recv_socket_reply;
     struct poll_socket_reply poll_socket_reply;
     struct send_socket_reply send_socket_reply;
@@ -6273,7 +6257,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 713
+#define SERVER_PROTOCOL_VERSION 714
 
 /* ### protocol_version end ### */
 
diff --git a/server/protocol.def b/server/protocol.def
index d3f44482c37..72f2f2c20ae 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1445,12 +1445,6 @@ enum server_fd_type
 @END
 
 
-(a)REQ(set_socket_deferred)
-    obj_handle_t handle;        /* handle to the socket */
-    obj_handle_t deferred;      /* handle to the socket for which accept() is deferred */
-(a)END
-
-
 /* Perform a recv on a socket */
 @REQ(recv_socket)
     int          oob;           /* are we receiving OOB data? */
diff --git a/server/request.h b/server/request.h
index c3f77a233ab..5e95ef6e625 100644
--- a/server/request.h
+++ b/server/request.h
@@ -174,7 +174,6 @@ DECL_HANDLER(lock_file);
 DECL_HANDLER(unlock_file);
 DECL_HANDLER(get_socket_event);
 DECL_HANDLER(get_socket_info);
-DECL_HANDLER(set_socket_deferred);
 DECL_HANDLER(recv_socket);
 DECL_HANDLER(poll_socket);
 DECL_HANDLER(send_socket);
@@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
     (req_handler)req_unlock_file,
     (req_handler)req_get_socket_event,
     (req_handler)req_get_socket_info,
-    (req_handler)req_set_socket_deferred,
     (req_handler)req_recv_socket,
     (req_handler)req_poll_socket,
     (req_handler)req_send_socket,
@@ -1051,9 +1049,6 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 );
 C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 );
 C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 );
 C_ASSERT( sizeof(struct get_socket_info_reply) == 24 );
-C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, handle) == 12 );
-C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, deferred) == 16 );
-C_ASSERT( sizeof(struct set_socket_deferred_request) == 24 );
 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 );
diff --git a/server/sock.c b/server/sock.c
index 7b40b6e3f30..547287572d5 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2950,24 +2950,6 @@ DECL_HANDLER(get_socket_event)
     release_object( &sock->obj );
 }
 
-DECL_HANDLER(set_socket_deferred)
-{
-    struct sock *sock, *acceptsock;
-
-    sock=(struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops );
-    if ( !sock )
-        return;
-
-    acceptsock = (struct sock *)get_handle_obj( current->process, req->deferred, 0, &sock_ops );
-    if ( !acceptsock )
-    {
-        release_object( sock );
-        return;
-    }
-    sock->deferred = acceptsock;
-    release_object( sock );
-}
-
 DECL_HANDLER(get_socket_info)
 {
     struct sock *sock;
diff --git a/server/trace.c b/server/trace.c
index d8800199dbf..855348fa60a 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2099,12 +2099,6 @@ static void dump_get_socket_info_reply( const struct get_socket_info_reply *req
     fprintf( stderr, ", protocol=%d", req->protocol );
 }
 
-static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req )
-{
-    fprintf( stderr, " handle=%04x", req->handle );
-    fprintf( stderr, ", deferred=%04x", req->deferred );
-}
-
 static void dump_recv_socket_request( const struct recv_socket_request *req )
 {
     fprintf( stderr, " oob=%d", req->oob );
@@ -4591,7 +4585,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_unlock_file_request,
     (dump_func)dump_get_socket_event_request,
     (dump_func)dump_get_socket_info_request,
-    (dump_func)dump_set_socket_deferred_request,
     (dump_func)dump_recv_socket_request,
     (dump_func)dump_poll_socket_request,
     (dump_func)dump_send_socket_request,
@@ -4869,7 +4862,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
     NULL,
     (dump_func)dump_get_socket_event_reply,
     (dump_func)dump_get_socket_info_reply,
-    NULL,
     (dump_func)dump_recv_socket_reply,
     (dump_func)dump_poll_socket_reply,
     (dump_func)dump_send_socket_reply,
@@ -5147,7 +5139,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
     "unlock_file",
     "get_socket_event",
     "get_socket_info",
-    "set_socket_deferred",
     "recv_socket",
     "poll_socket",
     "send_socket",