Module: wine Branch: master Commit: 830fc41fbb619924f89d50de539d86c9565513e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830fc41fbb619924f89d50de5...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Jun 10 19:36:23 2021 -0500
server: Do not return the socket state from get_socket_event.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/server_protocol.h | 4 +--- server/protocol.def | 1 - server/request.h | 3 +-- server/sock.c | 1 - server/trace.c | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fe1f5394a72..a97974027f1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1758,9 +1758,7 @@ struct get_socket_event_reply struct reply_header __header; unsigned int mask; unsigned int pmask; - unsigned int state; /* VARARG(errors,ints); */ - char __pad_20[4]; };
@@ -6294,7 +6292,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 711 +#define SERVER_PROTOCOL_VERSION 712
/* ### protocol_version end ### */
diff --git a/server/protocol.def b/server/protocol.def index 30624a7cbaf..3609261b848 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1441,7 +1441,6 @@ enum server_fd_type @REPLY unsigned int mask; /* event mask */ unsigned int pmask; /* pending events */ - unsigned int state; /* status bits */ VARARG(errors,ints); /* event errors */ @END
diff --git a/server/request.h b/server/request.h index a8d74f01f96..4f6adaa97c2 100644 --- a/server/request.h +++ b/server/request.h @@ -1052,8 +1052,7 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); 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( FIELD_OFFSET(struct get_socket_event_reply, state) == 16 ); -C_ASSERT( sizeof(struct get_socket_event_reply) == 24 ); +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 ); diff --git a/server/sock.c b/server/sock.c index b4649abbf08..bbd82d57bd5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2376,7 +2376,6 @@ DECL_HANDLER(get_socket_event) if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; reply->pmask = sock->pending_events; - reply->state = sock->state; set_reply_data( sock->errors, min( get_reply_max_size(), sizeof(sock->errors) ));
if (req->service) diff --git a/server/trace.c b/server/trace.c index 1c51bffe1aa..42952d3cdff 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2093,7 +2093,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re { fprintf( stderr, " mask=%08x", req->mask ); fprintf( stderr, ", pmask=%08x", req->pmask ); - fprintf( stderr, ", state=%08x", req->state ); dump_varargs_ints( ", errors=", cur_size ); }
@@ -5391,6 +5390,7 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL },