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

win32u: Use syscall interface for NtUserGetMessage.

parent 97f10736
...@@ -1180,7 +1180,6 @@ static struct unix_funcs unix_funcs = ...@@ -1180,7 +1180,6 @@ static struct unix_funcs unix_funcs =
NtUserGetKeyNameText, NtUserGetKeyNameText,
NtUserGetKeyboardLayoutList, NtUserGetKeyboardLayoutList,
NtUserGetMenuBarInfo, NtUserGetMenuBarInfo,
NtUserGetMessage,
NtUserGetPriorityClipboardFormat, NtUserGetPriorityClipboardFormat,
NtUserGetQueueStatus, NtUserGetQueueStatus,
NtUserGetScrollBarInfo, NtUserGetScrollBarInfo,
......
...@@ -143,6 +143,7 @@ static void * const syscalls[] = ...@@ -143,6 +143,7 @@ static void * const syscalls[] =
NtUserGetKeyboardState, NtUserGetKeyboardState,
NtUserGetLayeredWindowAttributes, NtUserGetLayeredWindowAttributes,
NtUserGetMenuItemRect, NtUserGetMenuItemRect,
NtUserGetMessage,
NtUserGetMouseMovePointsEx, NtUserGetMouseMovePointsEx,
NtUserGetObjectInformation, NtUserGetObjectInformation,
NtUserGetOpenClipboardWindow, NtUserGetOpenClipboardWindow,
......
...@@ -955,7 +955,7 @@ ...@@ -955,7 +955,7 @@
@ stdcall NtUserGetMenuBarInfo(long long long ptr) @ stdcall NtUserGetMenuBarInfo(long long long ptr)
@ stub NtUserGetMenuIndex @ stub NtUserGetMenuIndex
@ stdcall -syscall NtUserGetMenuItemRect(long long long ptr) @ stdcall -syscall NtUserGetMenuItemRect(long long long ptr)
@ stdcall NtUserGetMessage(ptr long long long) @ stdcall -syscall NtUserGetMessage(ptr long long long)
@ stdcall -syscall NtUserGetMouseMovePointsEx(long ptr ptr long long) @ stdcall -syscall NtUserGetMouseMovePointsEx(long ptr ptr long long)
@ stdcall -syscall NtUserGetObjectInformation(long long long long ptr) @ stdcall -syscall NtUserGetObjectInformation(long long long long ptr)
@ stub NtUserGetOemBitmapSize @ stub NtUserGetOemBitmapSize
......
...@@ -244,7 +244,6 @@ struct unix_funcs ...@@ -244,7 +244,6 @@ struct unix_funcs
INT (WINAPI *pNtUserGetKeyNameText)( LONG lparam, WCHAR *buffer, INT size ); INT (WINAPI *pNtUserGetKeyNameText)( LONG lparam, WCHAR *buffer, INT size );
UINT (WINAPI *pNtUserGetKeyboardLayoutList)( INT size, HKL *layouts ); UINT (WINAPI *pNtUserGetKeyboardLayoutList)( INT size, HKL *layouts );
BOOL (WINAPI *pNtUserGetMenuBarInfo)( HWND hwnd, LONG id, LONG item, MENUBARINFO *info ); BOOL (WINAPI *pNtUserGetMenuBarInfo)( HWND hwnd, LONG id, LONG item, MENUBARINFO *info );
BOOL (WINAPI *pNtUserGetMessage)( MSG *msg, HWND hwnd, UINT first, UINT last );
INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count );
DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags ); DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags );
BOOL (WINAPI *pNtUserGetScrollBarInfo)( HWND hwnd, LONG id, SCROLLBARINFO *info ); BOOL (WINAPI *pNtUserGetScrollBarInfo)( HWND hwnd, LONG id, SCROLLBARINFO *info );
......
...@@ -1000,12 +1000,6 @@ BOOL WINAPI NtUserGetMenuBarInfo( HWND hwnd, LONG id, LONG item, MENUBARINFO *in ...@@ -1000,12 +1000,6 @@ BOOL WINAPI NtUserGetMenuBarInfo( HWND hwnd, LONG id, LONG item, MENUBARINFO *in
return unix_funcs->pNtUserGetMenuBarInfo( hwnd, id, item, info ); return unix_funcs->pNtUserGetMenuBarInfo( hwnd, id, item, info );
} }
BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last )
{
if (!unix_funcs) return FALSE;
return unix_funcs->pNtUserGetMessage( msg, hwnd, first, last );
}
HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ) HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert )
{ {
if (!unix_funcs) return 0; if (!unix_funcs) return 0;
......
...@@ -130,6 +130,7 @@ ...@@ -130,6 +130,7 @@
SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \
SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \
SYSCALL_ENTRY( NtUserGetMenuItemRect ) \ SYSCALL_ENTRY( NtUserGetMenuItemRect ) \
SYSCALL_ENTRY( NtUserGetMessage ) \
SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \
SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \
SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \
......
...@@ -519,6 +519,19 @@ NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) ...@@ -519,6 +519,19 @@ NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args )
return NtUserGetMenuItemRect( hwnd, handle, item, rect ); return NtUserGetMenuItemRect( hwnd, handle, item, rect );
} }
NTSTATUS WINAPI wow64_NtUserGetMessage( UINT *args )
{
MSG32 *msg32 = get_ptr( &args );
HWND hwnd = get_handle( &args );
UINT first = get_ulong( &args );
UINT last = get_ulong( &args );
MSG msg;
if (!NtUserGetMessage( &msg, hwnd, first, last )) return FALSE;
msg_64to32( &msg, msg32 );
return TRUE;
}
NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args )
{ {
UINT size = get_ulong( &args ); UINT size = get_ulong( &args );
......
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