From 68182b2a52858eb0011df1467444e66e0b056f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Mon, 4 Jan 2021 16:11:40 +0100
Subject: [PATCH] [USETUP] Partial revert of 8b94515b for the ESCAPE key in the
 UpgradeRepairPage() screen.

The AsciiChar of the ESCAPE key should be 0x1B instead of zero; however
this is not the case due to the hacked keyboard layout currently being
used. This will be fixed later ...
---
 base/setup/usetup/usetup.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index ea09d5dd9af..898b5790f65 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -1050,8 +1050,26 @@ UpgradeRepairPage(PINPUT_RECORD Ir)
                     RedrawGenericList(&ListUi);
                 break;
             }
+#if 1
+/* TODO: Temporarily kept until correct keyboard layout is in place.
+ * (Actual AsciiChar of ESCAPE should be 0x1B instead of 0.)
+ * Addendum to commit 8b94515b.
+ */
+            case VK_ESCAPE: /* ESC */
+            {
+                RestoreGenericListUiState(&ListUi);
+                // return nextPage;    // prevPage;
+
+                // return INSTALL_INTRO_PAGE;
+                return DEVICE_SETTINGS_PAGE;
+                // return SCSI_CONTROLLER_PAGE;
+            }
+
+#endif
             }
         }
+#if 0
+/* TODO: Restore this once correct keyboard layout is in place. */
         else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
         {
             RestoreGenericListUiState(&ListUi);
@@ -1061,6 +1079,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir)
             return DEVICE_SETTINGS_PAGE;
             // return SCSI_CONTROLLER_PAGE;
         }
+#endif
         else
         {
             // switch (toupper(Ir->Event.KeyEvent.uChar.AsciiChar))