mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 19:26:32 +00:00
Merge from amd64 branch:
45124 [USER32] NtUserTranslateMessage: HKL -> UINT in 2nd parameter 45126 (tkreuzer) [WIN32k] Fix build 45127 (sserapion) [WIN32k] Fix build svn path=/trunk/; revision=46436
This commit is contained in:
@@ -2977,7 +2977,7 @@ BOOL
|
||||
NTAPI
|
||||
NtUserTranslateMessage(
|
||||
LPMSG lpMsg,
|
||||
HKL dwhkl );
|
||||
UINT flags );
|
||||
|
||||
BOOL
|
||||
NTAPI
|
||||
|
||||
@@ -187,7 +187,7 @@ co_IntSendMessageTimeout(HWND hWnd,
|
||||
LRESULT FASTCALL
|
||||
IntDispatchMessage(MSG* Msg);
|
||||
BOOL FASTCALL
|
||||
IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl);
|
||||
IntTranslateKbdMessage(LPMSG lpMsg, UINT flags);
|
||||
|
||||
VOID FASTCALL
|
||||
co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
@@ -419,7 +419,7 @@ CLEANUP:
|
||||
|
||||
BOOL FASTCALL
|
||||
IntTranslateKbdMessage(LPMSG lpMsg,
|
||||
HKL dwhkl)
|
||||
UINT flags)
|
||||
{
|
||||
PTHREADINFO pti;
|
||||
static INT dead_char = 0;
|
||||
|
||||
@@ -2285,7 +2285,7 @@ NtUserDispatchMessage(PMSG UnsafeMsgInfo)
|
||||
|
||||
BOOL APIENTRY
|
||||
NtUserTranslateMessage(LPMSG lpMsg,
|
||||
HKL dwhkl)
|
||||
UINT flags)
|
||||
{
|
||||
NTSTATUS Status;
|
||||
MSG SafeMsg;
|
||||
@@ -2301,7 +2301,7 @@ NtUserTranslateMessage(LPMSG lpMsg,
|
||||
RETURN( FALSE);
|
||||
}
|
||||
|
||||
RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl));
|
||||
RETURN( IntTranslateKbdMessage(&SafeMsg, flags));
|
||||
|
||||
CLEANUP:
|
||||
DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_);
|
||||
|
||||
Reference in New Issue
Block a user