server: Remove the no longer used accept_socket request.

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

include/wine/server_protocol.h

@@ -1695,22 +1695,6 @@ struct unlock_file_reply
 
 
 
-struct accept_socket_request
-{
-    struct request_header __header;
-    obj_handle_t lhandle;
-    unsigned int access;
-    unsigned int attributes;
-};
-struct accept_socket_reply
-{
-    struct reply_header __header;
-    obj_handle_t handle;
-    char __pad_12[4];
-};
-
-
-
 struct accept_into_socket_request
 {
     struct request_header __header;
@@ -5497,7 +5481,6 @@ enum request
     REQ_get_volume_info,
     REQ_lock_file,
     REQ_unlock_file,
-    REQ_accept_socket,
     REQ_accept_into_socket,
     REQ_set_socket_event,
     REQ_get_socket_event,
@@ -5785,7 +5768,6 @@ union generic_request
     struct get_volume_info_request get_volume_info_request;
     struct lock_file_request lock_file_request;
     struct unlock_file_request unlock_file_request;
-    struct accept_socket_request accept_socket_request;
     struct accept_into_socket_request accept_into_socket_request;
     struct set_socket_event_request set_socket_event_request;
     struct get_socket_event_request get_socket_event_request;
@@ -6071,7 +6053,6 @@ union generic_reply
     struct get_volume_info_reply get_volume_info_reply;
     struct lock_file_reply lock_file_reply;
     struct unlock_file_reply unlock_file_reply;
-    struct accept_socket_reply accept_socket_reply;
     struct accept_into_socket_reply accept_into_socket_reply;
     struct set_socket_event_reply set_socket_event_reply;
     struct get_socket_event_reply get_socket_event_reply;
@@ -6302,7 +6283,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 647
+#define SERVER_PROTOCOL_VERSION 648
 
 /* ### protocol_version end ### */
 

server/protocol.def

@@ -1383,16 +1383,6 @@ enum server_fd_type
 @END
 
 
-/* Accept a socket */
-@REQ(accept_socket)
-    obj_handle_t lhandle;       /* handle to the listening socket */
-    unsigned int access;        /* wanted access rights */
-    unsigned int attributes;    /* object attributes */
-@REPLY
-    obj_handle_t handle;        /* handle to the new socket */
-@END
-
-
 /* Accept into an initialized socket */
 @REQ(accept_into_socket)
     obj_handle_t lhandle;       /* handle to the listening socket */

server/request.h

@@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info);
 DECL_HANDLER(get_volume_info);
 DECL_HANDLER(lock_file);
 DECL_HANDLER(unlock_file);
-DECL_HANDLER(accept_socket);
 DECL_HANDLER(accept_into_socket);
 DECL_HANDLER(set_socket_event);
 DECL_HANDLER(get_socket_event);
@@ -460,7 +459,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
     (req_handler)req_get_volume_info,
     (req_handler)req_lock_file,
     (req_handler)req_unlock_file,
-    (req_handler)req_accept_socket,
     (req_handler)req_accept_into_socket,
     (req_handler)req_set_socket_event,
     (req_handler)req_get_socket_event,
@@ -1054,12 +1052,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 );
 C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 );
 C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 );
 C_ASSERT( sizeof(struct unlock_file_request) == 32 );
-C_ASSERT( FIELD_OFFSET(struct accept_socket_request, lhandle) == 12 );
-C_ASSERT( FIELD_OFFSET(struct accept_socket_request, access) == 16 );
-C_ASSERT( FIELD_OFFSET(struct accept_socket_request, attributes) == 20 );
-C_ASSERT( sizeof(struct accept_socket_request) == 24 );
-C_ASSERT( FIELD_OFFSET(struct accept_socket_reply, handle) == 8 );
-C_ASSERT( sizeof(struct accept_socket_reply) == 16 );
 C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, lhandle) == 12 );
 C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, ahandle) == 16 );
 C_ASSERT( sizeof(struct accept_into_socket_request) == 24 );

server/sock.c

@@ -1425,24 +1425,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
     return create_named_object( root, &socket_device_ops, name, attr, sd );
 }
 
-/* accept a socket */
-DECL_HANDLER(accept_socket)
-{
-    struct sock *sock, *acceptsock;
-
-    if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops )))
-        return;
-
-    reply->handle = 0;
-    if ((acceptsock = accept_socket( sock )) != NULL)
-    {
-        reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes );
-        acceptsock->wparam = reply->handle;  /* wparam for message is the socket handle */
-        release_object( acceptsock );
-    }
-    release_object( sock );
-}
-
 /* accept a socket into an initialized socket */
 DECL_HANDLER(accept_into_socket)
 {

server/trace.c

@@ -1948,18 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req )
     dump_uint64( ", count=", &req->count );
 }
 
-static void dump_accept_socket_request( const struct accept_socket_request *req )
-{
-    fprintf( stderr, " lhandle=%04x", req->lhandle );
-    fprintf( stderr, ", access=%08x", req->access );
-    fprintf( stderr, ", attributes=%08x", req->attributes );
-}
-
-static void dump_accept_socket_reply( const struct accept_socket_reply *req )
-{
-    fprintf( stderr, " handle=%04x", req->handle );
-}
-
 static void dump_accept_into_socket_request( const struct accept_into_socket_request *req )
 {
     fprintf( stderr, " lhandle=%04x", req->lhandle );
@@ -4479,7 +4467,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_get_volume_info_request,
     (dump_func)dump_lock_file_request,
     (dump_func)dump_unlock_file_request,
-    (dump_func)dump_accept_socket_request,
     (dump_func)dump_accept_into_socket_request,
     (dump_func)dump_set_socket_event_request,
     (dump_func)dump_get_socket_event_request,
@@ -4763,7 +4750,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_get_volume_info_reply,
     (dump_func)dump_lock_file_reply,
     NULL,
-    (dump_func)dump_accept_socket_reply,
     NULL,
     NULL,
     (dump_func)dump_get_socket_event_reply,
@@ -5047,7 +5033,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
     "get_volume_info",
     "lock_file",
     "unlock_file",
-    "accept_socket",
     "accept_into_socket",
     "set_socket_event",
     "get_socket_event",