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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1c84ac61e6674e2951691d97f27d75f667b00c97
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1c84ac61e6674e2951691d97f...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Sat Sep 19 17:13:38 2020 -0500

server: Remove the no longer used create_socket 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 | 25 +------------------------
 server/protocol.def            | 13 -------------
 server/request.h               | 11 -----------
 server/sock.c                  | 14 --------------
 server/trace.c                 | 18 ------------------
 5 files changed, 1 insertion(+), 80 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 2d4e016478..8e2ea08500 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -1692,26 +1692,6 @@ struct unlock_file_reply
 
 
 
-struct create_socket_request
-{
-    struct request_header __header;
-    unsigned int access;
-    unsigned int attributes;
-    int          family;
-    int          type;
-    int          protocol;
-    unsigned int flags;
-    char __pad_36[4];
-};
-struct create_socket_reply
-{
-    struct reply_header __header;
-    obj_handle_t handle;
-    char __pad_12[4];
-};
-
-
-
 struct accept_socket_request
 {
     struct request_header __header;
@@ -5500,7 +5480,6 @@ enum request
     REQ_get_volume_info,
     REQ_lock_file,
     REQ_unlock_file,
-    REQ_create_socket,
     REQ_accept_socket,
     REQ_accept_into_socket,
     REQ_set_socket_event,
@@ -5788,7 +5767,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 create_socket_request create_socket_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;
@@ -6074,7 +6052,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 create_socket_reply create_socket_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;
@@ -6305,7 +6282,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 642
+#define SERVER_PROTOCOL_VERSION 643
 
 /* ### protocol_version end ### */
 
diff --git a/server/protocol.def b/server/protocol.def
index fd9b721d69..94ae63fec5 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1380,19 +1380,6 @@ enum server_fd_type
 @END
 
 
-/* Create a socket */
-(a)REQ(create_socket)
-    unsigned int access;        /* wanted access rights */
-    unsigned int attributes;    /* object attributes */
-    int          family;        /* family, see socket manpage */
-    int          type;          /* type, see socket manpage */
-    int          protocol;      /* protocol, see socket manpage */
-    unsigned int flags;         /* socket flags */
-(a)REPLY
-    obj_handle_t handle;        /* handle to the new socket */
-(a)END
-
-
 /* Accept a socket */
 @REQ(accept_socket)
     obj_handle_t lhandle;       /* handle to the listening socket */
diff --git a/server/request.h b/server/request.h
index 39f3ce7b2e..de82151698 100644
--- a/server/request.h
+++ b/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(create_socket);
 DECL_HANDLER(accept_socket);
 DECL_HANDLER(accept_into_socket);
 DECL_HANDLER(set_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_create_socket,
     (req_handler)req_accept_socket,
     (req_handler)req_accept_into_socket,
     (req_handler)req_set_socket_event,
@@ -1052,15 +1050,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 create_socket_request, access) == 12 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_request, attributes) == 16 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_request, family) == 20 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_request, type) == 24 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_request, protocol) == 28 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_request, flags) == 32 );
-C_ASSERT( sizeof(struct create_socket_request) == 40 );
-C_ASSERT( FIELD_OFFSET(struct create_socket_reply, handle) == 8 );
-C_ASSERT( sizeof(struct create_socket_reply) == 16 );
 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 );
diff --git a/server/sock.c b/server/sock.c
index 7148702165..346d3758f3 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1249,20 +1249,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
     return create_named_object( root, &socket_device_ops, name, 0, NULL );
 }
 
-/* create a socket */
-DECL_HANDLER(create_socket)
-{
-    struct sock *sock;
-
-    reply->handle = 0;
-    if ((sock = create_socket()) != NULL)
-    {
-        if (!init_socket( sock, req->family, req->type, req->protocol, req->flags ))
-            reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes );
-        release_object( sock );
-    }
-}
-
 /* accept a socket */
 DECL_HANDLER(accept_socket)
 {
diff --git a/server/trace.c b/server/trace.c
index 707a952357..3aa6ecc1b7 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1945,21 +1945,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req )
     dump_uint64( ", count=", &req->count );
 }
 
-static void dump_create_socket_request( const struct create_socket_request *req )
-{
-    fprintf( stderr, " access=%08x", req->access );
-    fprintf( stderr, ", attributes=%08x", req->attributes );
-    fprintf( stderr, ", family=%d", req->family );
-    fprintf( stderr, ", type=%d", req->type );
-    fprintf( stderr, ", protocol=%d", req->protocol );
-    fprintf( stderr, ", flags=%08x", req->flags );
-}
-
-static void dump_create_socket_reply( const struct create_socket_reply *req )
-{
-    fprintf( stderr, " handle=%04x", req->handle );
-}
-
 static void dump_accept_socket_request( const struct accept_socket_request *req )
 {
     fprintf( stderr, " lhandle=%04x", req->lhandle );
@@ -4479,7 +4464,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_create_socket_request,
     (dump_func)dump_accept_socket_request,
     (dump_func)dump_accept_into_socket_request,
     (dump_func)dump_set_socket_event_request,
@@ -4763,7 +4747,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_create_socket_reply,
     (dump_func)dump_accept_socket_reply,
     NULL,
     NULL,
@@ -5047,7 +5030,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
     "get_volume_info",
     "lock_file",
     "unlock_file",
-    "create_socket",
     "accept_socket",
     "accept_into_socket",
     "set_socket_event",