Author: ekohl
Date: Thu Jul 21 20:53:43 2016
New Revision: 71976
URL: http://svn.reactos.org/svn/reactos?rev=71976&view=rev
Log:
[USETUP]
Keyboard Modifier LEDs not working in usetup.
Patch by Carlo Bramini.
CORE-3368 #resolve #comment Thanks a lot!
Modified:
trunk/reactos/base/setup/usetup/native/utils/console.c
trunk/reactos/base/setup/usetup/native/utils/keytrans.c
trunk/reactos/base/setup/usetup/native/utils/keytrans.h
Modified: trunk/reactos/base/setup/usetup/native/utils/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/utils/console.c?rev=71976&r1=71975&r2=71976&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1]
(original)
+++ trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1]
Thu Jul 21 20:53:43 2016
@@ -218,7 +218,7 @@
return FALSE;
lpBuffer->EventType = KEY_EVENT;
- Status = IntTranslateKey(&InputData, &lpBuffer->Event.KeyEvent);
+ Status = IntTranslateKey(hConsoleInput, &InputData,
&lpBuffer->Event.KeyEvent);
if (!NT_SUCCESS(Status))
return FALSE;
Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/utils/keytrans.c?rev=71976&r1=71975&r2=71976&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1]
(original)
+++ trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1]
Thu Jul 21 20:53:43 2016
@@ -117,13 +117,6 @@
0, 0, 0, 0
};
-/*
- * Note how the keyboard lights are not handled, so while NUMLOCK_ON can
- * be on, the light will never be. If this starts to be a problem it can be
- * fixed, but it's too much work for too little gain to do now.
- * Look in win32k/ntuser/input.c for an example.
- */
-
static WORD KeyTableNumlock[] = {
/* 0x00 */
0, 0, 0, 0,
@@ -255,12 +248,15 @@
static void
-IntUpdateControlKeyState(LPDWORD State, PKEYBOARD_INPUT_DATA InputData)
+IntUpdateControlKeyState(HANDLE hConsoleInput, LPDWORD State,
PKEYBOARD_INPUT_DATA InputData)
{
DWORD Value = 0;
+ DWORD oldState, newState;
if (InputData->Flags & KEY_E1) /* Only the pause key has E1 */
return;
+
+ oldState = newState = *State;
if (!(InputData->Flags & KEY_E0)) {
switch (InputData->MakeCode) {
@@ -278,22 +274,19 @@
break;
case 0x3A:
- Value = CAPSLOCK_ON;
if (!(InputData->Flags & KEY_BREAK))
- *State ^= Value;
- return;
+ newState ^= CAPSLOCK_ON;
+ break;
case 0x45:
- Value = NUMLOCK_ON;
if (!(InputData->Flags & KEY_BREAK))
- *State ^= Value;
- return;
+ newState ^= NUMLOCK_ON;
+ break;
case 0x46:
- Value = SCROLLLOCK_ON;
if (!(InputData->Flags & KEY_BREAK))
- *State ^= Value;
- return;
+ newState ^= SCROLLLOCK_ON;
+ break;
default:
return;
@@ -313,10 +306,52 @@
}
}
+ /* Check if the state of the indicators has been changed */
+ if ((oldState ^ newState) & (NUMLOCK_ON | CAPSLOCK_ON | SCROLLLOCK_ON))
+ {
+ IO_STATUS_BLOCK IoStatusBlock;
+ NTSTATUS Status;
+ KEYBOARD_INDICATOR_PARAMETERS kip;
+
+ kip.LedFlags = 0;
+ kip.UnitId = 0;
+
+ if ((newState & NUMLOCK_ON))
+ kip.LedFlags |= KEYBOARD_NUM_LOCK_ON;
+
+ if ((newState & CAPSLOCK_ON))
+ kip.LedFlags |= KEYBOARD_CAPS_LOCK_ON;
+
+ if ((newState & SCROLLLOCK_ON))
+ kip.LedFlags |= KEYBOARD_SCROLL_LOCK_ON;
+
+ /* Update the state of the leds on primary keyboard */
+ DPRINT("NtDeviceIoControlFile dwLeds=%x\n", kip.LedFlags);
+
+ Status = NtDeviceIoControlFile(
+ hConsoleInput,
+ NULL,
+ NULL,
+ NULL,
+ &IoStatusBlock,
+ IOCTL_KEYBOARD_SET_INDICATORS,
+ &kip,
+ sizeof(kip),
+ NULL,
+ 0);
+
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("NtDeviceIoControlFile(IOCTL_KEYBOARD_SET_INDICATORS)
failed (Status %lx)\n", Status);
+ }
+ } else
+ /* Normal press/release state handling */
if (InputData->Flags & KEY_BREAK)
- *State &= ~Value;
+ newState &= ~Value;
else
- *State |= Value;
+ newState |= Value;
+
+ *State = newState;
}
static DWORD
@@ -379,7 +414,7 @@
* in the app so I'll just fill the others with somewhat sane values
*/
NTSTATUS
-IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event)
+IntTranslateKey(HANDLE hConsoleInput, PKEYBOARD_INPUT_DATA InputData,
KEY_EVENT_RECORD *Event)
{
static DWORD dwControlKeyState;
@@ -395,7 +430,7 @@
DPRINT("Translating: %x\n", InputData->MakeCode);
- IntUpdateControlKeyState(&dwControlKeyState, InputData);
+ IntUpdateControlKeyState(hConsoleInput, &dwControlKeyState, InputData);
Event->dwControlKeyState = dwControlKeyState;
if (InputData->Flags & KEY_E0)
Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/utils/keytrans.h?rev=71976&r1=71975&r2=71976&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/utils/keytrans.h [iso-8859-1]
(original)
+++ trunk/reactos/base/setup/usetup/native/utils/keytrans.h [iso-8859-1]
Thu Jul 21 20:53:43 2016
@@ -28,6 +28,6 @@
#include <ntddkbd.h>
NTSTATUS
-IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event);
+IntTranslateKey(HANDLE hConsoleInput, PKEYBOARD_INPUT_DATA InputData,
KEY_EVENT_RECORD *Event);
/* EOF */
