Return of PoolPrint() function; modified launch code to include

program filename as an option.

diff --git a/NEWS.txt b/NEWS.txt
index 821dbe8c82df2bf2766dd5cbab3b84c8457fef4e..dbb6b3bba79f6482ecc9703e1601233c89eb95cc 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,10 @@
 0.7.4 (?/??/2013):
 ------------------
 
 0.7.4 (?/??/2013):
 ------------------
 

+- Fixed options passing to loader to include loader's filename as the first
+  option. This omission had no effect on most boot loaders, but caused
+  VMware's mboot64.efi to fail.
+

 - Added support for memtest86 as second-row option. Program must be
   stored in EFI/tools, EFI/tools/memtest, EFI/tools/memtest86, EFI/memtest,
   or EFI/memtest86; and must use the name memtest86.efi, memtest86_x64.efi,
 - Added support for memtest86 as second-row option. Program must be
   stored in EFI/tools, EFI/tools/memtest, EFI/tools/memtest86, EFI/memtest,
   or EFI/memtest86; and must use the name memtest86.efi, memtest86_x64.efi,

diff --git a/include/tiano_includes.h b/include/tiano_includes.h
index 9611243a537e7de83b9b9e7e4d6d12587d9e00f9..86b7b6d94905371e88276f51ac3e23433689e3fd 100644 (file)
--- a/include/tiano_includes.h
+++ b/include/tiano_includes.h
@@ -161,4 +161,6 @@ TimeCompare (
    IN EFI_TIME               *SecondTime
 );
 
    IN EFI_TIME               *SecondTime
 );
 

+#define PoolPrint(...) CatSPrint(NULL, __VA_ARGS__)
+

 #endif
\ No newline at end of file
 #endif
\ No newline at end of file

diff --git a/refind.conf-sample b/refind.conf-sample
index 37c6f23da11f74a912ba0d7d9884b57fe251a7ad..5d86de251b628cae9b3b551c0a6b0330b378312b 100644 (file)
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -211,10 +211,12 @@ timeout 20
 
 # Directories that should NOT be scanned for boot loaders. By default,
 # rEFInd doesn't scan its own directory, the EFI/tools directory, the
 
 # Directories that should NOT be scanned for boot loaders. By default,
 # rEFInd doesn't scan its own directory, the EFI/tools directory, the

-# EFI/memtest directory, or the EFI/memtest86 directory. You can
-# "blacklist" additional directories with this option, which takes a
-# list of directory names as options. You might do this to keep
-# EFI/boot/bootx64.efi out of the menu if that's a duplicate of
+# EFI/memtest directory, or the EFI/memtest86 directory. Using the
+# dont_scan_dirs option enables you to "blacklist" other directories;
+# but note that using this option removes the EFI/memtest and
+# EFI/memtest86 directories, so if you don't want them scanned, be
+# sure to include them in your new list. You might use this token to
+# keep EFI/boot/bootx64.efi out of the menu if that's a duplicate of

 # another boot loader or to exclude a directory that holds drivers
 # or non-bootloader utilities provided by a hardware manufacturer. If
 # a directory is listed both here and in also_scan_dirs, dont_scan_dirs
 # another boot loader or to exclude a directory that holds drivers
 # or non-bootloader utilities provided by a hardware manufacturer. If
 # a directory is listed both here and in also_scan_dirs, dont_scan_dirs


@@ -224,7 +226,7 @@ timeout 20
 # to exclude EFI/somedir from the scan on the myvol volume but not on
 # other volumes.
 #
 # to exclude EFI/somedir from the scan on the myvol volume but not on
 # other volumes.
 #

-#dont_scan_dirs ESP:/EFI/boot,EFI/Dell
+#dont_scan_dirs ESP:/EFI/boot,EFI/Dell,EFI/memtest86

 
 # Files that should NOT be included as EFI boot loaders (on the
 # first line of the display). If you're using a boot loader that
 
 # Files that should NOT be included as EFI boot loaders (on the
 # first line of the display). If you're using a boot loader that

diff --git a/refind/config.c b/refind/config.c
index 5dfea7de2a93236168c642d8ebd84088b6a4e2af..ee9c818096a0c5de0d1eee0c90feb113430ce31f 100644 (file)
--- a/refind/config.c
+++ b/refind/config.c
@@ -1,5 +1,5 @@
 /*
 /*

- * refit/config.c
+ * refind/config.c

  * Configuration file functions
  *
  * Copyright (c) 2006 Christoph Pfisterer
  * Configuration file functions
  *
  * Copyright (c) 2006 Christoph Pfisterer


@@ -340,7 +340,7 @@ VOID ReadConfig(CHAR16 *FileName)
     REFIT_FILE      File;
     CHAR16          **TokenList;
     CHAR16          *FlagName;
     REFIT_FILE      File;
     CHAR16          **TokenList;
     CHAR16          *FlagName;

-    CHAR16          *SelfPath = NULL;
+    CHAR16          *TempStr = NULL;

     UINTN           TokenCount, i;
 
     // Set a few defaults only if we're loading the default file.
     UINTN           TokenCount, i;
 
     // Set a few defaults only if we're loading the default file.


@@ -350,15 +350,16 @@ VOID ReadConfig(CHAR16 *FileName)
        MyFreePool(GlobalConfig.DontScanDirs);
        if (SelfVolume) {
           if (SelfVolume->VolName) {
        MyFreePool(GlobalConfig.DontScanDirs);
        if (SelfVolume) {
           if (SelfVolume->VolName) {

-             SelfPath = SelfVolume->VolName ? StrDuplicate(SelfVolume->VolName) : NULL;
+             TempStr = SelfVolume->VolName ? StrDuplicate(SelfVolume->VolName) : NULL;

           } else {
           } else {

-             SelfPath = AllocateZeroPool(256 * sizeof(CHAR16));
-             if (SelfPath != NULL)
-                SPrint(SelfPath, 255, L"fs%d", SelfVolume->VolNumber);
+             TempStr = AllocateZeroPool(256 * sizeof(CHAR16));
+             if (TempStr != NULL)
+                SPrint(TempStr, 255, L"fs%d", SelfVolume->VolNumber);

           } // if/else
        }
           } // if/else
        }

-       MergeStrings(&SelfPath, SelfDirPath, L':');
-       GlobalConfig.DontScanDirs = SelfPath;
+       MergeStrings(&TempStr, SelfDirPath, L':');
+       MergeStrings(&TempStr, MEMTEST_LOCATIONS, L',');
+       GlobalConfig.DontScanDirs = TempStr;

        MyFreePool(GlobalConfig.DontScanFiles);
        GlobalConfig.DontScanFiles = StrDuplicate(DONT_SCAN_FILES);
        MergeStrings(&(GlobalConfig.DontScanFiles), MOK_NAMES, L',');
        MyFreePool(GlobalConfig.DontScanFiles);
        GlobalConfig.DontScanFiles = StrDuplicate(DONT_SCAN_FILES);
        MergeStrings(&(GlobalConfig.DontScanFiles), MOK_NAMES, L',');


@@ -791,7 +792,7 @@ static REFIT_FILE * GenerateOptionsFromEtcFstab(REFIT_VOLUME *Volume) {
    UINTN        TokenCount, i;
    REFIT_FILE   *Options = NULL, *Fstab = NULL;
    EFI_STATUS   Status;
    UINTN        TokenCount, i;
    REFIT_FILE   *Options = NULL, *Fstab = NULL;
    EFI_STATUS   Status;

-   CHAR16       **TokenList, Line[513], Root[100];
+   CHAR16       **TokenList, *Line, Root[100];

 
    if (FileExists(Volume->RootDir, L"\\etc\\fstab")) {
       Options = AllocateZeroPool(sizeof(REFIT_FILE));
 
    if (FileExists(Volume->RootDir, L"\\etc\\fstab")) {
       Options = AllocateZeroPool(sizeof(REFIT_FILE));


@@ -806,7 +807,6 @@ static REFIT_FILE * GenerateOptionsFromEtcFstab(REFIT_VOLUME *Volume) {
          Fstab = NULL;
       } else { // File read; locate root fs and create entries
          Options->Encoding = ENCODING_UTF16_LE;
          Fstab = NULL;
       } else { // File read; locate root fs and create entries
          Options->Encoding = ENCODING_UTF16_LE;

-         Line[0] = '\0';

          while ((TokenCount = ReadTokenLine(Fstab, &TokenList)) > 0) {
             if (TokenCount > 2) {
                Root[0] = '\0';
          while ((TokenCount = ReadTokenLine(Fstab, &TokenList)) > 0) {
             if (TokenCount > 2) {
                Root[0] = '\0';


@@ -819,9 +819,10 @@ static REFIT_FILE * GenerateOptionsFromEtcFstab(REFIT_VOLUME *Volume) {
                   for (i = 0; i < StrLen(Root); i++)
                      if (Root[i] == '\\')
                         Root[i] = '/';
                   for (i = 0; i < StrLen(Root); i++)
                      if (Root[i] == '\\')
                         Root[i] = '/';

-                  SPrint(Line, 512, L"\"Boot with normal options\"    \"ro root=%s\"\n", Root);
+                  Line = PoolPrint(L"\"Boot with normal options\"    \"ro root=%s\"\n", Root);

                   MergeStrings((CHAR16 **) &(Options->Buffer), Line, 0);
                   MergeStrings((CHAR16 **) &(Options->Buffer), Line, 0);

-                  SPrint(Line, 512, L"\"Boot into single-user mode\"  \"ro root=%s single\"\n", Root);
+                  MyFreePool(Line);
+                  Line = PoolPrint(L"\"Boot into single-user mode\"  \"ro root=%s single\"\n", Root);

                   MergeStrings((CHAR16**) &(Options->Buffer), Line, 0);
                   Options->BufferSize = StrLen((CHAR16*) Options->Buffer) * sizeof(CHAR16);
                } // if
                   MergeStrings((CHAR16**) &(Options->Buffer), Line, 0);
                   Options->BufferSize = StrLen((CHAR16*) Options->Buffer) * sizeof(CHAR16);
                } // if

diff --git a/refind/global.h b/refind/global.h
index 131a47b5d9efb64211b57a0b71ed1f574b3a7b49..ddcc24ecc318f27111b71dfd116ea34fc6747f3e 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -128,6 +128,8 @@
 // Directories to search for these MOK-managing programs. Note that SelfDir is
 // searched in addition to these locations....
 #define MOK_LOCATIONS           L"\\,EFI\\tools,EFI\\fedora,EFI\\redhat,EFI\\ubuntu,EFI\\suse,EFI\\opensuse,EFI\\altlinux"
 // Directories to search for these MOK-managing programs. Note that SelfDir is
 // searched in addition to these locations....
 #define MOK_LOCATIONS           L"\\,EFI\\tools,EFI\\fedora,EFI\\redhat,EFI\\ubuntu,EFI\\suse,EFI\\opensuse,EFI\\altlinux"

+// Directories to search for memtest86....
+#define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"

 
 //
 // global definitions
 
 //
 // global definitions

diff --git a/refind/main.c b/refind/main.c
index c35ab1fa604d7beac79e60a43255b9a36e5f2b94..0715dbbb7759a439cd2c6bb7421393e3edd47666 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -69,7 +69,6 @@
 // constants
 
 #define MACOSX_LOADER_PATH      L"System\\Library\\CoreServices\\boot.efi"
 // constants
 
 #define MACOSX_LOADER_PATH      L"System\\Library\\CoreServices\\boot.efi"

-#define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"

 #if defined (EFIX64)
 #define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellx64.efi,\\shell.efi,\\shellx64.efi"
 #define GPTSYNC_NAMES           L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_x64.efi"
 #if defined (EFIX64)
 #define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellx64.efi,\\shell.efi,\\shellx64.efi"
 #define GPTSYNC_NAMES           L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_x64.efi"


@@ -151,11 +150,9 @@ struct LOADER_LIST {
 
 static VOID AboutrEFInd(VOID)
 {
 
 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);
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);

-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.7.3.9");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.7.3.11");

         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2013 Roderick W. Smith");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2013 Roderick W. Smith");


@@ -163,25 +160,18 @@ 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, L"Distributed under the terms of the GNU GPLv3 license");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Running on:");

-        TempStr = AllocateZeroPool(256 * sizeof(CHAR16));
-        SPrint(TempStr, 255, L" EFI Revision %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1));
-        AddMenuInfoLine(&AboutMenu, TempStr);
+        AddMenuInfoLine(&AboutMenu, PoolPrint(L" EFI Revision %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1)));

 #if defined(EFI32)
         AddMenuInfoLine(&AboutMenu, L" Platform: x86 (32 bit)");
 #elif defined(EFIX64)
 #if defined(EFI32)
         AddMenuInfoLine(&AboutMenu, L" Platform: x86 (32 bit)");
 #elif defined(EFIX64)

-        TempStr = AllocateZeroPool(256 * sizeof(CHAR16));
-        SPrint(TempStr, 255, L" Platform: x86_64 (64 bit); Secure Boot %s", secure_mode() ? L"active" : L"inactive");
-        AddMenuInfoLine(&AboutMenu, TempStr);
+        AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: x86_64 (64 bit); Secure Boot %s",
+                                              secure_mode() ? L"active" : L"inactive"));

 #else
         AddMenuInfoLine(&AboutMenu, L" Platform: unknown");
 #endif
 #else
         AddMenuInfoLine(&AboutMenu, L" Platform: unknown");
 #endif

-        TempStr = AllocateZeroPool(256 * 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(256 * sizeof(CHAR16));
-        SPrint(TempStr, 255, L" Screen Output: %s", egScreenDescription());
-        AddMenuInfoLine(&AboutMenu, TempStr);
+        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()));

         AddMenuInfoLine(&AboutMenu, L"");
 #if defined(__MAKEWITH_GNUEFI)
         AddMenuInfoLine(&AboutMenu, L"Built with GNU-EFI");
         AddMenuInfoLine(&AboutMenu, L"");
 #if defined(__MAKEWITH_GNUEFI)
         AddMenuInfoLine(&AboutMenu, L"Built with GNU-EFI");


@@ -268,26 +258,22 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
     CHAR16                  ErrorInfo[256];
     CHAR16                  *FullLoadOptions = NULL;
     CHAR16                  *Filename = NULL;
     CHAR16                  ErrorInfo[256];
     CHAR16                  *FullLoadOptions = NULL;
     CHAR16                  *Filename = NULL;

+    CHAR16                  *Temp;

 
     if (ErrorInStep != NULL)
         *ErrorInStep = 0;
 
     // set load options
     if (LoadOptions != NULL) {
 
     if (ErrorInStep != NULL)
         *ErrorInStep = 0;
 
     // set load options
     if (LoadOptions != NULL) {

-       MergeStrings(&FullLoadOptions, LoadOptions, 0);
+       FullLoadOptions = StrDuplicate(LoadOptions);

        if ((LoaderType == TYPE_EFI) && (OSType == 'M')) {
            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...
         } // if
        if ((LoaderType == TYPE_EFI) && (OSType == 'M')) {
            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...
         } // if

-    } else { // LoadOptions == NULL
-       // NOTE: We provide a non-null string when no options are specified for safety;
-       // some systems (at least DUET) can hang when launching some programs (such as
-       // an EFI shell) without this.
-       FullLoadOptions = StrDuplicate(L"");
-    }
+    } // if (LoadOptions != NULL)

     if (Verbose)
     if (Verbose)

-       Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions);
+       Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions ? FullLoadOptions : L"");

 
     // load the image into memory (and execute it, in the case of a shim/MOK image).
     ReturnStatus = Status = EFI_NOT_FOUND;  // in case the list is empty
 
     // load the image into memory (and execute it, in the case of a shim/MOK image).
     ReturnStatus = Status = EFI_NOT_FOUND;  // in case the list is empty


@@ -297,6 +283,14 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
        // protect for this condition; but sometimes Volume comes back NULL, so provide
        // an exception. (TODO: Handle this special condition better.)
        if ((LoaderType == TYPE_LEGACY) || (Volume == NULL) || IsValidLoader(Volume->RootDir, Filename)) {
        // protect for this condition; but sometimes Volume comes back NULL, so provide
        // an exception. (TODO: Handle this special condition better.)
        if ((LoaderType == TYPE_LEGACY) || (Volume == NULL) || IsValidLoader(Volume->RootDir, Filename)) {

+          if (Filename) {
+             Temp = PoolPrint(L"\\%s %s", Filename, FullLoadOptions ? FullLoadOptions : L"");
+             if (Temp != NULL) {
+                MyFreePool(FullLoadOptions);
+                FullLoadOptions = Temp;
+             }
+          } // if (Filename)
+

           // NOTE: Below commented-out line could be more efficient if file were read ahead of
           // time and passed as a pre-loaded image to LoadImage(), but it doesn't work on my
           // 32-bit Mac Mini or my 64-bit Intel box when launching a Linux kernel; the
           // NOTE: Below commented-out line could be more efficient if file were read ahead of
           // time and passed as a pre-loaded image to LoadImage(), but it doesn't work on my
           // 32-bit Mac Mini or my 64-bit Intel box when launching a Linux kernel; the


@@ -333,7 +327,7 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
        goto bailout_unload;
     }
     ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions;
        goto bailout_unload;
     }
     ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions;

-    ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16);
+    ChildLoadedImage->LoadOptionsSize = FullLoadOptions ? ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16) : 0;

     // turn control over to the image
     // TODO: (optionally) re-enable the EFI watchdog timer!
 
     // turn control over to the image
     // TODO: (optionally) re-enable the EFI watchdog timer!
 


@@ -480,13 +474,11 @@ static CHAR16 * FindInitrd(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) {
       InitrdVersion = FindNumbers(DirEntry->FileName);
       if (KernelVersion != NULL) {
          if (StriCmp(InitrdVersion, KernelVersion) == 0) {
       InitrdVersion = FindNumbers(DirEntry->FileName);
       if (KernelVersion != NULL) {
          if (StriCmp(InitrdVersion, KernelVersion) == 0) {

-            MergeStrings(&InitrdName, Path, 0);
-            MergeStrings(&InitrdName, DirEntry->FileName, 0);
+            InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName);

          } // if
       } else {
          if (InitrdVersion == NULL) {
          } // if
       } else {
          if (InitrdVersion == NULL) {

-            MergeStrings(&InitrdName, Path, 0);
-            MergeStrings(&InitrdName, DirEntry->FileName, 0);
+            InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName);

          } // if
       } // if/else
       MyFreePool(InitrdVersion);
          } // if
       } // if/else
       MyFreePool(InitrdVersion);


@@ -597,13 +589,13 @@ LOADER_ENTRY *InitializeLoaderEntry(IN LOADER_ENTRY *Entry) {
 // Returns a pointer to a new string. The calling function is responsible for
 // freeing its memory.
 static CHAR16 *AddInitrdToOptions(CHAR16 *Options, CHAR16 *InitrdPath) {
 // Returns a pointer to a new string. The calling function is responsible for
 // freeing its memory.
 static CHAR16 *AddInitrdToOptions(CHAR16 *Options, CHAR16 *InitrdPath) {

-   CHAR16 *NewOptions = NULL;
+   CHAR16 *NewOptions;
+

 
 

-   if (Options != NULL)
-      NewOptions = StrDuplicate(Options);

    if ((InitrdPath != NULL) && !StriSubCmp(L"initrd=", Options)) {
    if ((InitrdPath != NULL) && !StriSubCmp(L"initrd=", Options)) {

-      MergeStrings(&NewOptions, L"initrd=", L' ');
-      MergeStrings(&NewOptions, InitrdPath, 0);
+      NewOptions = PoolPrint(L"%s initrd=%s", Options ? Options : L"", InitrdPath);
+   } else {
+      NewOptions = StrDuplicate(Options);

    }
    return NewOptions;
 } // CHAR16 *AddInitrdToOptions()
    }
    return NewOptions;
 } // CHAR16 *AddInitrdToOptions()


@@ -1368,8 +1360,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) {
       // scan subdirectories of the EFI directory (as per the standard)
       DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter);
       while (DirIterNext(&EfiDirIter, 1, NULL, &EfiDirEntry)) {
       // scan subdirectories of the EFI directory (as per the standard)
       DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter);
       while (DirIterNext(&EfiDirIter, 1, NULL, &EfiDirEntry)) {

-         if (StriCmp(EfiDirEntry->FileName, L"tools") == 0 || (StriCmp(EfiDirEntry->FileName, L"memtest") == 0) ||
-             (StriCmp(EfiDirEntry->FileName, L"memtest86") == 0) || EfiDirEntry->FileName[0] == '.')
+         if (StriCmp(EfiDirEntry->FileName, L"tools") == 0 || EfiDirEntry->FileName[0] == '.')

             continue;   // skip this, doesn't contain boot loaders or is scanned later
          SPrint(FileName, 255, L"EFI\\%s", EfiDirEntry->FileName);
          if (ScanLoaderDir(Volume, FileName, MatchPatterns))
             continue;   // skip this, doesn't contain boot loaders or is scanned later
          SPrint(FileName, 255, L"EFI\\%s", EfiDirEntry->FileName);
          if (ScanLoaderDir(Volume, FileName, MatchPatterns))


@@ -1943,8 +1934,7 @@ static LOADER_ENTRY * AddToolEntry(EFI_HANDLE DeviceHandle, IN CHAR16 *LoaderPat
 
     Entry = AllocateZeroPool(sizeof(LOADER_ENTRY));
 
 
     Entry = AllocateZeroPool(sizeof(LOADER_ENTRY));
 

-    MergeStrings(&TitleStr, L"Start ", 0);
-    MergeStrings(&TitleStr, LoaderTitle, 0);
+    TitleStr = PoolPrint(L"Start %s", LoaderTitle);

     Entry->me.Title = TitleStr;
     Entry->me.Tag = TAG_TOOL;
     Entry->me.Row = 1;
     Entry->me.Title = TitleStr;
     Entry->me.Tag = TAG_TOOL;
     Entry->me.Row = 1;


@@ -2196,12 +2186,36 @@ static VOID ScanForBootloaders(VOID) {
    FinishTextScreen(FALSE);
 } // static VOID ScanForBootloaders()
 
    FinishTextScreen(FALSE);
 } // static VOID ScanForBootloaders()
 

+// Locate a single tool from the specified Locations using one of the
+// specified Names and add it to the menu.
+static VOID FindTool(CHAR16 *Locations, CHAR16 *Names, CHAR16 *Description, UINTN Icon) {
+   UINTN j = 0, k, VolumeIndex;
+   CHAR16 *DirName, *FileName, *PathName, FullDescription[256];
+
+   while ((DirName = FindCommaDelimited(Locations, j++)) != NULL) {
+      k = 0;
+      while ((FileName = FindCommaDelimited(Names, k++)) != NULL) {
+         PathName = StrDuplicate(DirName);
+         MergeStrings(&PathName, FileName, (StriCmp(PathName, L"\\") == 0) ? 0 : L'\\');
+         for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) {
+            if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, PathName))) {
+               SPrint(FullDescription, 255, L"%s at %s on %s", Description, PathName, Volumes[VolumeIndex]->VolName);
+               AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, PathName, FullDescription, BuiltinIcon(Icon), 'S', FALSE);
+            } // if
+         } // for
+         MyFreePool(PathName);
+         MyFreePool(FileName);
+      } // while Names
+      MyFreePool(DirName);
+   } // while Locations
+} // VOID FindTool()
+

 // Add the second-row tags containing built-in and external tools (EFI shell,
 // reboot, etc.)
 static VOID ScanForTools(VOID) {
 // Add the second-row tags containing built-in and external tools (EFI shell,
 // reboot, etc.)
 static VOID ScanForTools(VOID) {

-   CHAR16 *FileName = NULL, *MokLocations, *MokName, *MemtestName, *PathName, Description[256];
+   CHAR16 *FileName = NULL, *MokLocations, Description[256];

    REFIT_MENU_ENTRY *TempMenuEntry;
    REFIT_MENU_ENTRY *TempMenuEntry;

-   UINTN i, j, k, VolumeIndex;
+   UINTN i, j, VolumeIndex;

    UINT64 osind;
    CHAR8 *b = 0;
 
    UINT64 osind;
    CHAR8 *b = 0;
 


@@ -2217,21 +2231,25 @@ static VOID ScanForTools(VOID) {
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_SHUTDOWN);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_SHUTDOWN);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;

+

          case TAG_REBOOT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryReset);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_RESET);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;
          case TAG_REBOOT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryReset);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_RESET);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;

+

          case TAG_ABOUT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryAbout);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;
          case TAG_ABOUT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryAbout);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;

+

          case TAG_EXIT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryExit);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_EXIT);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;
          case TAG_EXIT:
             TempMenuEntry = CopyMenuEntry(&MenuEntryExit);
             TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_EXIT);
             AddMenuEntry(&MainMenu, TempMenuEntry);
             break;

+

          case TAG_FIRMWARE:
             if (EfivarGetRaw(&GlobalGuid, L"OsIndicationsSupported", &b, &j) == EFI_SUCCESS) {
                osind = (UINT64)*b;
          case TAG_FIRMWARE:
             if (EfivarGetRaw(&GlobalGuid, L"OsIndicationsSupported", &b, &j) == EFI_SUCCESS) {
                osind = (UINT64)*b;


@@ -2242,6 +2260,7 @@ static VOID ScanForTools(VOID) {
                } // if
             } // if
             break;
                } // if
             } // if
             break;

+

          case TAG_SHELL:
             j = 0;
             while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) {
          case TAG_SHELL:
             j = 0;
             while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) {


@@ -2252,6 +2271,7 @@ static VOID ScanForTools(VOID) {
                MyFreePool(FileName);
             } // while
             break;
                MyFreePool(FileName);
             } // while
             break;

+

          case TAG_GPTSYNC:
             j = 0;
             while ((FileName = FindCommaDelimited(GPTSYNC_NAMES, j++)) != NULL) {
          case TAG_GPTSYNC:
             j = 0;
             while ((FileName = FindCommaDelimited(GPTSYNC_NAMES, j++)) != NULL) {


@@ -2278,45 +2298,11 @@ static VOID ScanForTools(VOID) {
             break;
 
          case TAG_MOK_TOOL:
             break;
 
          case TAG_MOK_TOOL:

-            j = 0;
-            while ((FileName = FindCommaDelimited(MokLocations, j++)) != NULL) {
-               k = 0;
-               while ((MokName = FindCommaDelimited(MOK_NAMES, k++)) != NULL) {
-                  PathName = StrDuplicate(FileName);
-                  MergeStrings(&PathName, MokName, (StriCmp(PathName, L"\\") == 0) ? 0 : L'\\');
-                  for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) {
-                     if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, PathName))) {
-                        SPrint(Description, 255, L"MOK utility at %s on %s", PathName, Volumes[VolumeIndex]->VolName);
-                        AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, PathName, Description,
-                                     BuiltinIcon(BUILTIN_ICON_TOOL_MOK_TOOL), 'S', FALSE);
-                     } // if
-                  } // for
-                  MyFreePool(PathName);
-                  MyFreePool(MokName);
-               } // while MOK_NAMES
-               MyFreePool(FileName);
-            } // while MokLocations
+            FindTool(MokLocations, MOK_NAMES, L"MOK utility utility", BUILTIN_ICON_TOOL_MOK_TOOL);

             break;
 
          case TAG_MEMTEST:
             break;
 
          case TAG_MEMTEST:

-            j = 0;
-            while ((FileName = FindCommaDelimited(MEMTEST_LOCATIONS, j++)) != NULL) {
-               k = 0;
-               while ((MemtestName = FindCommaDelimited(MEMTEST_NAMES, k++)) != NULL) {
-                  PathName = StrDuplicate(FileName);
-                  MergeStrings(&PathName, MemtestName, (StriCmp(PathName, L"\\") == 0) ? 0 : L'\\');
-                  for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) {
-                     if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, PathName))) {
-                        SPrint(Description, 255, L"Memory test utility at %s on %s", PathName, Volumes[VolumeIndex]->VolName);
-                        AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, PathName, Description,
-                                     BuiltinIcon(BUILTIN_ICON_TOOL_MEMTEST), 'S', FALSE);
-                     } // if
-                  } // for
-                  MyFreePool(PathName);
-                  MyFreePool(MemtestName);
-               } // while MEMTEST_NAMES
-               MyFreePool(FileName);
-            } // while MEMTEST_LOCATIONS
+            FindTool(MEMTEST_LOCATIONS, MEMTEST_NAMES, L"Memory test utility", BUILTIN_ICON_TOOL_MEMTEST);

             break;
 
       } // switch()
             break;
 
       } // switch()