X-Git-Url: https://code.delx.au/refind/blobdiff_plain/95db688800c527d3c9ee1f692d9125136facc38b..4c9f41e161bd197922912efbcf4cc676077d5c00:/refind/main.c diff --git a/refind/main.c b/refind/main.c index 2b2d78c..ffb22fd 100644 --- a/refind/main.c +++ b/refind/main.c @@ -48,22 +48,38 @@ #include "lib.h" #include "icns.h" #include "menu.h" -#include "refit_call_wrapper.h" -#include "bootsvcs.h" +#include "../include/Handle.h" +#include "../include/refit_call_wrapper.h" +#include "driver_support.h" #include "../include/syslinux_mbr.h" // // variables -#define MACOSX_LOADER_PATH L"\\System\\Library\\CoreServices\\boot.efi" +#define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" #if defined (EFIX64) #define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellx64.efi" +#define DRIVER_DIRS L"drivers,drivers_x64" #elif defined (EFI32) #define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellia32.efi" +#define DRIVER_DIRS L"drivers,drivers_ia32" #else #define SHELL_NAMES L"\\EFI\\tools\\shell.efi" +#define DRIVER_DIRS L"drivers" #endif +// Filename patterns that identify EFI boot loaders. Note that a single case (either L"*.efi" or +// L"*.EFI") is fine for most systems; but Gigabyte's buggy Hybrid EFI does a case-sensitive +// comparison when it should do a case-insensitive comparison, so I'm doubling this up. It does +// no harm on other computers, AFAIK. In theory, every case variation should be done for +// completeness, but that's ridiculous.... +#define LOADER_MATCH_PATTERNS L"*.efi,*.EFI" + +// Patterns that identify Linux kernels. Added to the loader match pattern when the +// scan_all_linux_kernels option is set in the configuration file. Causes kernels WITHOUT +// a ".efi" extension to be found when scanning for boot loaders. +#define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*" + static REFIT_MENU_ENTRY MenuEntryAbout = { L"About rEFInd", TAG_ABOUT, 1, 0, 'A', NULL, NULL, NULL }; static REFIT_MENU_ENTRY MenuEntryReset = { L"Reboot Computer", TAG_REBOOT, 1, 0, 'R', NULL, NULL, NULL }; static REFIT_MENU_ENTRY MenuEntryShutdown = { L"Shut Down Computer", TAG_SHUTDOWN, 1, 0, 'U', NULL, NULL, NULL }; @@ -73,18 +89,28 @@ static REFIT_MENU_ENTRY MenuEntryExit = { L"Exit rEFInd", TAG_EXIT, 1, 0, 0, static REFIT_MENU_SCREEN MainMenu = { L"Main Menu", NULL, 0, NULL, 0, NULL, 0, L"Automatic boot" }; static REFIT_MENU_SCREEN AboutMenu = { L"About", NULL, 0, NULL, 0, NULL, 0, NULL }; -REFIT_CONFIG GlobalConfig = { FALSE, 20, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, +REFIT_CONFIG GlobalConfig = { FALSE, FALSE, 0, 0, 20, 0, 0, GRAPHICS_FOR_OSX, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, {TAG_SHELL, TAG_ABOUT, TAG_SHUTDOWN, TAG_REBOOT, 0, 0, 0, 0, 0 }}; +// Structure used to hold boot loader filenames and time stamps in +// a linked list; used to sort entries within a directory. +struct LOADER_LIST { + CHAR16 *FileName; + EFI_TIME TimeStamp; + struct LOADER_LIST *NextEntry; +}; + // // misc functions // static VOID AboutrEFInd(VOID) { + CHAR16 *TempStr; // Note: Don't deallocate; moved to menu structure + if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.2.6.2"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.4.2.1"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith"); @@ -92,8 +118,9 @@ static VOID AboutrEFInd(VOID) AddMenuInfoLine(&AboutMenu, L"Distributed under the terms of the GNU GPLv3 license"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Running on:"); - AddMenuInfoLine(&AboutMenu, PoolPrint(L" EFI Revision %d.%02d", - ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1))); + TempStr = AllocateZeroPool(255 * sizeof(CHAR16)); + SPrint(TempStr, 255, L" EFI Revision %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1)); + AddMenuInfoLine(&AboutMenu, TempStr); #if defined(EFI32) AddMenuInfoLine(&AboutMenu, L" Platform: x86 (32 bit)"); #elif defined(EFIX64) @@ -101,9 +128,19 @@ static VOID AboutrEFInd(VOID) #else AddMenuInfoLine(&AboutMenu, L" Platform: unknown"); #endif - AddMenuInfoLine(&AboutMenu, PoolPrint(L" Firmware: %s %d.%02d", - ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & ((1 << 16) - 1))); - AddMenuInfoLine(&AboutMenu, PoolPrint(L" Screen Output: %s", egScreenDescription())); + TempStr = AllocateZeroPool(255 * sizeof(CHAR16)); + SPrint(TempStr, 255, L" Firmware: %s %d.%02d", + ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & ((1 << 16) - 1)); + AddMenuInfoLine(&AboutMenu, TempStr); + TempStr = AllocateZeroPool(255 * sizeof(CHAR16)); + SPrint(TempStr, 255, L" Screen Output: %s", egScreenDescription()); + AddMenuInfoLine(&AboutMenu, TempStr); + AddMenuInfoLine(&AboutMenu, L""); +#if defined(__MAKEWITH_GNUEFI) + AddMenuInfoLine(&AboutMenu, L"Built with GNU-EFI"); +#else + AddMenuInfoLine(&AboutMenu, L"Built with TianoCore EDK2"); +#endif AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"For more information, see the rEFInd Web site:"); AddMenuInfoLine(&AboutMenu, L"http://www.rodsbooks.com/refind/"); @@ -135,8 +172,9 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, ReturnStatus = Status = EFI_NOT_FOUND; // in case the list is empty for (DevicePathIndex = 0; DevicePaths[DevicePathIndex] != NULL; DevicePathIndex++) { ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], NULL, 0, &ChildImageHandle); - if (ReturnStatus != EFI_NOT_FOUND) + if (ReturnStatus != EFI_NOT_FOUND) { break; + } } SPrint(ErrorInfo, 255, L"while loading %s", ImageTitle); if (CheckError(Status, ErrorInfo)) { @@ -155,16 +193,17 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, } if (LoadOptionsPrefix != NULL) { - FullLoadOptions = PoolPrint(L"%s %s ", LoadOptionsPrefix, LoadOptions); + MergeStrings(&FullLoadOptions, LoadOptionsPrefix, 0); + MergeStrings(&FullLoadOptions, LoadOptions, L' '); + MergeStrings(&FullLoadOptions, L" ", 0); // NOTE: That last space is also added by the EFI shell and seems to be significant // when passing options to Apple's boot.efi... - LoadOptions = FullLoadOptions; } // NOTE: We also include the terminating null in the length for safety. - ChildLoadedImage->LoadOptions = (VOID *)LoadOptions; - ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(LoadOptions) + 1) * sizeof(CHAR16); + ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions; + ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16); if (Verbose) - Print(L"Using load options '%s'\n", LoadOptions); + Print(L"Using load options '%s'\n", FullLoadOptions); } // close open file handles @@ -215,7 +254,7 @@ static VOID StartLoader(IN LOADER_ENTRY *Entry) BeginExternalScreen(Entry->UseGraphicsMode, L"Booting OS"); StartEFIImage(Entry->DevicePath, Entry->LoadOptions, - Basename(Entry->LoaderPath), Basename(Entry->LoaderPath), &ErrorInStep, TRUE); + Basename(Entry->LoaderPath), Basename(Entry->LoaderPath), &ErrorInStep, !Entry->UseGraphicsMode); FinishExternalScreen(); } @@ -253,11 +292,15 @@ static CHAR16 * FindInitrd(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) { while ((DirIterNext(&DirIter, 2, L"init*", &DirEntry)) && (InitrdName == NULL)) { InitrdVersion = FindNumbers(DirEntry->FileName); if (KernelVersion != NULL) { - if (StriCmp(InitrdVersion, KernelVersion) == 0) - InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName); + if (StriCmp(InitrdVersion, KernelVersion) == 0) { + MergeStrings(&InitrdName, Path, 0); + MergeStrings(&InitrdName, DirEntry->FileName, 0); + } // if } else { - if (InitrdVersion == NULL) - InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName); + if (InitrdVersion == NULL) { + MergeStrings(&InitrdName, Path, 0); + MergeStrings(&InitrdName, DirEntry->FileName, 0); + } // if } // if/else if (InitrdVersion != NULL) FreePool(InitrdVersion); @@ -276,6 +319,63 @@ LOADER_ENTRY * AddPreparedLoaderEntry(LOADER_ENTRY *Entry) { return(Entry); } // LOADER_ENTRY * AddPreparedLoaderEntry() +// Creates a copy of a menu screen. +// Returns a pointer to the copy of the menu screen. +static REFIT_MENU_SCREEN* CopyMenuScreen(REFIT_MENU_SCREEN *Entry) { + REFIT_MENU_SCREEN *NewEntry; + UINTN i; + + NewEntry = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN)); + if ((Entry != NULL) && (NewEntry != NULL)) { + CopyMem(NewEntry, Entry, sizeof(REFIT_MENU_SCREEN)); + NewEntry->Title = StrDuplicate(Entry->Title); + NewEntry->TimeoutText = StrDuplicate(Entry->TimeoutText); + if (Entry->TitleImage != NULL) { + NewEntry->TitleImage = AllocatePool(sizeof(EG_IMAGE)); + if (NewEntry->TitleImage != NULL) + CopyMem(NewEntry->TitleImage, Entry->TitleImage, sizeof(EG_IMAGE)); + } // if + NewEntry->InfoLines = (CHAR16**) AllocateZeroPool(Entry->InfoLineCount * (sizeof(CHAR16*))); + for (i = 0; i < Entry->InfoLineCount && NewEntry->InfoLines; i++) { + NewEntry->InfoLines[i] = StrDuplicate(Entry->InfoLines[i]); + } // for + NewEntry->Entries = (REFIT_MENU_ENTRY**) AllocateZeroPool(Entry->EntryCount * (sizeof (REFIT_MENU_ENTRY*))); + for (i = 0; i < Entry->EntryCount && NewEntry->Entries; i++) { + AddMenuEntry(NewEntry, Entry->Entries[i]); + } // for + } // if + return (NewEntry); +} // static REFIT_MENU_SCREEN* CopyMenuScreen() + +// Creates a copy of a menu entry. Intended to enable moving a stack-based +// menu entry (such as the ones for the "reboot" and "exit" functions) to +// to the heap. This enables easier deletion of the whole set of menu +// entries when re-scanning. +// Returns a pointer to the copy of the menu entry. +static REFIT_MENU_ENTRY* CopyMenuEntry(REFIT_MENU_ENTRY *Entry) { + REFIT_MENU_ENTRY *NewEntry; + + NewEntry = AllocateZeroPool(sizeof(REFIT_MENU_ENTRY)); + if ((Entry != NULL) && (NewEntry != NULL)) { + CopyMem(NewEntry, Entry, sizeof(REFIT_MENU_ENTRY)); + NewEntry->Title = StrDuplicate(Entry->Title); + if (Entry->BadgeImage != NULL) { + NewEntry->BadgeImage = AllocatePool(sizeof(EG_IMAGE)); + if (NewEntry->BadgeImage != NULL) + CopyMem(NewEntry->BadgeImage, Entry->BadgeImage, sizeof(EG_IMAGE)); + } + if (Entry->Image != NULL) { + NewEntry->Image = AllocatePool(sizeof(EG_IMAGE)); + if (NewEntry->Image != NULL) + CopyMem(NewEntry->Image, Entry->Image, sizeof(EG_IMAGE)); + } + if (Entry->SubScreen != NULL) { + NewEntry->SubScreen = CopyMenuScreen(Entry->SubScreen); + } + } // if + return (NewEntry); +} // REFIT_MENU_ENTRY* CopyMenuEntry() + // Creates a new LOADER_ENTRY data structure and populates it with // default values from the specified Entry, or NULL values if Entry // is unspecified (NULL). @@ -311,7 +411,7 @@ LOADER_ENTRY *InitializeLoaderEntry(IN LOADER_ENTRY *Entry) { // Returns a pointer to the new subscreen data structure, or NULL if there // were problems allocating memory. REFIT_MENU_SCREEN *InitializeSubScreen(IN LOADER_ENTRY *Entry) { - CHAR16 *FileName, *Temp; + CHAR16 *FileName, *Temp = NULL, *TitleStr; REFIT_MENU_SCREEN *SubScreen = NULL; LOADER_ENTRY *SubEntry; @@ -319,14 +419,17 @@ REFIT_MENU_SCREEN *InitializeSubScreen(IN LOADER_ENTRY *Entry) { if (Entry->me.SubScreen == NULL) { // No subscreen yet; initialize default entry.... SubScreen = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN)); if (SubScreen != NULL) { - SubScreen->Title = PoolPrint(L"Boot Options for %s on %s", (Entry->Title != NULL) ? Entry->Title : FileName, Entry->VolName); + TitleStr = AllocateZeroPool(sizeof(CHAR16) * 256); + SPrint(TitleStr, 255, L"Boot Options for %s on %s", (Entry->Title != NULL) ? Entry->Title : FileName, Entry->VolName); + SubScreen->Title = TitleStr; SubScreen->TitleImage = Entry->me.Image; // default entry SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { SubEntry->me.Title = L"Boot using default options"; if ((SubEntry->InitrdPath != NULL) && (StrLen(SubEntry->InitrdPath) > 0) && (!StriSubCmp(L"initrd", SubEntry->LoadOptions))) { - Temp = PoolPrint(L"initrd=%s", SubEntry->InitrdPath); + MergeStrings(&Temp, L"initrd=", 0); + MergeStrings(&Temp, SubEntry->InitrdPath, 0); MergeStrings(&SubEntry->LoadOptions, Temp, L' '); FreePool(Temp); } // if @@ -342,13 +445,12 @@ REFIT_MENU_SCREEN *InitializeSubScreen(IN LOADER_ENTRY *Entry) { VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { REFIT_MENU_SCREEN *SubScreen; LOADER_ENTRY *SubEntry; - CHAR16 *FileName, *InitrdOption = NULL, *Temp; + CHAR16 *InitrdOption = NULL, *Temp; CHAR16 DiagsFileName[256]; REFIT_FILE *File; UINTN TokenCount; CHAR16 **TokenList; - FileName = Basename(Entry->LoaderPath); // create the submenu if (StrLen(Entry->Title) == 0) { FreePool(Entry->Title); @@ -363,6 +465,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Mac OS X with a 64-bit kernel"; SubEntry->LoadOptions = L"arch=x86_64"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } // if @@ -370,6 +473,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Mac OS X with a 32-bit kernel"; SubEntry->LoadOptions = L"arch=i386"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } // if #endif @@ -419,7 +523,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { FreePool(SubEntry->LoaderPath); SubEntry->LoaderPath = StrDuplicate(DiagsFileName); SubEntry->DevicePath = FileDevicePath(Volume->DeviceHandle, SubEntry->LoaderPath); - SubEntry->UseGraphicsMode = TRUE; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } // if } // if diagnostics entry found @@ -427,8 +531,10 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { } else if (Entry->OSType == 'L') { // entries for Linux kernels with EFI stub loaders File = ReadLinuxOptionsFile(Entry->LoaderPath, Volume); if (File != NULL) { - if ((Temp = FindInitrd(Entry->LoaderPath, Volume)) != NULL) - InitrdOption = PoolPrint(L"initrd=%s", Temp); + if ((Temp = FindInitrd(Entry->LoaderPath, Volume)) != NULL) { + MergeStrings(&InitrdOption, L"initrd=", 0); + MergeStrings(&InitrdOption, Temp, 0); + } TokenCount = ReadTokenLine(File, &TokenList); // read and discard first entry, since it's FreeTokenLine(&TokenList, &TokenCount); // set up by InitializeSubScreen(), earlier.... while ((TokenCount = ReadTokenLine(File, &TokenList)) > 1) { @@ -439,6 +545,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry->LoadOptions = StrDuplicate(TokenList[1]); MergeStrings(&SubEntry->LoadOptions, InitrdOption, L' '); FreeTokenLine(&TokenList, &TokenCount); + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_LINUX; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } // while if (InitrdOption) @@ -451,8 +558,9 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { } else if (Entry->OSType == 'E') { // entries for ELILO SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { - SubEntry->me.Title = PoolPrint(L"Run %s in interactive mode", FileName); + SubEntry->me.Title = L"Run ELILO in interactive mode"; SubEntry->LoadOptions = L"-p"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } @@ -461,6 +569,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry->me.Title = L"Boot Linux for a 17\" iMac or a 15\" MacBook Pro (*)"; SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 i17"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } @@ -469,6 +578,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry->me.Title = L"Boot Linux for a 20\" iMac (*)"; SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 i20"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } @@ -477,6 +587,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry->me.Title = L"Boot Linux for a Mac Mini (*)"; SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 mini"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } @@ -491,6 +602,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Windows from Hard Disk"; SubEntry->LoadOptions = L"-s -h"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } @@ -498,14 +610,16 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Windows from CD-ROM"; SubEntry->LoadOptions = L"-s -c"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { - SubEntry->me.Title = PoolPrint(L"Run %s in text mode", FileName); + SubEntry->me.Title = L"Run XOM in text mode"; SubEntry->UseGraphicsMode = FALSE; SubEntry->LoadOptions = L"-v"; + SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); } } // entries for xom.efi @@ -521,8 +635,10 @@ static CHAR16 * GetMainLinuxOptions(IN CHAR16 * LoaderPath, IN REFIT_VOLUME *Vol Options = GetFirstOptionsFromFile(LoaderPath, Volume); InitrdName = FindInitrd(LoaderPath, Volume); - if (InitrdName != NULL) - InitrdOption = PoolPrint(L"initrd=%s", InitrdName); + if (InitrdName != NULL) { + MergeStrings(&InitrdOption, L"initrd=", 0); + MergeStrings(&InitrdOption, InitrdName, 0); + } // if MergeStrings(&Options, InitrdOption, ' '); if (InitrdOption != NULL) FreePool(InitrdOption); @@ -544,7 +660,7 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME // locate a custom icon for the loader StrCpy(IconFileName, LoaderPath); - ReplaceExtension(IconFileName, L".icns"); + ReplaceEfiExtension(IconFileName, L".icns"); if (FileExists(Volume->RootDir, IconFileName)) { Entry->me.Image = LoadIcns(Volume->RootDir, IconFileName, 128); } else if ((StrLen(PathOnly) == 0) && (Volume->VolIconImage != NULL)) { @@ -565,6 +681,7 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME if (ShortcutLetter == 0) ShortcutLetter = 'L'; Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume); + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_LINUX; } else if (StriSubCmp(L"refit", LoaderPath)) { MergeStrings(&OSIconName, L"refit", L','); Entry->OSType = 'R'; @@ -574,9 +691,9 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME Entry->me.Image = Volume->VolIconImage; } MergeStrings(&OSIconName, L"mac", L','); - Entry->UseGraphicsMode = TRUE; Entry->OSType = 'M'; ShortcutLetter = 'M'; + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX; } else if (StriCmp(FileName, L"diags.efi") == 0) { MergeStrings(&OSIconName, L"hwtest", L','); } else if (StriCmp(FileName, L"e.efi") == 0 || StriCmp(FileName, L"elilo.efi") == 0) { @@ -584,17 +701,24 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME Entry->OSType = 'E'; if (ShortcutLetter == 0) ShortcutLetter = 'L'; + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; + } else if (StriSubCmp(L"grub", FileName)) { + Entry->OSType = 'G'; + ShortcutLetter = 'G'; + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_GRUB; } else if (StriCmp(FileName, L"cdboot.efi") == 0 || StriCmp(FileName, L"bootmgr.efi") == 0 || StriCmp(FileName, L"Bootmgfw.efi") == 0) { MergeStrings(&OSIconName, L"win", L','); Entry->OSType = 'W'; ShortcutLetter = 'W'; + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; } else if (StriCmp(FileName, L"xom.efi") == 0) { MergeStrings(&OSIconName, L"xom,win", L','); Entry->UseGraphicsMode = TRUE; Entry->OSType = 'X'; ShortcutLetter = 'W'; + Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; } if ((ShortcutLetter >= 'a') && (ShortcutLetter <= 'z')) @@ -610,15 +734,23 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, IN REFIT_VOLUME // for icons, options, etc. LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume) { LOADER_ENTRY *Entry; + CHAR16 *PoolStr; CleanUpPathNameSlashes(LoaderPath); Entry = InitializeLoaderEntry(NULL); if (Entry != NULL) { - Entry->Title = StrDuplicate(LoaderTitle); - Entry->me.Title = PoolPrint(L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath + 1, Volume->VolName); + Entry->Title = StrDuplicate((LoaderTitle != NULL) ? LoaderTitle : LoaderPath); + PoolStr = AllocateZeroPool(sizeof(CHAR16) * 256); + SPrint(PoolStr, 255, L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath, Volume->VolName); + Entry->me.Title = PoolStr; Entry->me.Row = 0; Entry->me.BadgeImage = Volume->VolBadgeImage; - Entry->LoaderPath = StrDuplicate(LoaderPath); + if ((LoaderPath != NULL) && (LoaderPath[0] != L'\\')) { + Entry->LoaderPath = StrDuplicate(L"\\"); + } else { + Entry->LoaderPath = NULL; + } + MergeStrings(&(Entry->LoaderPath), LoaderPath, 0); Entry->VolName = Volume->VolName; Entry->DevicePath = FileDevicePath(Volume->DeviceHandle, Entry->LoaderPath); SetLoaderDefaults(Entry, LoaderPath, Volume); @@ -629,32 +761,85 @@ LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN return(Entry); } // LOADER_ENTRY * AddLoaderEntry() +// Returns -1 if (Time1 < Time2), +1 if (Time1 > Time2), or 0 if +// (Time1 == Time2). Precision is only to the nearest second; since +// this is used for sorting boot loader entries, differences smaller +// than this are likely to be meaningless (and unlikely!). +INTN TimeComp(EFI_TIME *Time1, EFI_TIME *Time2) { + INT64 Time1InSeconds, Time2InSeconds; + + // Following values are overestimates; I'm assuming 31 days in every month. + // This is fine for the purpose of this function, which has a limited + // purpose. + Time1InSeconds = Time1->Second + (Time1->Minute * 60) + (Time1->Hour * 3600) + (Time1->Day * 86400) + + (Time1->Month * 2678400) + ((Time1->Year - 1998) * 32140800); + Time2InSeconds = Time2->Second + (Time2->Minute * 60) + (Time2->Hour * 3600) + (Time2->Day * 86400) + + (Time2->Month * 2678400) + ((Time2->Year - 1998) * 32140800); + if (Time1InSeconds < Time2InSeconds) + return (-1); + else if (Time1InSeconds > Time2InSeconds) + return (1); + + return 0; +} // INTN TimeComp() + +// Adds a loader list element, keeping it sorted by date. Returns the new +// first element (the one with the most recent date). +static struct LOADER_LIST * AddLoaderListEntry(struct LOADER_LIST *LoaderList, struct LOADER_LIST *NewEntry) { + struct LOADER_LIST *LatestEntry, *CurrentEntry, *PrevEntry = NULL; + + LatestEntry = CurrentEntry = LoaderList; + if (LoaderList == NULL) { + LatestEntry = NewEntry; + } else { + while ((CurrentEntry != NULL) && (TimeComp(&(NewEntry->TimeStamp), &(CurrentEntry->TimeStamp)) < 0)) { + PrevEntry = CurrentEntry; + CurrentEntry = CurrentEntry->NextEntry; + } // while + NewEntry->NextEntry = CurrentEntry; + if (PrevEntry == NULL) { + LatestEntry = NewEntry; + } else { + PrevEntry->NextEntry = NewEntry; + } // if/else + } // if/else + return (LatestEntry); +} // static VOID AddLoaderListEntry() + +// Delete the LOADER_LIST linked list +static VOID CleanUpLoaderList(struct LOADER_LIST *LoaderList) { + struct LOADER_LIST *Temp; + + while (LoaderList != NULL) { + Temp = LoaderList; + LoaderList = LoaderList->NextEntry; + FreePool(Temp->FileName); + FreePool(Temp); + } // while +} // static VOID CleanUpLoaderList() + // Scan an individual directory for EFI boot loader files and, if found, -// add them to the list. -static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path) +// add them to the list. Sorts the entries within the loader directory +// so that the most recent one appears first in the list. +static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *Pattern) { EFI_STATUS Status; REFIT_DIR_ITER DirIter; EFI_FILE_INFO *DirEntry; - CHAR16 FileName[256], *SelfPath; - UINTN i = 0; - - // Skip past leading slashes, which are sometimes (but not always) included - // in SelfDirPath, to get a path that's known to never include this feature. - while ((SelfDirPath != NULL) && (SelfDirPath[i] == L'\\')) { - i++; - } - SelfPath = &SelfDirPath[i]; // NOTE: *DO NOT* call FreePool() on SelfPath!!! + CHAR16 FileName[256], *Extension; + struct LOADER_LIST *LoaderList = NULL, *NewLoader; - if (!SelfPath || !Path || ((StriCmp(Path, SelfPath) == 0) && Volume != SelfVolume) || - (StriCmp(Path, SelfPath) != 0)) { + if ((!SelfDirPath || !Path || ((StriCmp(Path, SelfDirPath) == 0) && Volume->DeviceHandle != SelfVolume->DeviceHandle) || + (StriCmp(Path, SelfDirPath) != 0)) && (!IsIn(Path, GlobalConfig.DontScan))) { // look through contents of the directory DirIterOpen(Volume->RootDir, Path, &DirIter); - while (DirIterNext(&DirIter, 2, L"*.efi", &DirEntry)) { + while (DirIterNext(&DirIter, 2, Pattern, &DirEntry)) { + Extension = FindExtension(DirEntry->FileName); if (DirEntry->FileName[0] == '.' || StriCmp(DirEntry->FileName, L"TextMode.efi") == 0 || StriCmp(DirEntry->FileName, L"ebounce.efi") == 0 || StriCmp(DirEntry->FileName, L"GraphicsConsole.efi") == 0 || + StriCmp(Extension, L".icns") == 0 || StriSubCmp(L"shell", DirEntry->FileName)) continue; // skip this @@ -662,8 +847,21 @@ static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path) SPrint(FileName, 255, L"\\%s\\%s", Path, DirEntry->FileName); else SPrint(FileName, 255, L"\\%s", DirEntry->FileName); - AddLoaderEntry(FileName, NULL, Volume); - } + CleanUpPathNameSlashes(FileName); + NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST)); + if (NewLoader != NULL) { + NewLoader->FileName = StrDuplicate(FileName); + NewLoader->TimeStamp = DirEntry->ModificationTime; + LoaderList = AddLoaderListEntry(LoaderList, NewLoader); + } // if + FreePool(Extension); + } // while + NewLoader = LoaderList; + while (NewLoader != NULL) { + AddLoaderEntry(NewLoader->FileName, NULL, Volume); + NewLoader = NewLoader->NextEntry; + } // while + CleanUpLoaderList(LoaderList); Status = DirIterClose(&DirIter); if (Status != EFI_NOT_FOUND) { if (Path) @@ -679,30 +877,36 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { EFI_STATUS Status; REFIT_DIR_ITER EfiDirIter; EFI_FILE_INFO *EfiDirEntry; - CHAR16 FileName[256], *Directory; + CHAR16 FileName[256], *Directory, *MatchPatterns; UINTN i, Length; + MatchPatterns = StrDuplicate(LOADER_MATCH_PATTERNS); + if (GlobalConfig.ScanAllLinux) + MergeStrings(&MatchPatterns, LINUX_MATCH_PATTERNS, L','); + if ((Volume->RootDir != NULL) && (Volume->VolName != NULL)) { // check for Mac OS X boot loader - StrCpy(FileName, MACOSX_LOADER_PATH); - if (FileExists(Volume->RootDir, FileName)) { - AddLoaderEntry(FileName, L"Mac OS X", Volume); - } + if (!IsIn(L"System\\Library\\CoreServices", GlobalConfig.DontScan)) { + StrCpy(FileName, MACOSX_LOADER_PATH); + if (FileExists(Volume->RootDir, FileName)) { + AddLoaderEntry(FileName, L"Mac OS X", Volume); + } - // check for XOM - StrCpy(FileName, L"\\System\\Library\\CoreServices\\xom.efi"); - if (FileExists(Volume->RootDir, FileName)) { - AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume); - } + // check for XOM + StrCpy(FileName, L"System\\Library\\CoreServices\\xom.efi"); + if (FileExists(Volume->RootDir, FileName)) { + AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume); + } + } // if Mac directory not in GlobalConfig.DontScan list // check for Microsoft boot loader/menu - StrCpy(FileName, L"\\EFI\\Microsoft\\Boot\\Bootmgfw.efi"); - if (FileExists(Volume->RootDir, FileName)) { + StrCpy(FileName, L"EFI\\Microsoft\\Boot\\Bootmgfw.efi"); + if (FileExists(Volume->RootDir, FileName) && !IsIn(L"EFI\\Microsoft\\Boot", GlobalConfig.DontScan)) { AddLoaderEntry(FileName, L"Microsoft EFI boot", Volume); } // scan the root directory for EFI executables - ScanLoaderDir(Volume, NULL); + ScanLoaderDir(Volume, L"\\", MatchPatterns); // scan subdirectories of the EFI directory (as per the standard) DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter); @@ -710,7 +914,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { if (StriCmp(EfiDirEntry->FileName, L"tools") == 0 || EfiDirEntry->FileName[0] == '.') continue; // skip this, doesn't contain boot loaders SPrint(FileName, 255, L"EFI\\%s", EfiDirEntry->FileName); - ScanLoaderDir(Volume, FileName); + ScanLoaderDir(Volume, FileName, MatchPatterns); } // while() Status = DirIterClose(&EfiDirIter); if (Status != EFI_NOT_FOUND) @@ -719,14 +923,10 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { // Scan user-specified (or additional default) directories.... i = 0; while ((Directory = FindCommaDelimited(GlobalConfig.AlsoScan, i++)) != NULL) { + CleanUpPathNameSlashes(Directory); Length = StrLen(Directory); - // Some EFI implementations won't read a directory if the path ends in - // a backslash, so eliminate this character, if it's present.... - while ((Length > 0) && (Directory[Length - 1] == L'\\')) { - Directory[--Length] = 0; - } // while if (Length > 0) - ScanLoaderDir(Volume, Directory); + ScanLoaderDir(Volume, Directory, MatchPatterns); FreePool(Directory); } // while } // if @@ -962,6 +1162,7 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo REFIT_MENU_SCREEN *SubScreen; CHAR16 *VolDesc; CHAR16 ShortcutLetter = 0; + CHAR16 *PoolStr; if (LoaderTitle == NULL) { if (Volume->OSName != NULL) { @@ -978,7 +1179,9 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo // prepare the menu entry Entry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - Entry->me.Title = PoolPrint(L"Boot %s from %s", LoaderTitle, VolDesc); + PoolStr = AllocateZeroPool(256 * sizeof(CHAR16)); + SPrint(PoolStr, 255, L"Boot %s from %s", LoaderTitle, VolDesc); + Entry->me.Title = PoolStr; Entry->me.Tag = TAG_LEGACY; Entry->me.Row = 0; Entry->me.ShortcutLetter = ShortcutLetter; @@ -991,17 +1194,21 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo // create the submenu SubScreen = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN)); - SubScreen->Title = PoolPrint(L"Boot Options for %s on %s", LoaderTitle, VolDesc); + PoolStr = AllocateZeroPool(256 * sizeof(CHAR16)); + SPrint(PoolStr, 255, L"Boot Options for %s on %s", LoaderTitle, VolDesc); + SubScreen->Title = PoolStr; SubScreen->TitleImage = Entry->me.Image; // default entry SubEntry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - SubEntry->me.Title = PoolPrint(L"Boot %s", LoaderTitle); + PoolStr = AllocateZeroPool(256 * sizeof(CHAR16)); + SPrint(PoolStr, 255, L"Boot %s", LoaderTitle); + SubEntry->me.Title = PoolStr; SubEntry->me.Tag = TAG_LEGACY; SubEntry->Volume = Entry->Volume; SubEntry->LoadOptions = Entry->LoadOptions; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); - + AddMenuEntry(SubScreen, &MenuEntryReturn); Entry->me.SubScreen = SubScreen; AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry); @@ -1023,7 +1230,7 @@ static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) { Volume->BlockIOOffset == 0 && Volume->OSName == NULL) // this is a whole disk (MBR) entry; hide if we have entries for partitions - HideIfOthersFound = TRUE; + HideIfOthersFound = TRUE; } if (HideIfOthersFound) { // check for other bootable entries on the same disk @@ -1086,20 +1293,23 @@ static VOID ScanLegacyExternal(VOID) static VOID StartTool(IN LOADER_ENTRY *Entry) { - BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start " as assigned below - StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath), - Basename(Entry->LoaderPath), NULL, TRUE); - FinishExternalScreen(); + BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start <title>" as assigned below + StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath), + Basename(Entry->LoaderPath), NULL, TRUE); + FinishExternalScreen(); } /* static VOID StartTool() */ static LOADER_ENTRY * AddToolEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN EG_IMAGE *Image, IN CHAR16 ShortcutLetter, IN BOOLEAN UseGraphicsMode) { LOADER_ENTRY *Entry; + CHAR16 *TitleStr = NULL; Entry = AllocateZeroPool(sizeof(LOADER_ENTRY)); - Entry->me.Title = PoolPrint(L"Start %s", LoaderTitle); + MergeStrings(&TitleStr, L"Start ", 0); + MergeStrings(&TitleStr, LoaderTitle, 0); + Entry->me.Title = TitleStr; Entry->me.Tag = TAG_TOOL; Entry->me.Row = 1; Entry->me.ShortcutLetter = ShortcutLetter; @@ -1124,9 +1334,10 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) EFI_FILE_INFO *DirEntry; CHAR16 FileName[256]; + CleanUpPathNameSlashes(Path); // look through contents of the directory DirIterOpen(SelfRootDir, Path, &DirIter); - while (DirIterNext(&DirIter, 2, L"*.efi", &DirEntry)) { + while (DirIterNext(&DirIter, 2, LOADER_MATCH_PATTERNS, &DirEntry)) { if (DirEntry->FileName[0] == '.') continue; // skip this @@ -1143,6 +1354,7 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) return (NumFound); } +#ifdef __MAKEWITH_GNUEFI static EFI_STATUS ConnectAllDriversToAllControllers(VOID) { EFI_STATUS Status; @@ -1156,11 +1368,6 @@ static EFI_STATUS ConnectAllDriversToAllControllers(VOID) BOOLEAN Parent; BOOLEAN Device; - // GNU EFI's EFI_BOOT_SERVICES data structure is truncated, but all the - // items are in memory, so point a more complete data structure to it - // so that we can use items not in GNU EFI's implementation.... - gBS = (MY_BOOT_SERVICES*) BS; - Status = LibLocateHandle(AllHandles, NULL, NULL, @@ -1198,7 +1405,7 @@ static EFI_STATUS ConnectAllDriversToAllControllers(VOID) if (!Parent) { if (HandleType[Index] & EFI_HANDLE_TYPE_DEVICE_HANDLE) { - Status = refit_call4_wrapper(gBS->ConnectController, + Status = refit_call4_wrapper(BS->ConnectController, AllHandleBuffer[Index], NULL, NULL, @@ -1215,20 +1422,37 @@ Done: FreePool (AllHandleBuffer); return Status; } /* EFI_STATUS ConnectAllDriversToAllControllers() */ +#else +static EFI_STATUS ConnectAllDriversToAllControllers(VOID) { + BdsLibConnectAllDriversToAllControllers(); + return 0; +} +#endif +// Load all EFI drivers from rEFInd's "drivers" subdirectory and from the +// directories specified by the user in the "scan_driver_dirs" configuration +// file line. static VOID LoadDrivers(VOID) { - CHAR16 *Directory; + CHAR16 *Directory, *SelfDirectory; UINTN i = 0, Length, NumFound = 0; - // Scan user-specified driver directories.... + // load drivers from the subdirectories of rEFInd's home directory specified + // in the DRIVER_DIRS constant. + while ((Directory = FindCommaDelimited(DRIVER_DIRS, i++)) != NULL) { + SelfDirectory = StrDuplicate(SelfDirPath); + CleanUpPathNameSlashes(SelfDirectory); + MergeStrings(&SelfDirectory, Directory, L'\\'); + NumFound += ScanDriverDir(SelfDirectory); + FreePool(Directory); + FreePool(SelfDirectory); + } + + // Scan additional user-specified driver directories.... + i = 0; while ((Directory = FindCommaDelimited(GlobalConfig.DriverDirs, i++)) != NULL) { + CleanUpPathNameSlashes(Directory); Length = StrLen(Directory); - // Some EFI implementations won't read a directory if the path ends in - // a backslash, so eliminate this character, if it's present.... - while ((Length > 0) && (Directory[Length - 1] == L'\\')) { - Directory[--Length] = 0; - } // while if (Length > 0) NumFound += ScanDriverDir(Directory); FreePool(Directory); @@ -1237,24 +1461,12 @@ static VOID LoadDrivers(VOID) // connect all devices if (NumFound > 0) ConnectAllDriversToAllControllers(); -} +} /* static VOID LoadDrivers() */ static VOID ScanForBootloaders(VOID) { UINTN i; ScanVolumes(); - // Commented-out below: Was part of an attempt to get rEFInd to - // re-scan disk devices on pressing Esc; but doesn't work (yet), so - // removed.... -// MainMenu.Title = StrDuplicate(L"Main Menu 2"); -// MainMenu.TitleImage = NULL; -// MainMenu.InfoLineCount = 0; -// MainMenu.InfoLines = NULL; -// MainMenu.EntryCount = 0; -// MainMenu.Entries = NULL; -// MainMenu.TimeoutSeconds = 20; -// MainMenu.TimeoutText = StrDuplicate(L"Automatic boot"); - // DebugPause(); // scan for loaders and tools, add them to the menu for (i = 0; i < NUM_SCAN_OPTIONS; i++) { @@ -1295,31 +1507,36 @@ static VOID ScanForBootloaders(VOID) { // reboot, etc.) static VOID ScanForTools(VOID) { CHAR16 *FileName = NULL; + REFIT_MENU_ENTRY *TempMenuEntry; UINTN i, j; for (i = 0; i < NUM_TOOLS; i++) { switch(GlobalConfig.ShowTools[i]) { case TAG_SHUTDOWN: - MenuEntryShutdown.Image = BuiltinIcon(BUILTIN_ICON_FUNC_SHUTDOWN); - AddMenuEntry(&MainMenu, &MenuEntryShutdown); + TempMenuEntry = CopyMenuEntry(&MenuEntryShutdown); + TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_SHUTDOWN); + AddMenuEntry(&MainMenu, TempMenuEntry); break; case TAG_REBOOT: - MenuEntryReset.Image = BuiltinIcon(BUILTIN_ICON_FUNC_RESET); - AddMenuEntry(&MainMenu, &MenuEntryReset); + TempMenuEntry = CopyMenuEntry(&MenuEntryReset); + TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_RESET); + AddMenuEntry(&MainMenu, TempMenuEntry); break; case TAG_ABOUT: - MenuEntryAbout.Image = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuEntry(&MainMenu, &MenuEntryAbout); + TempMenuEntry = CopyMenuEntry(&MenuEntryAbout); + TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); + AddMenuEntry(&MainMenu, TempMenuEntry); break; case TAG_EXIT: - MenuEntryExit.Image = BuiltinIcon(BUILTIN_ICON_FUNC_EXIT); - AddMenuEntry(&MainMenu, &MenuEntryExit); + TempMenuEntry = CopyMenuEntry(&MenuEntryExit); + TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_EXIT); + AddMenuEntry(&MainMenu, TempMenuEntry); break; case TAG_SHELL: j = 0; while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) { if (FileExists(SelfRootDir, FileName)) { - AddToolEntry(FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL), 'E', FALSE); + AddToolEntry(FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL), 'S', FALSE); } } // while break; @@ -1337,18 +1554,52 @@ static VOID ScanForTools(VOID) { } // for } // static VOID ScanForTools +// Rescan for boot loaders +VOID RescanAll(VOID) { + EG_PIXEL BGColor; + + BGColor.b = 255; + BGColor.g = 175; + BGColor.r = 100; + BGColor.a = 0; + egDisplayMessage(L"Scanning for new boot loaders; please wait....", &BGColor); + FreeList((VOID ***) &(MainMenu.Entries), &MainMenu.EntryCount); + MainMenu.Entries = NULL; + MainMenu.EntryCount = 0; + ReadConfig(); + ConnectAllDriversToAllControllers(); + ScanForBootloaders(); + ScanForTools(); + SetupScreen(); +} // VOID RescanAll() + +#ifndef __MAKEWITH_GNUEFI + +// Minimal initialization function +static VOID InitializeLib(IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable) { + gST = SystemTable; + // gImageHandle = ImageHandle; + gBS = SystemTable->BootServices; + // gRS = SystemTable->RuntimeServices; + EfiGetSystemConfigurationTable (&gEfiDxeServicesTableGuid, (VOID **) &gDS); + + InitializeConsoleSim(); +} + +#endif + // // main entry point // - EFI_STATUS EFIAPI efi_main (IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable) { - EFI_STATUS Status; - BOOLEAN MainLoopRunning = TRUE; - REFIT_MENU_ENTRY *ChosenEntry; - UINTN MenuExit; + EFI_STATUS Status; + BOOLEAN MainLoopRunning = TRUE; + REFIT_MENU_ENTRY *ChosenEntry; + UINTN MenuExit; + CHAR16 *Selection; // bootstrap InitializeLib(ImageHandle, SystemTable); @@ -1371,17 +1622,13 @@ efi_main (IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable) ScanForBootloaders(); ScanForTools(); + Selection = StrDuplicate(GlobalConfig.DefaultSelection); while (MainLoopRunning) { - MenuExit = RunMainMenu(&MainMenu, GlobalConfig.DefaultSelection, &ChosenEntry); + MenuExit = RunMainMenu(&MainMenu, Selection, &ChosenEntry); - // We don't allow exiting the main menu with the Escape key. + // The Escape key triggers a re-scan operation.... if (MenuExit == MENU_EXIT_ESCAPE) { - // Commented-out below: Was part of an attempt to get rEFInd to - // re-scan disk devices on pressing Esc; but doesn't work (yet), so - // removed.... -// ReadConfig(); -// ScanForBootloaders(); -// SetupScreen(); + RescanAll(); continue; } @@ -1420,8 +1667,10 @@ efi_main (IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable) return EFI_SUCCESS; break; - } - } + } // switch() + FreePool(Selection); + Selection = StrDuplicate(ChosenEntry->Title); + } // while() // If we end up here, things have gone wrong. Try to reboot, and if that // fails, go into an endless loop.