Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 17:43:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] Don't popup about deprecated features in auto-boot scenario (#6803)

Browse source 
Addendum to commit 5f3554a40.
This commit is contained in:
Hermès Bélusca-Maïto 2024-04-25 13:42:21 +02:00
parent 7bee32d237
commit 565a4b359a
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
boot/freeldr/freeldr/bootmgr.c
View file

@ -84,6 +84,10 @@ WarnDeprecated(
va_list ap; va_list ap;
CHAR msgString[300]; CHAR msgString[300];
/* If the user didn't cancel the timeout, don't display the warning */
if (BootMgrInfo.TimeOut >= 0)
return;
va_start(ap, MsgFmt); va_start(ap, MsgFmt);
RtlStringCbVPrintfA(msgString, sizeof(msgString), RtlStringCbVPrintfA(msgString, sizeof(msgString),
MsgFmt, ap); MsgFmt, ap);
@ -328,6 +332,9 @@ MainBootMenuKeyPressFilter(
IN ULONG SelectedMenuItem, IN ULONG SelectedMenuItem,
IN PVOID Context OPTIONAL) IN PVOID Context OPTIONAL)
{ {
/* Any key-press cancels the global timeout */
BootMgrInfo.TimeOut = -1;
switch (KeyPress) switch (KeyPress)
{ {
case KEY_F8: case KEY_F8:
@ -445,11 +452,11 @@ VOID RunLoader(VOID)
goto Reboot; goto Reboot;
} }
BootMgrInfo.TimeOut = -1;
/* Load the chosen operating system */ /* Load the chosen operating system */
LoadOperatingSystem(&OperatingSystemList[SelectedOperatingSystem]); LoadOperatingSystem(&OperatingSystemList[SelectedOperatingSystem]);
BootMgrInfo.TimeOut = -1;
/* If we get there, the OS loader failed. As it may have /* If we get there, the OS loader failed. As it may have
* messed up the display, re-initialize the UI. */ * messed up the display, re-initialize the UI. */
#ifndef _M_ARM #ifndef _M_ARM