ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Also return the new extended style in the set_window_pos request.

Browse Source
This commit is contained in:
Alexandre Julliard 2007-10-31 17:51:05 +01:00
parent ab07d61b91
commit 917f288f1b
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/winex11.drv/winpos.c
View File

@ -240,7 +240,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow,
struct x11drv_win_data *data; struct x11drv_win_data *data;
RECT new_whole_rect, old_client_rect; RECT new_whole_rect, old_client_rect;
WND *win; WND *win;
DWORD old_style, new_style; DWORD old_style, new_style, new_ex_style;
BOOL ret, make_managed = FALSE; BOOL ret, make_managed = FALSE;
if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE;
@ -293,6 +293,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow,
} }
ret = !wine_server_call( req ); ret = !wine_server_call( req );
new_style = reply->new_style; new_style = reply->new_style;
new_ex_style = reply->new_ex_style;
} }
SERVER_END_REQ; SERVER_END_REQ;
@ -304,6 +305,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow,
win->rectWindow = *rectWindow; win->rectWindow = *rectWindow;
win->rectClient = *rectClient; win->rectClient = *rectClient;
win->dwStyle = new_style; win->dwStyle = new_style;
win->dwExStyle = new_ex_style;
WIN_ReleasePtr( win ); WIN_ReleasePtr( win );
} }
return ret; return ret;
@ -325,6 +327,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow,
win->rectClient = *rectClient; win->rectClient = *rectClient;
old_style = win->dwStyle; old_style = win->dwStyle;
win->dwStyle = new_style; win->dwStyle = new_style;
win->dwExStyle = new_ex_style;
data->window_rect = *rectWindow; data->window_rect = *rectWindow;
TRACE( "win %p window %s client %s style %08x\n", TRACE( "win %p window %s client %s style %08x\n",

3
include/wine/server_protocol.h
View File

@ -2946,6 +2946,7 @@ struct set_window_pos_reply
{ {
struct reply_header __header; struct reply_header __header;
unsigned int new_style; unsigned int new_style;
unsigned int new_ex_style;
}; };
@ -4879,6 +4880,6 @@ union generic_reply
struct set_completion_info_reply set_completion_info_reply; struct set_completion_info_reply set_completion_info_reply;
}; };
#define SERVER_PROTOCOL_VERSION 323 #define SERVER_PROTOCOL_VERSION 324
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

1
server/protocol.def
View File

@ -2171,6 +2171,7 @@ enum message_type
VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE */ VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE */
@REPLY @REPLY
unsigned int new_style; /* new window style */ unsigned int new_style; /* new window style */
unsigned int new_ex_style; /* new window extended style */
@END @END

3
server/trace.c
View File

@ -2691,7 +2691,8 @@ static void dump_set_window_pos_request( const struct set_window_pos_request *re
static void dump_set_window_pos_reply( const struct set_window_pos_reply *req ) static void dump_set_window_pos_reply( const struct set_window_pos_reply *req )
{ {
fprintf( stderr, " new_style=%08x", req->new_style ); fprintf( stderr, " new_style=%08x,", req->new_style );
fprintf( stderr, " new_ex_style=%08x", req->new_ex_style );
} }
static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req ) static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req )

1
server/window.c
View File

@ -1822,6 +1822,7 @@ DECL_HANDLER(set_window_pos)
if (!visible_rect) visible_rect = &req->window; if (!visible_rect) visible_rect = &req->window;
set_window_pos( win, previous, flags, &req->window, &req->client, visible_rect, valid_rects ); set_window_pos( win, previous, flags, &req->window, &req->client, visible_rect, valid_rects );
reply->new_style = win->style; reply->new_style = win->style;
reply->new_ex_style = win->ex_style;
} }