Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NtUser]

Browse source 
- Fix last Win test_keyboard_input. No Focus use Active! Read MSDN WM_SYSKEYDOWN/UP.

svn path=/trunk/; revision=57110
This commit is contained in:
James Tabor 2012-08-19 23:16:39 +00:00
parent 1ea0ebc894
commit 0be33b81df
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/win32ss/user/ntuser/keyboard.c
View file

@ -803,11 +803,20 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d
if (wSimpleVk == VK_SHIFT) /* shift can't be extended */
bExt = FALSE;
/* If we have a focus queue, post a keyboard message */
pFocusQueue = IntGetFocusMessageQueue();
TRACE("ProcessKeyEvent Q 0x%p Active pWnd 0x%p Focus pWnd 0x%p\n",
pFocusQueue,
(pFocusQueue ? pFocusQueue->spwndActive : 0),
(pFocusQueue ? pFocusQueue->spwndFocus : 0));
/* If it is F10 or ALT is down and CTRL is up, it's a system key */
if (wVk == VK_F10 ||
if ( wVk == VK_F10 ||
(wSimpleVk == VK_MENU && bMenuDownRecently) ||
(IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) &&
!IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)))
!IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) ||
// See MSDN WM_SYSKEYDOWN/UP fixes last wine Win test_keyboard_input.
(pFocusQueue && !pFocusQueue->spwndFocus) )
{
bMenuDownRecently = FALSE; // reset
if (bIsDown)
@ -843,24 +852,29 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d
TRACE("Alt-Tab/Esc Pressed wParam %x\n",wVk);
}
/* If we have a focus queue, post a keyboard message */
pFocusQueue = IntGetFocusMessageQueue();
TRACE("ProcessKeyEvent Q 0x%p Focus pWnd 0x%p\n",pFocusQueue, pFocusQueue ? pFocusQueue->spwndFocus : 0);
if (bIsDown && wVk == VK_SNAPSHOT)
{
if (pFocusQueue &&
IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) &&
!IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL))
{
SnapWindow(pFocusQueue->spwndFocus ? UserHMGetHandle(pFocusQueue->spwndFocus) : 0);
// Snap from Active Window, Focus can be null.
SnapWindow(pFocusQueue->spwndActive ? UserHMGetHandle(pFocusQueue->spwndActive) : 0);
}
else
SnapWindow(NULL);
SnapWindow(NULL); // Snap Desktop.
}
else if (pFocusQueue && bPostMsg)
{
PWND Wnd = pFocusQueue->spwndFocus;
if (!Wnd)
{
// Focus can be null so going with Active. WM_SYSKEYXXX last wine Win test_keyboard_input.
Wnd = pFocusQueue->spwndActive;
}
/* Init message */
Msg.hwnd = pFocusQueue->spwndFocus ? UserHMGetHandle(pFocusQueue->spwndFocus) : 0;
Msg.hwnd = UserHMGetHandle(Wnd);
Msg.wParam = wFixedVk & 0xFF; /* Note: It's simplified by msg queue */
Msg.lParam = MAKELPARAM(1, wScanCode);
Msg.time = dwTime;