Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k]

Browse source 
- GetKeyboardState and SetKeyboardState should use the thread key state and not the global key state

svn path=/trunk/; revision=51389
This commit is contained in:
Giannis Adamopoulos 2011-04-18 09:13:31 +00:00
parent e564c595f2
commit f53d1fd407
2 changed files with 62 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -486,55 +486,6 @@ IntTranslateKbdMessage(LPMSG lpMsg,
return Result; return Result;
} }
DWORD
APIENTRY
NtUserGetKeyboardState(
LPBYTE lpKeyState)
{
BOOL Result = TRUE;
DECLARE_RETURN(DWORD);
DPRINT("Enter NtUserGetKeyboardState\n");
UserEnterShared();
if (lpKeyState)
{
if(!NT_SUCCESS(MmCopyToCaller(lpKeyState, gQueueKeyStateTable, 256)))
Result = FALSE;
}
RETURN(Result);
CLEANUP:
DPRINT("Leave NtUserGetKeyboardState, ret=%i\n",_ret_);
UserLeave();
END_CLEANUP;
}
BOOL
APIENTRY
NtUserSetKeyboardState(LPBYTE lpKeyState)
{
BOOL Result = TRUE;
DECLARE_RETURN(DWORD);
DPRINT("Enter NtUserSetKeyboardState\n");
UserEnterExclusive();
if (lpKeyState)
{
if(! NT_SUCCESS(MmCopyFromCaller(gQueueKeyStateTable, lpKeyState, 256)))
Result = FALSE;
}
RETURN(Result);
CLEANUP:
DPRINT("Leave NtUserSetKeyboardState, ret=%i\n",_ret_);
UserLeave();
END_CLEANUP;
}
static UINT VkToScan( UINT Code, BOOL ExtCode, PKBDTABLES pkKT ) static UINT VkToScan( UINT Code, BOOL ExtCode, PKBDTABLES pkKT )
{ {
int i; int i;

62
reactos/subsystems/win32/win32k/ntuser/msgqueue.c
View file

@ -1896,4 +1896,66 @@ NtUserGetKeyState(INT key)
return Ret; return Ret;
} }
DWORD
APIENTRY
NtUserGetKeyboardState(LPBYTE lpKeyState)
{
DWORD ret = TRUE;
PTHREADINFO pti;
PUSER_MESSAGE_QUEUE MessageQueue;
UserEnterShared();
pti = PsGetCurrentThreadWin32Thread();
MessageQueue = pti->MessageQueue;
_SEH2_TRY
{
ProbeForWrite(lpKeyState,sizeof(MessageQueue->KeyState) ,1);
RtlCopyMemory(lpKeyState,MessageQueue->KeyState,sizeof(MessageQueue->KeyState));
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
SetLastNtError(_SEH2_GetExceptionCode());
ret = FALSE;
}
_SEH2_END;
UserLeave();
return ret;
}
BOOL
APIENTRY
NtUserSetKeyboardState(LPBYTE lpKeyState)
{
DWORD ret = TRUE;
PTHREADINFO pti;
PUSER_MESSAGE_QUEUE MessageQueue;
UserEnterExclusive();
pti = PsGetCurrentThreadWin32Thread();
MessageQueue = pti->MessageQueue;
_SEH2_TRY
{
ProbeForRead(lpKeyState,sizeof(MessageQueue->KeyState) ,1);
RtlCopyMemory(MessageQueue->KeyState,lpKeyState,sizeof(MessageQueue->KeyState));
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
SetLastNtError(_SEH2_GetExceptionCode());
ret = FALSE;
}
_SEH2_END;
UserLeave();
return ret;
}
/* EOF */ /* EOF */