NULL,
"Start ReactOS normally",
+#ifdef HAS_OPTION_MENU_EDIT_CMDLINE
+ "Edit Boot Command Line (F10)",
+#endif
#ifdef HAS_OPTION_MENU_CUSTOM_BOOT
"Custom Boot",
#endif
/* FUNCTIONS ******************************************************************/
-VOID DoOptionsMenu(VOID)
+VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem)
{
ULONG SelectedMenuItem;
CHAR DebugChannelString[100];
- if (!UiDisplayMenu("Select an option:", "",
+ if (!UiDisplayMenu("Select an option:", NULL,
TRUE,
OptionsMenuList,
sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]),
-1,
&SelectedMenuItem,
TRUE,
- NULL))
+ NULL, NULL))
{
/* The user pressed ESC */
return;
VgaMode = FALSE;
DebuggingMode = FALSE;
break;
+#ifdef HAS_OPTION_MENU_EDIT_CMDLINE
+ case 12: // Edit command line
+ EditOperatingSystemEntry(OperatingSystem);
+ break;
+#endif
#ifdef HAS_OPTION_MENU_CUSTOM_BOOT
- case 12: // Custom Boot
+ case 13: // Custom Boot
OptionMenuCustomBoot();
break;
#endif
#ifdef HAS_OPTION_MENU_REBOOT
- case 13: // Reboot
+ case 14: // Reboot
OptionMenuReboot();
break;
#endif
switch (BootOptionChoice)
{
case SAFE_MODE:
- strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); // FIXME: NOGUIBOOT should also be specified
+ strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS /NOGUIBOOT");
break;
case SAFE_MODE_WITH_NETWORKING:
- strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); // FIXME: NOGUIBOOT should also be specified
+ strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS /NOGUIBOOT");
break;
case SAFE_MODE_WITH_COMMAND_PROMPT:
- strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); // FIXME: NOGUIBOOT should also be specified
+ strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS /NOGUIBOOT");
break;
case LAST_KNOWN_GOOD_CONFIGURATION: