From 14ce9b898df69fd5b584b7f08829bbcd44e34bbb Mon Sep 17 00:00:00 2001
From: Aleksandar Andrejevic <aandrejevic@reactos.org>
Date: Sun, 5 Apr 2015 18:40:18 +0000
Subject: [PATCH] [NTVDM] Fix the shift key. Improve the BIOS keyboard handler.
 Do not append modifier keys to the buffer. CORE-8231 #resolve #comment Fixed
 in revision r67066.

svn path=/trunk/; revision=67066
---
 .../mvdm/ntvdm/bios/bios32/kbdbios32.c        | 59 ++++++++++++-------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
index e7c4650065b..bfb319b7ef2 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
@@ -232,33 +232,51 @@ static VOID WINAPI BiosKeyboardIrq(LPWORD Stack)
     /* Check if this is a key press or release */
     if (!(ScanCode & (1 << 7)))
     {
-        /* Key press */
-        if (VirtualKey == VK_NUMLOCK ||
-            VirtualKey == VK_CAPITAL ||
-            VirtualKey == VK_SCROLL  ||
-            VirtualKey == VK_INSERT)
-        {
-            /* For toggle keys, toggle the lowest bit in the keyboard map */
-            BiosKeyboardMap[VirtualKey] ^= ~(1 << 0);
-        }
-
-        /* Set the highest bit */
+        /* Key press, set the highest bit */
         BiosKeyboardMap[VirtualKey] |= (1 << 7);
 
-        Character = 0;
-
-        /* If ALT isn't held down, find out which character this is */
-        if (!((BiosKeyboardMap[VK_MENU] | BiosKeyboardMap[VK_RMENU] | BiosKeyboardMap[VK_LMENU]) & (1 << 7)))
+        switch (VirtualKey)
         {
-            if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0)
+            case VK_NUMLOCK:
+            case VK_CAPITAL:
+            case VK_SCROLL:
+            case VK_INSERT:
+            {
+                /* For toggle keys, toggle the lowest bit in the keyboard map */
+                BiosKeyboardMap[VirtualKey] ^= ~(1 << 0);
+                break;
+            }
+
+            case VK_CONTROL:
+            case VK_SHIFT:
+            case VK_LSHIFT:
+            case VK_RSHIFT:
+            case VK_MENU:
+            case VK_LMENU:
+            case VK_RMENU:
+            {
+                /* Modifier keys don't go in the buffer */
+                break;
+            }
+
+            default:
             {
-                /* Not ASCII */
                 Character = 0;
+
+                /* If ALT isn't held down, find out which character this is */
+                if (!(Bda->KeybdShiftFlags & (BDA_KBDFLAG_ALT | BDA_KBDFLAG_LALT | BDA_KBDFLAG_RALT)))
+                {
+                    if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0)
+                    {
+                        /* Not ASCII */
+                        Character = 0;
+                    }
+                }
+
+                /* Push it onto the BIOS keyboard queue */
+                BiosKbdBufferPush(MAKEWORD(Character, ScanCode));
             }
         }
-
-        /* Push it onto the BIOS keyboard queue */
-        BiosKbdBufferPush(MAKEWORD(Character, ScanCode));
     }
     else
     {
@@ -270,6 +288,7 @@ static VOID WINAPI BiosKeyboardIrq(LPWORD Stack)
     Bda->KeybdShiftFlags = 0;
 
     /* Set the appropriate flags based on the state */
+    if (BiosKeyboardMap[VK_SHIFT]    & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT;
     if (BiosKeyboardMap[VK_RSHIFT]   & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RSHIFT;
     if (BiosKeyboardMap[VK_LSHIFT]   & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT;
     if (BiosKeyboardMap[VK_CONTROL]  & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CTRL;