Commit 376c218a authored by Alexandre Julliard's avatar Alexandre Julliard

server: Removed unused visible rect from get_window_rectangles request.

parent fde11104
...@@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply ...@@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply
{ {
struct reply_header __header; struct reply_header __header;
rectangle_t window; rectangle_t window;
rectangle_t visible;
rectangle_t client; rectangle_t client;
}; };
enum coords_relative enum coords_relative
...@@ -6511,6 +6510,6 @@ union generic_reply ...@@ -6511,6 +6510,6 @@ union generic_reply
struct terminate_job_reply terminate_job_reply; struct terminate_job_reply terminate_job_reply;
}; };
#define SERVER_PROTOCOL_VERSION 552 #define SERVER_PROTOCOL_VERSION 553
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
...@@ -2643,7 +2643,6 @@ enum message_type ...@@ -2643,7 +2643,6 @@ enum message_type
int relative; /* coords relative to (see below) */ int relative; /* coords relative to (see below) */
@REPLY @REPLY
rectangle_t window; /* window rectangle */ rectangle_t window; /* window rectangle */
rectangle_t visible; /* visible part of the window rectangle */
rectangle_t client; /* client rectangle */ rectangle_t client; /* client rectangle */
@END @END
enum coords_relative enum coords_relative
......
...@@ -1767,9 +1767,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); ...@@ -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( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 );
C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); 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, window) == 8 );
C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, visible) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 );
C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); C_ASSERT( sizeof(struct get_window_rectangles_reply) == 40 );
C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 );
C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 );
C_ASSERT( sizeof(struct get_window_text_request) == 16 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 );
......
...@@ -3222,7 +3222,6 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl ...@@ -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 ) static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req )
{ {
dump_rectangle( " window=", &req->window ); dump_rectangle( " window=", &req->window );
dump_rectangle( ", visible=", &req->visible );
dump_rectangle( ", client=", &req->client ); dump_rectangle( ", client=", &req->client );
} }
......
...@@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles) ...@@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles)
if (!win) return; if (!win) return;
reply->window = win->window_rect; reply->window = win->window_rect;
reply->visible = win->visible_rect;
reply->client = win->client_rect; reply->client = win->client_rect;
switch (req->relative) switch (req->relative)
{ {
case COORDS_CLIENT: case COORDS_CLIENT:
offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); 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 ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top );
if (win->ex_style & WS_EX_LAYOUTRTL) if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &reply->window );
{
mirror_rect( &win->client_rect, &reply->window );
mirror_rect( &win->client_rect, &reply->visible );
}
break; break;
case COORDS_WINDOW: case COORDS_WINDOW:
offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); 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 ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top );
if (win->ex_style & WS_EX_LAYOUTRTL) if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->window_rect, &reply->client );
{
mirror_rect( &win->window_rect, &reply->visible );
mirror_rect( &win->window_rect, &reply->client );
}
break; break;
case COORDS_PARENT: case COORDS_PARENT:
if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) 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->window );
mirror_rect( &win->parent->client_rect, &reply->visible );
mirror_rect( &win->parent->client_rect, &reply->client ); mirror_rect( &win->parent->client_rect, &reply->client );
} }
break; break;
case COORDS_SCREEN: case COORDS_SCREEN:
client_to_screen_rect( win->parent, &reply->window ); client_to_screen_rect( win->parent, &reply->window );
client_to_screen_rect( win->parent, &reply->visible );
client_to_screen_rect( win->parent, &reply->client ); client_to_screen_rect( win->parent, &reply->client );
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment