Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from amd64 branch:

Browse source 
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:
Timo Kreuzer 2010-03-25 12:48:03 +00:00
parent fb69e522da
commit a80a2887aa
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/reactos/win32k/ntuser.h
View file

@ -2977,7 +2977,7 @@ BOOL
NTAPI
NtUserTranslateMessage(
LPMSG lpMsg,
HKL dwhkl );
UINT flags );
BOOL
NTAPI

2
reactos/subsystems/win32/win32k/include/msgqueue.h
View file

@ -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);

2
reactos/subsystems/win32/win32k/ntuser/keyboard.c
View file

@ -419,7 +419,7 @@ CLEANUP:
BOOL FASTCALL
IntTranslateKbdMessage(LPMSG lpMsg,
HKL dwhkl)
UINT flags)
{
PTHREADINFO pti;
static INT dead_char = 0;

4
reactos/subsystems/win32/win32k/ntuser/message.c
View file

@ -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_);