From 70e3e99f2e27080c6fab12f3e8f6f71c0261bcef Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Thu, 19 Apr 2018 18:41:25 +0800
Subject: [PATCH] Nt32Pkg/NtGopInput: ReadKeyStrokeEx always return key state

Today's implementation only return key state when there is key.
But when user doesn't press any key, the key state cannot be
returned.

The patch changes the ReadKeyStrokeEx() to always return the
key state even there is no key pressed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
---
 Nt32Pkg/WinNtGopDxe/WinNtGopInput.c | 117 ++++++++++++++++------------
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index 6a0f4b7892..b19dfdc2ec 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -269,6 +269,68 @@ WinNtGopSimpleTextInTimerHandler (
   }
 }
 
+/**
+  Initialize the key state.
+
+  @param  Private               The GOP_PRIVATE_DATA instance.
+  @param  KeyState              A pointer to receive the key state information.
+**/
+VOID
+InitializeKeyState (
+  IN  GOP_PRIVATE_DATA    *Private,
+  IN  EFI_KEY_STATE       *KeyState
+  )
+{
+  KeyState->KeyShiftState  = EFI_SHIFT_STATE_VALID;
+  KeyState->KeyToggleState = EFI_TOGGLE_STATE_VALID;
+
+  //
+  // Record Key shift state and toggle state
+  //
+  if (Private->LeftCtrl) {
+    KeyState->KeyShiftState  |= EFI_LEFT_CONTROL_PRESSED;
+  }
+  if (Private->RightCtrl) {
+    KeyState->KeyShiftState  |= EFI_RIGHT_CONTROL_PRESSED;
+  }
+  if (Private->LeftAlt) {
+    KeyState->KeyShiftState  |= EFI_LEFT_ALT_PRESSED;
+  }
+  if (Private->RightAlt) {
+    KeyState->KeyShiftState  |= EFI_RIGHT_ALT_PRESSED;
+  }
+  if (Private->LeftShift) {
+    KeyState->KeyShiftState  |= EFI_LEFT_SHIFT_PRESSED;
+  }
+  if (Private->RightShift) {
+    KeyState->KeyShiftState  |= EFI_RIGHT_SHIFT_PRESSED;
+  }
+  if (Private->LeftLogo) {
+    KeyState->KeyShiftState  |= EFI_LEFT_LOGO_PRESSED;
+  }
+  if (Private->RightLogo) {
+    KeyState->KeyShiftState  |= EFI_RIGHT_LOGO_PRESSED;
+  }
+  if (Private->Menu) {
+    KeyState->KeyShiftState  |= EFI_MENU_KEY_PRESSED;
+  }
+  if (Private->SysReq) {
+    KeyState->KeyShiftState  |= EFI_SYS_REQ_PRESSED;
+  }
+  if (Private->CapsLock) {
+    KeyState->KeyToggleState |= EFI_CAPS_LOCK_ACTIVE;
+  }
+  if (Private->NumLock) {
+    KeyState->KeyToggleState |= EFI_NUM_LOCK_ACTIVE;
+  }
+  if (Private->ScrollLock) {
+    KeyState->KeyToggleState |= EFI_SCROLL_LOCK_ACTIVE;
+  }
+  if (Private->IsPartialKeySupport) {
+    KeyState->KeyToggleState |= EFI_KEY_STATE_EXPOSED;
+  }
+}
+
 /**
   TODO: Add function description
 
@@ -288,55 +350,7 @@ GopPrivateAddKey (
   EFI_KEY_DATA            KeyData;
 
   KeyData.Key = Key;
-
-  KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID;
-  KeyData.KeyState.KeyToggleState = EFI_TOGGLE_STATE_VALID;
-
-  //
-  // Record Key shift state and toggle state
-  //
-  if (Private->LeftCtrl) {
-    KeyData.KeyState.KeyShiftState  |= EFI_LEFT_CONTROL_PRESSED;
-  }
-  if (Private->RightCtrl) {
-    KeyData.KeyState.KeyShiftState  |= EFI_RIGHT_CONTROL_PRESSED;
-  }
-  if (Private->LeftAlt) {
-    KeyData.KeyState.KeyShiftState  |= EFI_LEFT_ALT_PRESSED;
-  }
-  if (Private->RightAlt) {
-    KeyData.KeyState.KeyShiftState  |= EFI_RIGHT_ALT_PRESSED;
-  }
-  if (Private->LeftShift) {
-    KeyData.KeyState.KeyShiftState  |= EFI_LEFT_SHIFT_PRESSED;
-  }
-  if (Private->RightShift) {
-    KeyData.KeyState.KeyShiftState  |= EFI_RIGHT_SHIFT_PRESSED;
-  }
-  if (Private->LeftLogo) {
-    KeyData.KeyState.KeyShiftState  |= EFI_LEFT_LOGO_PRESSED;
-  }
-  if (Private->RightLogo) {
-    KeyData.KeyState.KeyShiftState  |= EFI_RIGHT_LOGO_PRESSED;
-  }
-  if (Private->Menu) {
-    KeyData.KeyState.KeyShiftState  |= EFI_MENU_KEY_PRESSED;
-  }
-  if (Private->SysReq) {
-    KeyData.KeyState.KeyShiftState  |= EFI_SYS_REQ_PRESSED;
-  }
-  if (Private->CapsLock) {
-    KeyData.KeyState.KeyToggleState |= EFI_CAPS_LOCK_ACTIVE;
-  }
-  if (Private->NumLock) {
-    KeyData.KeyState.KeyToggleState |= EFI_NUM_LOCK_ACTIVE;
-  }
-  if (Private->ScrollLock) {
-    KeyData.KeyState.KeyToggleState |= EFI_SCROLL_LOCK_ACTIVE;
-  }
-  if (Private->IsPartialKeySupport) {
-    KeyData.KeyState.KeyToggleState |= EFI_KEY_STATE_EXPOSED;
-  }
+  InitializeKeyState (Private, &KeyData.KeyState);
 
   //
   // Convert Ctrl+[1-26] to Ctrl+[A-Z]
@@ -503,6 +517,9 @@ GopPrivateReadKeyStrokeWorker (
   //
   WinNtGopSimpleTextInTimerHandler (NULL, Private);
 
+  ZeroMem (&KeyData->Key, sizeof (KeyData->Key));
+  InitializeKeyState (Private, &KeyData->KeyState);
+
   Status  = GopPrivateCheckQ (&Private->QueueForRead);
   if (!EFI_ERROR (Status)) {
     //