ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP] Fix handling of the ESCAPE key.

Browse Source 
Its AsciiChar is not zero in Console-compatible code.
This commit is contained in:
Hermès Bélusca-Maïto
2021-01-03 00:27:50 +01:00
parent 16532170de
commit 8b94515bd3
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/setup/usetup/usetup.c
+12 -15
View File
@@ -948,8 +948,7 @@ RepairIntroPage(PINPUT_RECORD Ir)
{ {
return RECOVERY_PAGE; return RECOVERY_PAGE;
} }
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
(Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */
{ {
return WELCOME_PAGE; return WELCOME_PAGE;
} }
@@ -1051,16 +1050,16 @@ UpgradeRepairPage(PINPUT_RECORD Ir)
RedrawGenericList(&ListUi); RedrawGenericList(&ListUi);
break; break;
} }
case VK_ESCAPE: /* ESC */ }
{ }
RestoreGenericListUiState(&ListUi); else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
// return nextPage; // prevPage; {
RestoreGenericListUiState(&ListUi);
// return nextPage; // prevPage;
// return INSTALL_INTRO_PAGE; // return INSTALL_INTRO_PAGE;
return DEVICE_SETTINGS_PAGE; return DEVICE_SETTINGS_PAGE;
// return SCSI_CONTROLLER_PAGE; // return SCSI_CONTROLLER_PAGE;
}
}
} }
else else
{ {
@@ -1411,8 +1410,7 @@ HandleGenericList(PGENERIC_LIST_UI ListUi,
else else
RedrawGenericList(ListUi); RedrawGenericList(ListUi);
} }
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
(Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */
{ {
RestoreGenericListUiState(ListUi); RestoreGenericListUiState(ListUi);
return nextPage; // Use some "prevPage;" instead? return nextPage; // Use some "prevPage;" instead?
@@ -3279,8 +3277,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
break; break;
} }
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */
(Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */
{ {
/* Reset the formatter machine state */ /* Reset the formatter machine state */
TempPartition = NULL; TempPartition = NULL;