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

win32u: Move reply_message_result implementation from user32. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2022-03-31 15:36:02 +02:00 committed by Alexandre Julliard
parent f499b1a7ab
commit e72d463072
6 changed files with 431 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
dlls/user32/message.c
View File

@ -55,158 +55,6 @@ WINE_DECLARE_DEBUG_CHANNEL(key);
#define MAX_WINPROC_RECURSION 64
/* the various structures that can be sent in messages, in platform-independent layout */
struct packed_CREATESTRUCTW
{
ULONGLONG lpCreateParams;
ULONGLONG hInstance;
user_handle_t hMenu;
DWORD __pad1;
user_handle_t hwndParent;
DWORD __pad2;
INT cy;
INT cx;
INT y;
INT x;
LONG style;
ULONGLONG lpszName;
ULONGLONG lpszClass;
DWORD dwExStyle;
DWORD __pad3;
};
struct packed_DRAWITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
UINT itemAction;
UINT itemState;
user_handle_t hwndItem;
DWORD __pad1;
user_handle_t hDC;
DWORD __pad2;
RECT rcItem;
ULONGLONG itemData;
};
struct packed_MEASUREITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
UINT itemWidth;
UINT itemHeight;
ULONGLONG itemData;
};
struct packed_DELETEITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
user_handle_t hwndItem;
DWORD __pad;
ULONGLONG itemData;
};
struct packed_COMPAREITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
user_handle_t hwndItem;
DWORD __pad1;
UINT itemID1;
ULONGLONG itemData1;
UINT itemID2;
ULONGLONG itemData2;
DWORD dwLocaleId;
DWORD __pad2;
};
struct packed_WINDOWPOS
{
user_handle_t hwnd;
DWORD __pad1;
user_handle_t hwndInsertAfter;
DWORD __pad2;
INT x;
INT y;
INT cx;
INT cy;
UINT flags;
DWORD __pad3;
};
struct packed_COPYDATASTRUCT
{
ULONGLONG dwData;
DWORD cbData;
ULONGLONG lpData;
};
struct packed_HELPINFO
{
UINT cbSize;
INT iContextType;
INT iCtrlId;
user_handle_t hItemHandle;
DWORD __pad;
ULONGLONG dwContextId;
POINT MousePos;
};
struct packed_NCCALCSIZE_PARAMS
{
RECT rgrc[3];
ULONGLONG __pad1;
user_handle_t hwnd;
DWORD __pad2;
user_handle_t hwndInsertAfter;
DWORD __pad3;
INT x;
INT y;
INT cx;
INT cy;
UINT flags;
DWORD __pad4;
};
struct packed_MSG
{
user_handle_t hwnd;
DWORD __pad1;
UINT message;
ULONGLONG wParam;
ULONGLONG lParam;
DWORD time;
POINT pt;
DWORD __pad2;
};
struct packed_MDINEXTMENU
{
user_handle_t hmenuIn;
DWORD __pad1;
user_handle_t hmenuNext;
DWORD __pad2;
user_handle_t hwndNext;
DWORD __pad3;
};
struct packed_MDICREATESTRUCTW
{
ULONGLONG szClass;
ULONGLONG szTitle;
ULONGLONG hOwner;
INT x;
INT y;
INT cx;
INT cy;
DWORD style;
ULONGLONG lParam;
};
struct packed_hook_extra_info
{
user_handle_t handle;
@ -255,15 +103,6 @@ struct packed_message
size_t size[MAX_PACK_COUNT];
};
/* info about the message currently being received by the current thread */
struct received_message_info
{
enum message_type type;
MSG msg;
UINT flags; /* InSendMessageEx return flags */
struct received_message_info *prev;
};
/* structure to group all parameters for sent messages of the various kinds */
struct send_message_info
{
@ -1854,22 +1693,6 @@ static void reply_message( struct received_message_info *info, LRESULT result, M
}
/***********************************************************************
* reply_message_result
*
* Send a reply to a sent message and update thread receive info.
*/
static BOOL reply_message_result( LRESULT result, MSG *msg )
{
struct received_message_info *info = get_user_thread_info()->receive_info;
if (!info) return FALSE;
reply_message( info, result, msg );
if (msg) get_user_thread_info()->receive_info = info->prev;
return TRUE;
}
/***********************************************************************
* handle_internal_message
*
@ -2903,7 +2726,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags,
info.msg.lParam, (info.type != MSG_ASCII), FALSE,
WMCHAR_MAP_RECVMESSAGE );
if (thread_info->receive_info == &info )
reply_message_result( result, &info.msg );
NtUserCallTwoParam( result, (UINT_PTR)&info.msg, NtUserReplyMessage );
/* if some PM_QS* flags were specified, only handle sent messages from now on */
if (HIWORD(flags) && !changed_mask) flags = PM_QS_SENDMESSAGE | LOWORD(flags);
@ -3591,7 +3414,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
*/
BOOL WINAPI ReplyMessage( LRESULT result )
{
return reply_message_result( result, NULL );
return NtUserCallTwoParam( result, 0, NtUserReplyMessage );
}

264
dlls/win32u/message.c
View File

@ -33,6 +33,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(msg);
#define MAX_WINPROC_RECURSION 64
#define MAX_PACK_COUNT 4
struct packed_hook_extra_info
{
user_handle_t handle;
DWORD __pad;
ULONGLONG lparam;
};
/* the structures are unpacked on top of the packed ones, so make sure they fit */
C_ASSERT( sizeof(struct packed_CREATESTRUCTW) >= sizeof(CREATESTRUCTW) );
C_ASSERT( sizeof(struct packed_DRAWITEMSTRUCT) >= sizeof(DRAWITEMSTRUCT) );
C_ASSERT( sizeof(struct packed_MEASUREITEMSTRUCT) >= sizeof(MEASUREITEMSTRUCT) );
C_ASSERT( sizeof(struct packed_DELETEITEMSTRUCT) >= sizeof(DELETEITEMSTRUCT) );
C_ASSERT( sizeof(struct packed_COMPAREITEMSTRUCT) >= sizeof(COMPAREITEMSTRUCT) );
C_ASSERT( sizeof(struct packed_WINDOWPOS) >= sizeof(WINDOWPOS) );
C_ASSERT( sizeof(struct packed_COPYDATASTRUCT) >= sizeof(COPYDATASTRUCT) );
C_ASSERT( sizeof(struct packed_HELPINFO) >= sizeof(HELPINFO) );
C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) );
C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) );
C_ASSERT( sizeof(struct packed_MDINEXTMENU) >= sizeof(MDINEXTMENU) );
C_ASSERT( sizeof(struct packed_MDICREATESTRUCTW) >= sizeof(MDICREATESTRUCTW) );
C_ASSERT( sizeof(struct packed_hook_extra_info) >= sizeof(struct hook_extra_info) );
union packed_structs
{
struct packed_CREATESTRUCTW cs;
struct packed_DRAWITEMSTRUCT dis;
struct packed_MEASUREITEMSTRUCT mis;
struct packed_DELETEITEMSTRUCT dls;
struct packed_COMPAREITEMSTRUCT cis;
struct packed_WINDOWPOS wp;
struct packed_COPYDATASTRUCT cds;
struct packed_HELPINFO hi;
struct packed_NCCALCSIZE_PARAMS ncp;
struct packed_MSG msg;
struct packed_MDINEXTMENU mnm;
struct packed_MDICREATESTRUCTW mcs;
struct packed_hook_extra_info hook;
};
/* description of the data fields that need to be packed along with a sent message */
struct packed_message
{
union packed_structs ps;
int count;
const void *data[MAX_PACK_COUNT];
size_t size[MAX_PACK_COUNT];
};
static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UINT msg,
WPARAM wparam, LPARAM lparam, BOOL ansi )
{
@ -99,6 +149,220 @@ static BOOL dispatch_win_proc_params( struct win_proc_params *params, size_t siz
return TRUE;
}
/* add a data field to a packed message */
static inline void push_data( struct packed_message *data, const void *ptr, size_t size )
{
data->data[data->count] = ptr;
data->size[data->count] = size;
data->count++;
}
/* pack a pointer into a 32/64 portable format */
static inline ULONGLONG pack_ptr( const void *ptr )
{
return (ULONG_PTR)ptr;
}
/***********************************************************************
* pack_reply
*
* Pack a reply to a message for sending to another process.
*/
static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam,
LRESULT res, struct packed_message *data )
{
data->count = 0;
switch(message)
{
case WM_NCCREATE:
case WM_CREATE:
{
CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam;
data->ps.cs.lpCreateParams = (ULONG_PTR)cs->lpCreateParams;
data->ps.cs.hInstance = (ULONG_PTR)cs->hInstance;
data->ps.cs.hMenu = wine_server_user_handle( cs->hMenu );
data->ps.cs.hwndParent = wine_server_user_handle( cs->hwndParent );
data->ps.cs.cy = cs->cy;
data->ps.cs.cx = cs->cx;
data->ps.cs.y = cs->y;
data->ps.cs.x = cs->x;
data->ps.cs.style = cs->style;
data->ps.cs.dwExStyle = cs->dwExStyle;
data->ps.cs.lpszName = (ULONG_PTR)cs->lpszName;
data->ps.cs.lpszClass = (ULONG_PTR)cs->lpszClass;
push_data( data, &data->ps.cs, sizeof(data->ps.cs) );
break;
}
case WM_GETTEXT:
case CB_GETLBTEXT:
case LB_GETTEXT:
push_data( data, (WCHAR *)lparam, (res + 1) * sizeof(WCHAR) );
break;
case WM_GETMINMAXINFO:
push_data( data, (MINMAXINFO *)lparam, sizeof(MINMAXINFO) );
break;
case WM_MEASUREITEM:
{
MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lparam;
data->ps.mis.CtlType = mis->CtlType;
data->ps.mis.CtlID = mis->CtlID;
data->ps.mis.itemID = mis->itemID;
data->ps.mis.itemWidth = mis->itemWidth;
data->ps.mis.itemHeight = mis->itemHeight;
data->ps.mis.itemData = mis->itemData;
push_data( data, &data->ps.mis, sizeof(data->ps.mis) );
break;
}
case WM_WINDOWPOSCHANGING:
case WM_WINDOWPOSCHANGED:
{
WINDOWPOS *wp = (WINDOWPOS *)lparam;
data->ps.wp.hwnd = wine_server_user_handle( wp->hwnd );
data->ps.wp.hwndInsertAfter = wine_server_user_handle( wp->hwndInsertAfter );
data->ps.wp.x = wp->x;
data->ps.wp.y = wp->y;
data->ps.wp.cx = wp->cx;
data->ps.wp.cy = wp->cy;
data->ps.wp.flags = wp->flags;
push_data( data, &data->ps.wp, sizeof(data->ps.wp) );
break;
}
case WM_GETDLGCODE:
if (lparam)
{
MSG *msg = (MSG *)lparam;
data->ps.msg.hwnd = wine_server_user_handle( msg->hwnd );
data->ps.msg.message = msg->message;
data->ps.msg.wParam = msg->wParam;
data->ps.msg.lParam = msg->lParam;
data->ps.msg.time = msg->time;
data->ps.msg.pt = msg->pt;
push_data( data, &data->ps.msg, sizeof(data->ps.msg) );
}
break;
case SBM_GETSCROLLINFO:
push_data( data, (SCROLLINFO *)lparam, sizeof(SCROLLINFO) );
break;
case EM_GETRECT:
case LB_GETITEMRECT:
case CB_GETDROPPEDCONTROLRECT:
case WM_SIZING:
case WM_MOVING:
push_data( data, (RECT *)lparam, sizeof(RECT) );
break;
case EM_GETLINE:
{
WORD *ptr = (WORD *)lparam;
push_data( data, ptr, ptr[-1] * sizeof(WCHAR) );
break;
}
case LB_GETSELITEMS:
push_data( data, (UINT *)lparam, wparam * sizeof(UINT) );
break;
case WM_MDIGETACTIVE:
if (lparam) push_data( data, (BOOL *)lparam, sizeof(BOOL) );
break;
case WM_NCCALCSIZE:
if (!wparam)
push_data( data, (RECT *)lparam, sizeof(RECT) );
else
{
NCCALCSIZE_PARAMS *ncp = (NCCALCSIZE_PARAMS *)lparam;
data->ps.ncp.rgrc[0] = ncp->rgrc[0];
data->ps.ncp.rgrc[1] = ncp->rgrc[1];
data->ps.ncp.rgrc[2] = ncp->rgrc[2];
data->ps.ncp.hwnd = wine_server_user_handle( ncp->lppos->hwnd );
data->ps.ncp.hwndInsertAfter = wine_server_user_handle( ncp->lppos->hwndInsertAfter );
data->ps.ncp.x = ncp->lppos->x;
data->ps.ncp.y = ncp->lppos->y;
data->ps.ncp.cx = ncp->lppos->cx;
data->ps.ncp.cy = ncp->lppos->cy;
data->ps.ncp.flags = ncp->lppos->flags;
push_data( data, &data->ps.ncp, sizeof(data->ps.ncp) );
}
break;
case EM_GETSEL:
case SBM_GETRANGE:
case CB_GETEDITSEL:
if (wparam) push_data( data, (DWORD *)wparam, sizeof(DWORD) );
if (lparam) push_data( data, (DWORD *)lparam, sizeof(DWORD) );
break;
case WM_NEXTMENU:
{
MDINEXTMENU *mnm = (MDINEXTMENU *)lparam;
data->ps.mnm.hmenuIn = wine_server_user_handle( mnm->hmenuIn );
data->ps.mnm.hmenuNext = wine_server_user_handle( mnm->hmenuNext );
data->ps.mnm.hwndNext = wine_server_user_handle( mnm->hwndNext );
push_data( data, &data->ps.mnm, sizeof(data->ps.mnm) );
break;
}
case WM_MDICREATE:
{
MDICREATESTRUCTW *mcs = (MDICREATESTRUCTW *)lparam;
data->ps.mcs.szClass = pack_ptr( mcs->szClass );
data->ps.mcs.szTitle = pack_ptr( mcs->szTitle );
data->ps.mcs.hOwner = pack_ptr( mcs->hOwner );
data->ps.mcs.x = mcs->x;
data->ps.mcs.y = mcs->y;
data->ps.mcs.cx = mcs->cx;
data->ps.mcs.cy = mcs->cy;
data->ps.mcs.style = mcs->style;
data->ps.mcs.lParam = mcs->lParam;
push_data( data, &data->ps.mcs, sizeof(data->ps.mcs) );
break;
}
case WM_ASKCBFORMATNAME:
push_data( data, (WCHAR *)lparam, (lstrlenW((WCHAR *)lparam) + 1) * sizeof(WCHAR) );
break;
}
}
/***********************************************************************
* reply_message
*
* Send a reply to a sent message.
*/
static void reply_message( struct received_message_info *info, LRESULT result, MSG *msg )
{
struct packed_message data;
int i, replied = info->flags & ISMEX_REPLIED;
if (info->flags & ISMEX_NOTIFY) return; /* notify messages don't get replies */
if (!msg && replied) return; /* replied already */
memset( &data, 0, sizeof(data) );
info->flags |= ISMEX_REPLIED;
if (info->type == MSG_OTHER_PROCESS && !replied)
{
pack_reply( msg->hwnd, msg->message, msg->wParam, msg->lParam, result, &data );
}
SERVER_START_REQ( reply_message )
{
req->result = result;
req->remove = msg != NULL;
for (i = 0; i < data.count; i++) wine_server_add_data( req, data.data[i], data.size[i] );
wine_server_call( req );
}
SERVER_END_REQ;
}
/***********************************************************************
* reply_message_result
*
* Send a reply to a sent message and update thread receive info.
*/
BOOL reply_message_result( LRESULT result, MSG *msg )
{
struct received_message_info *info = get_user_thread_info()->receive_info;
if (!info) return FALSE;
reply_message( info, result, msg );
if (msg) get_user_thread_info()->receive_info = info->prev;
return TRUE;
}
/***********************************************************************
* handle_internal_message
*

9
dlls/win32u/ntuser_private.h
View File

@ -256,6 +256,15 @@ typedef struct tagWINDOWPROC
#define SPY_RESULT_OK 0x0001
#define SPY_RESULT_DEFWND 0x0002
/* info about the message currently being received by the current thread */
struct received_message_info
{
UINT type;
MSG msg;
UINT flags; /* InSendMessageEx return flags */
struct received_message_info *prev;
};
extern const char *debugstr_msg_name( UINT msg, HWND hwnd ) DECLSPEC_HIDDEN;
extern const char *debugstr_vkey_name( WPARAM wParam ) DECLSPEC_HIDDEN;
extern void spy_enter_message( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;

2
dlls/win32u/sysparams.c
View File

@ -4736,6 +4736,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code
return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) );
case NtUserMonitorFromRect:
return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() ));
case NtUserReplyMessage:
return reply_message_result( arg1, (MSG *)arg2 );
case NtUserSetIconParam:
return set_icon_param( UlongToHandle(arg1), arg2 );
case NtUserUnhookWindowsHook:

1
dlls/win32u/win32u_private.h
View File

@ -344,6 +344,7 @@ extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN;
extern LRESULT dispatch_message( const MSG *msg, BOOL ansi ) DECLSPEC_HIDDEN;
extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN;
extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN;
extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
/* sysparams.c */

153
include/ntuser.h
View File

@ -167,6 +167,7 @@ enum
NtUserGetSystemMetricsForDpi,
NtUserMirrorRgn,
NtUserMonitorFromRect,
NtUserReplyMessage,
NtUserSetIconParam,
NtUserUnhookWindowsHook,
/* temporary exports */
@ -310,6 +311,158 @@ enum wine_internal_message
WM_WINE_LAST_DRIVER_MSG = 0x80001fff
};
/* the various structures that can be sent in messages, in platform-independent layout */
struct packed_CREATESTRUCTW
{
ULONGLONG lpCreateParams;
ULONGLONG hInstance;
UINT hMenu;
DWORD __pad1;
UINT hwndParent;
DWORD __pad2;
INT cy;
INT cx;
INT y;
INT x;
LONG style;
ULONGLONG lpszName;
ULONGLONG lpszClass;
DWORD dwExStyle;
DWORD __pad3;
};
struct packed_DRAWITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
UINT itemAction;
UINT itemState;
UINT hwndItem;
DWORD __pad1;
UINT hDC;
DWORD __pad2;
RECT rcItem;
ULONGLONG itemData;
};
struct packed_MEASUREITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
UINT itemWidth;
UINT itemHeight;
ULONGLONG itemData;
};
struct packed_DELETEITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT itemID;
UINT hwndItem;
DWORD __pad;
ULONGLONG itemData;
};
struct packed_COMPAREITEMSTRUCT
{
UINT CtlType;
UINT CtlID;
UINT hwndItem;
DWORD __pad1;
UINT itemID1;
ULONGLONG itemData1;
UINT itemID2;
ULONGLONG itemData2;
DWORD dwLocaleId;
DWORD __pad2;
};
struct packed_WINDOWPOS
{
UINT hwnd;
DWORD __pad1;
UINT hwndInsertAfter;
DWORD __pad2;
INT x;
INT y;
INT cx;
INT cy;
UINT flags;
DWORD __pad3;
};
struct packed_COPYDATASTRUCT
{
ULONGLONG dwData;
DWORD cbData;
ULONGLONG lpData;
};
struct packed_HELPINFO
{
UINT cbSize;
INT iContextType;
INT iCtrlId;
UINT hItemHandle;
DWORD __pad;
ULONGLONG dwContextId;
POINT MousePos;
};
struct packed_NCCALCSIZE_PARAMS
{
RECT rgrc[3];
ULONGLONG __pad1;
UINT hwnd;
DWORD __pad2;
UINT hwndInsertAfter;
DWORD __pad3;
INT x;
INT y;
INT cx;
INT cy;
UINT flags;
DWORD __pad4;
};
struct packed_MSG
{
UINT hwnd;
DWORD __pad1;
UINT message;
ULONGLONG wParam;
ULONGLONG lParam;
DWORD time;
POINT pt;
DWORD __pad2;
};
struct packed_MDINEXTMENU
{
UINT hmenuIn;
DWORD __pad1;
UINT hmenuNext;
DWORD __pad2;
UINT hwndNext;
DWORD __pad3;
};
struct packed_MDICREATESTRUCTW
{
ULONGLONG szClass;
ULONGLONG szTitle;
ULONGLONG hOwner;
INT x;
INT y;
INT cx;
INT cy;
DWORD style;
ULONGLONG lParam;
};
HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags );
BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd );