system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-09 04:16:08 +00:00
Code Issues Projects Releases Wiki Activity

user32: Don't send cross-process message for GetWindowTextLength().

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-05-22 13:00:34 +02:00
parent e5966d7475
commit 51e8d579bb
6 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/user32/win.c
View File

@ -461,18 +461,23 @@ static void update_window_state( HWND hwnd )
* *
* Retrieve the window text from the server. * Retrieve the window text from the server.
*/ */
static void get_server_window_text( HWND hwnd, LPWSTR text, INT count ) static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count )
{ {
size_t len = 0; data_size_t len = 0, needed = 0;
SERVER_START_REQ( get_window_text ) SERVER_START_REQ( get_window_text )
{ {
req->handle = wine_server_user_handle( hwnd ); req->handle = wine_server_user_handle( hwnd );
wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); if (count) wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) );
if (!wine_server_call_err( req )) len = wine_server_reply_size(reply); if (!wine_server_call_err( req ))
{
needed = reply->length;
len = wine_server_reply_size(reply);
}
} }
SERVER_END_REQ; SERVER_END_REQ;
text[len / sizeof(WCHAR)] = 0; if (text) text[len / sizeof(WCHAR)] = 0;
return needed;
} }
@ -2875,7 +2880,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString )
*/ */
INT WINAPI GetWindowTextLengthA( HWND hwnd ) INT WINAPI GetWindowTextLengthA( HWND hwnd )
{ {
return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); CPINFO info;
if (WIN_IsCurrentProcess( hwnd )) return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 );
/* when window belongs to other process, don't send a message */
GetCPInfo( CP_ACP, &info );
return get_server_window_text( hwnd, NULL, 0 ) * info.MaxCharSize;
} }
/******************************************************************* /*******************************************************************
@ -2883,7 +2894,10 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd )
*/ */
INT WINAPI GetWindowTextLengthW( HWND hwnd ) INT WINAPI GetWindowTextLengthW( HWND hwnd )
{ {
return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 );
/* when window belongs to other process, don't send a message */
return get_server_window_text( hwnd, NULL, 0 );
} }

4
include/wine/server_protocol.h
View File

@ -3703,7 +3703,9 @@ struct get_window_text_request
struct get_window_text_reply struct get_window_text_reply
{ {
struct reply_header __header; struct reply_header __header;
data_size_t length;
/* VARARG(text,unicode_str); */ /* VARARG(text,unicode_str); */
char __pad_12[4];
}; };
@ -6509,6 +6511,6 @@ union generic_reply
struct terminate_job_reply terminate_job_reply; struct terminate_job_reply terminate_job_reply;
}; };
#define SERVER_PROTOCOL_VERSION 551 #define SERVER_PROTOCOL_VERSION 552
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

1
server/protocol.def
View File

@ -2659,6 +2659,7 @@ enum coords_relative
@REQ(get_window_text) @REQ(get_window_text)
user_handle_t handle; /* handle to the window */ user_handle_t handle; /* handle to the window */
@REPLY @REPLY
data_size_t length; /* total length in WCHARs */
VARARG(text,unicode_str); /* window text */ VARARG(text,unicode_str); /* window text */
@END @END

3
server/request.h
View File

@ -1772,7 +1772,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 );
C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); 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( sizeof(struct get_window_text_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 );
C_ASSERT( sizeof(struct get_window_text_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 );
C_ASSERT( sizeof(struct set_window_text_request) == 16 ); C_ASSERT( sizeof(struct set_window_text_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 );

3
server/trace.c
View File

@ -3233,7 +3233,8 @@ static void dump_get_window_text_request( const struct get_window_text_request *
static void dump_get_window_text_reply( const struct get_window_text_reply *req ) static void dump_get_window_text_reply( const struct get_window_text_reply *req )
{ {
dump_varargs_unicode_str( " text=", cur_size ); fprintf( stderr, " length=%u", req->length );
dump_varargs_unicode_str( ", text=", cur_size );
} }
static void dump_set_window_text_request( const struct set_window_text_request *req ) static void dump_set_window_text_request( const struct set_window_text_request *req )

5
server/window.c
View File

@ -2398,9 +2398,8 @@ DECL_HANDLER(get_window_text)
if (win && win->text) if (win && win->text)
{ {
data_size_t len = strlenW( win->text ) * sizeof(WCHAR); reply->length = strlenW( win->text );
if (len > get_reply_max_size()) len = get_reply_max_size(); set_reply_data( win->text, min( reply->length * sizeof(WCHAR), get_reply_max_size() ));
set_reply_data( win->text, len );
} }
} }