server: Remove the no longer used get_socket_info request.

include/wine/server_protocol.h

@@ -1747,22 +1747,6 @@ struct get_socket_event_reply
 
 
 
-struct get_socket_info_request
-{
-    struct request_header __header;
-    obj_handle_t handle;
-};
-struct get_socket_info_reply
-{
-    struct reply_header __header;
-    int family;
-    int type;
-    int protocol;
-    char __pad_20[4];
-};
-
-
-
 struct recv_socket_request
 {
     struct request_header __header;
@@ -5473,7 +5457,6 @@ enum request
     REQ_lock_file,
     REQ_unlock_file,
     REQ_get_socket_event,
-    REQ_get_socket_info,
     REQ_recv_socket,
     REQ_poll_socket,
     REQ_send_socket,
@@ -5754,7 +5737,6 @@ union generic_request
     struct lock_file_request lock_file_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 recv_socket_request recv_socket_request;
     struct poll_socket_request poll_socket_request;
     struct send_socket_request send_socket_request;
@@ -6033,7 +6015,6 @@ union generic_reply
     struct lock_file_reply lock_file_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 recv_socket_reply recv_socket_reply;
     struct poll_socket_reply poll_socket_reply;
     struct send_socket_reply send_socket_reply;
@@ -6257,7 +6238,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 714
+#define SERVER_PROTOCOL_VERSION 715
 
 /* ### protocol_version end ### */
 

server/protocol.def

@@ -1435,16 +1435,6 @@ enum server_fd_type
 @END
 
 
-/* Get socket info */
-@REQ(get_socket_info)
-    obj_handle_t handle;        /* handle to the socket */
-@REPLY
-    int family;                 /* family, see socket manpage */
-    int type;                   /* type, see socket manpage */
-    int protocol;               /* protocol, see socket manpage */
-@END
-
-
 /* Perform a recv on a socket */
 @REQ(recv_socket)
     int          oob;           /* are we receiving OOB data? */

server/request.h

@@ -173,7 +173,6 @@ DECL_HANDLER(get_volume_info);
 DECL_HANDLER(lock_file);
 DECL_HANDLER(unlock_file);
 DECL_HANDLER(get_socket_event);
-DECL_HANDLER(get_socket_info);
 DECL_HANDLER(recv_socket);
 DECL_HANDLER(poll_socket);
 DECL_HANDLER(send_socket);
@@ -453,7 +452,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
     (req_handler)req_lock_file,
     (req_handler)req_unlock_file,
     (req_handler)req_get_socket_event,
-    (req_handler)req_get_socket_info,
     (req_handler)req_recv_socket,
     (req_handler)req_poll_socket,
     (req_handler)req_send_socket,
@@ -1043,12 +1041,6 @@ C_ASSERT( sizeof(struct get_socket_event_request) == 24 );
 C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 );
 C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 );
 C_ASSERT( sizeof(struct get_socket_event_reply) == 16 );
-C_ASSERT( FIELD_OFFSET(struct get_socket_info_request, handle) == 12 );
-C_ASSERT( sizeof(struct get_socket_info_request) == 16 );
-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 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 );

server/sock.c

@@ -2967,22 +2967,6 @@ DECL_HANDLER(get_socket_event)
     release_object( &sock->obj );
 }
 
-DECL_HANDLER(get_socket_info)
-{
-    struct sock *sock;
-
-    sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops );
-    if (!sock) return;
-
-    if (get_unix_fd( sock->fd ) == -1) return;
-
-    reply->family   = sock->family;
-    reply->type     = sock->type;
-    reply->protocol = sock->proto;
-
-    release_object( &sock->obj );
-}
-
 DECL_HANDLER(recv_socket)
 {
     struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops );

server/trace.c

@@ -2087,18 +2087,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re
     dump_varargs_ints( ", errors=", cur_size );
 }
 
-static void dump_get_socket_info_request( const struct get_socket_info_request *req )
-{
-    fprintf( stderr, " handle=%04x", req->handle );
-}
-
-static void dump_get_socket_info_reply( const struct get_socket_info_reply *req )
-{
-    fprintf( stderr, " family=%d", req->family );
-    fprintf( stderr, ", type=%d", req->type );
-    fprintf( stderr, ", protocol=%d", req->protocol );
-}
-
 static void dump_recv_socket_request( const struct recv_socket_request *req )
 {
     fprintf( stderr, " oob=%d", req->oob );
@@ -4584,7 +4572,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_lock_file_request,
     (dump_func)dump_unlock_file_request,
     (dump_func)dump_get_socket_event_request,
-    (dump_func)dump_get_socket_info_request,
     (dump_func)dump_recv_socket_request,
     (dump_func)dump_poll_socket_request,
     (dump_func)dump_send_socket_request,
@@ -4861,7 +4848,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
     (dump_func)dump_lock_file_reply,
     NULL,
     (dump_func)dump_get_socket_event_reply,
-    (dump_func)dump_get_socket_info_reply,
     (dump_func)dump_recv_socket_reply,
     (dump_func)dump_poll_socket_reply,
     (dump_func)dump_send_socket_reply,
@@ -5138,7 +5124,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
     "lock_file",
     "unlock_file",
     "get_socket_event",
-    "get_socket_info",
     "recv_socket",
     "poll_socket",
     "send_socket",