Module: wine Branch: master Commit: 376c218ad69610dee92ef5ab51b313a90edf514c URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c218ad69610dee92ef5ab5...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 24 14:10:12 2018 +0200
server: Removed unused visible rect from get_window_rectangles request.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/server_protocol.h | 3 +-- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - server/window.c | 17 ++--------------- 5 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 564ae92..98dbcb7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply { struct reply_header __header; rectangle_t window; - rectangle_t visible; rectangle_t client; }; enum coords_relative @@ -6511,6 +6510,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; };
-#define SERVER_PROTOCOL_VERSION 552 +#define SERVER_PROTOCOL_VERSION 553
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9fb155b..99e7221 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2643,7 +2643,6 @@ enum message_type int relative; /* coords relative to (see below) */ @REPLY rectangle_t window; /* window rectangle */ - rectangle_t visible; /* visible part of the window rectangle */ rectangle_t client; /* client rectangle */ @END enum coords_relative diff --git a/server/request.h b/server/request.h index 3e6183b..2d55dfb 100644 --- a/server/request.h +++ b/server/request.h @@ -1767,9 +1767,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, window) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, visible) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); -C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 ); +C_ASSERT( sizeof(struct get_window_rectangles_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); diff --git a/server/trace.c b/server/trace.c index 44004ad..e2980a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3222,7 +3222,6 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) { dump_rectangle( " window=", &req->window ); - dump_rectangle( ", visible=", &req->visible ); dump_rectangle( ", client=", &req->client ); }
diff --git a/server/window.c b/server/window.c index 4a1a278..9492a00 100644 --- a/server/window.c +++ b/server/window.c @@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles) if (!win) return;
reply->window = win->window_rect; - reply->visible = win->visible_rect; reply->client = win->client_rect;
switch (req->relative) { case COORDS_CLIENT: offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); - offset_rect( &reply->visible, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->client_rect, &reply->window ); - mirror_rect( &win->client_rect, &reply->visible ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &reply->window ); break; case COORDS_WINDOW: offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); - offset_rect( &reply->visible, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->window_rect, &reply->visible ); - mirror_rect( &win->window_rect, &reply->client ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->window_rect, &reply->client ); break; case COORDS_PARENT: if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &reply->window ); - mirror_rect( &win->parent->client_rect, &reply->visible ); mirror_rect( &win->parent->client_rect, &reply->client ); } break; case COORDS_SCREEN: client_to_screen_rect( win->parent, &reply->window ); - client_to_screen_rect( win->parent, &reply->visible ); client_to_screen_rect( win->parent, &reply->client ); break; default: