Commit 0aa36a83 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

win32u: Always use result returned directly from call_window_proc.

parent 2d7465eb
...@@ -54,7 +54,6 @@ struct received_message_info ...@@ -54,7 +54,6 @@ struct received_message_info
UINT type; UINT type;
MSG msg; MSG msg;
UINT flags; /* InSendMessageEx return flags */ UINT flags; /* InSendMessageEx return flags */
LRESULT result;
struct received_message_info *prev; struct received_message_info *prev;
}; };
...@@ -1258,7 +1257,6 @@ static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARA ...@@ -1258,7 +1257,6 @@ static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARA
if (info->type == MSG_CLIENT_MESSAGE) if (info->type == MSG_CLIENT_MESSAGE)
{ {
copy_reply( result, hwnd, message, info->msg.wParam, info->msg.lParam, wparam, lparam ); copy_reply( result, hwnd, message, info->msg.wParam, info->msg.lParam, wparam, lparam );
info->result = result;
return TRUE; return TRUE;
} }
...@@ -2879,16 +2877,12 @@ static BOOL process_packed_message( struct send_message_info *info, LRESULT *res ...@@ -2879,16 +2877,12 @@ static BOOL process_packed_message( struct send_message_info *info, LRESULT *res
receive_info.msg.lParam = info->lparam; receive_info.msg.lParam = info->lparam;
receive_info.flags = 0; receive_info.flags = 0;
receive_info.prev = thread_info->receive_info; receive_info.prev = thread_info->receive_info;
receive_info.result = 0;
thread_info->receive_info = &receive_info; thread_info->receive_info = &receive_info;
*res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam, *res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam,
!ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size ); !ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size );
if (thread_info->receive_info == &receive_info) if (thread_info->receive_info == &receive_info)
{
thread_info->receive_info = receive_info.prev; thread_info->receive_info = receive_info.prev;
*res_ptr = receive_info.result;
}
free( buffer ); free( buffer );
return TRUE; return TRUE;
} }
......
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