New memory tester icon; refinement of progam-launch code.

diff --git a/BUILDING.txt b/BUILDING.txt
index a553148ef9e19d8bb8db17ac29b644685247e5d0..f1a2e63f66a22313993cd572582c198f56721cf2 100644 (file)
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -93,7 +93,7 @@ you MUST install the kit from source code using its own unusual compilation
 procedure. The installation documentation also omits at least one step and
 is a bit unclear about others. Here's how I installed the toolkit:
 
 procedure. The installation documentation also omits at least one step and
 is a bit unclear about others. Here's how I installed the toolkit:
 

-1) Download UDK2010.SR1.UP1 from
+1) Download UDK2010.SR1.UP1.P1 from

    https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UDK2010.
 
 2) Type "mkdir /usr/local/UDK2010". You can use another directory, but the
    https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UDK2010.
 
 2) Type "mkdir /usr/local/UDK2010". You can use another directory, but the


@@ -103,8 +103,8 @@ is a bit unclear about others. Here's how I installed the toolkit:
 
 3) Type "cd /usr/local/UDK2010".
 
 
 3) Type "cd /usr/local/UDK2010".
 

-3) Unzip the downloaded file (UDK2010.SR1.UP1.Complete.MyWorkSpace.zip) in
-   the current directory (/usr/local/UDK2010). This creates a handful of
+3) Unzip the downloaded file (UDK2010.SR1.UP1.P1.Complete.MyWorkSpace.zip)
+   in the current directory (/usr/local/UDK2010). This creates a handful of

    files, including a tarball and a couple of .zip files.
 
 4) Type "unzip UDK2010.SR1.UP1.MyWorkSpace.zip". This extracts the
    files, including a tarball and a couple of .zip files.
 
 4) Type "unzip UDK2010.SR1.UP1.MyWorkSpace.zip". This extracts the


@@ -131,7 +131,7 @@ is a bit unclear about others. Here's how I installed the toolkit:
      "IA32 X64".
    - TOOL_CHAIN_TAG = GCC46 (or other value depending on your GCC version;
      type "gcc -v" to learn your GCC version number). Note that GCC 4.7
      "IA32 X64".
    - TOOL_CHAIN_TAG = GCC46 (or other value depending on your GCC version;
      type "gcc -v" to learn your GCC version number). Note that GCC 4.7

-     doesn't have its own entry, so use GCC46 for GCC 4.7.
+     and 4.8 don't have their own entries, so use GCC46 for them.

    The TianoCore Makefiles read some of these variables from this file
    and use them when accessing directories, so be sure to type these
    entries in the case specified.
    The TianoCore Makefiles read some of these variables from this file
    and use them when accessing directories, so be sure to type these
    entries in the case specified.

diff --git a/CREDITS.txt b/CREDITS.txt
index d57d9ab0f215159e7f9cd8898c47d7f8435e7738..301cace1788e35d0f0738147935c545de217a9ea 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -76,6 +76,9 @@ Icons and graphics:
 * The keys icon for MOK keys management comes from the
   kdeartwork-iconthemes-4.8.5 package on Gentoo.
 
 * The keys icon for MOK keys management comes from the
   kdeartwork-iconthemes-4.8.5 package on Gentoo.
 

+* The memtest icon (tool_memtest.icns) was originally memory.png from
+  the Gentoo kdeartwork-iconthemes-4.10.5 icons package.
+

 * The gummiboot icon is taken from the gummiboot Web page
   (http://freedesktop.org/wiki/Software/gummiboot) and scaled down
   slightly.
 * The gummiboot icon is taken from the gummiboot Web page
   (http://freedesktop.org/wiki/Software/gummiboot) and scaled down
   slightly.

diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html
index b7e0c05f7aab35afa0d256883b6e6182ee781d58..a41624c1894c6e9d6316b99d8d2e92d32c56a7d7 100644 (file)
--- a/docs/refind/configfile.html
+++ b/docs/refind/configfile.html
@@ -243,8 +243,8 @@ timeout 20
 </tr>
 <tr>
    <td><tt>showtools</tt></td>
 </tr>
 <tr>
    <td><tt>showtools</tt></td>

-   <td><tt>shell</tt>, <tt>gptsync</tt>, <tt>apple_recovery</tt>, <tt>mok_tool</tt>, <tt>about</tt>, <tt>exit</tt>, <tt>shutdown</tt>, <tt>reboot</tt>, and <tt>firmware</tt></td>
-   <td>Specifies which tool tags to display on the second row. <tt>shell</tt> launches an EFI shell, <tt>gptsync</tt> launches a tool that creates a hybrid MBR, <tt>apple_recovery</tt> boots the OS X Recovery HD, <tt>mok_tool</tt> launches a tool to manage Machine Owner Keys (MOKs) on systems with Secure Boot active, <tt>about</tt> displays information about the program, <tt>exit</tt> terminates rEFInd, <tt>shutdown</tt> shuts down the computer (or reboots it, on some UEFI PCs), <tt>reboot</tt> reboots the computer, and <tt>firmware</tt> reboots the computer into the computer's own setup utility. The tags appear in the order in which you specify them. The default is <tt>shell, apple_recovery, mok_tool, about, shutdown, reboot, firmware</tt>. Note that the <tt>shell</tt>, <tt>apple_recovery</tt>, and <tt>mok_tool</tt> options all require the presence of programs not included with rEFInd. The <tt>gptsync</tt> option requires use of a like-named program which, although it ships with rEFInd 0.6.9 and later, is not installed by default except under OS X. See the <a href="installing.html#addons">"Installing Additional Components"</a> section of the <a href="installing.html">Installing rEFInd</a> page for pointers to the shell and <tt>gptsync</tt> programs. The <tt>apple_recovery</tt> option will appear only if you've got an Apple Recovery HD partition (which has a boot loader called <tt>com.apple.recovery.boot/boot.efi</tt>). The <tt>firmware</tt> option works only on computers that support this option; on other computers, the option is quietly ignored. See the <a href="secureboot.html">Secure Boot</a> page for information on Secure Boot and MOK management.</td>
+   <td><tt>shell</tt>, <tt>memtest</tt>, <tt>gptsync</tt>, <tt>apple_recovery</tt>, <tt>mok_tool</tt>, <tt>about</tt>, <tt>exit</tt>, <tt>shutdown</tt>, <tt>reboot</tt>, and <tt>firmware</tt></td>
+   <td>Specifies which tool tags to display on the second row. <tt>shell</tt> launches an EFI shell, <tt>memtest</tt> (or <tt>memtest86</tt> launches the <a href="http://www.memtest86.com/download.htm">memtest86</tt> program, <tt>gptsync</tt> launches a tool that creates a hybrid MBR, <tt>apple_recovery</tt> boots the OS X Recovery HD, <tt>mok_tool</tt> launches a tool to manage Machine Owner Keys (MOKs) on systems with Secure Boot active, <tt>about</tt> displays information about the program, <tt>exit</tt> terminates rEFInd, <tt>shutdown</tt> shuts down the computer (or reboots it, on some UEFI PCs), <tt>reboot</tt> reboots the computer, and <tt>firmware</tt> reboots the computer into the computer's own setup utility. The tags appear in the order in which you specify them. The default is <tt>shell, memtest, apple_recovery, mok_tool, about, shutdown, reboot, firmware</tt>. Note that the <tt>shell</tt>, <tt>memtest</tt>, <tt>apple_recovery</tt>, and <tt>mok_tool</tt> options all require the presence of programs not included with rEFInd. The <tt>gptsync</tt> option requires use of a like-named program which, although it ships with rEFInd 0.6.9 and later, is not installed by default except under OS X. See the <a href="installing.html#addons">"Installing Additional Components"</a> section of the <a href="installing.html">Installing rEFInd</a> page for pointers to the shell, memtest86, and <tt>gptsync</tt> programs. The <tt>apple_recovery</tt> option will appear only if you've got an Apple Recovery HD partition (which has a boot loader called <tt>com.apple.recovery.boot/boot.efi</tt>). The <tt>firmware</tt> option works only on computers that support this option; on other computers, the option is quietly ignored. See the <a href="secureboot.html">Secure Boot</a> page for information on Secure Boot and MOK management.</td>

 </tr>
 <tr>
    <td><tt>font</tt></td>
 </tr>
 <tr>
    <td><tt>font</tt></td>

diff --git a/docs/refind/installing.html b/docs/refind/installing.html
index cfbaa0665802d1fd002da466cb960bda66b10c43..dcb4a7e0a3b3b4aee89bf1155b46f0b74074e4b8 100644 (file)
--- a/docs/refind/installing.html
+++ b/docs/refind/installing.html
@@ -182,7 +182,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
 <li class="tight"><a href="#addons">Installing Additional Components</a></li>
 
 
 <li class="tight"><a href="#addons">Installing Additional Components</a></li>
 

-<li class="tight"><a href="#sluggish">Fixing a Sluggish Macintosh Boot</a>
+<li class="tight"><a href="#sluggish">Fixing a  Macintosh Boot</a>

 
    <ul>
 
 
    <ul>
 


@@ -928,7 +928,7 @@ $ <b>ioreg -l -p IODeviceTree | grep firmware-abi</b>
 <h3>Using the Fallback Filename</h3>
 </a>
 
 <h3>Using the Fallback Filename</h3>
 </a>
 

-<p>I've received one report that installing rEFInd to the ESP using the fallback filename (<tt>EFI/BOOT/bootx64.efi</tt> on most systems, or <tt>EFI/BOOT/bootia32.efi</tt> on very old Macs) can work around the problem.</p>
+<p>I've received a few reports that installing rEFInd to the ESP using the fallback filename (<tt>EFI/BOOT/bootx64.efi</tt> on most systems, or <tt>EFI/BOOT/bootia32.efi</tt> on very old Macs) can work around the problem.</p>

 
 <a name="clearing">
 <h3>Clearing the NVRAM Entries</h3>
 
 <a name="clearing">
 <h3>Clearing the NVRAM Entries</h3>

diff --git a/refind/icns.c b/refind/icns.c
index 4a6b4d18423ff6585083ffd5fd303219684151f3..a61bca365f70f6783da53165c63dbb5949f96ae0 100644 (file)
--- a/refind/icns.c
+++ b/refind/icns.c
@@ -61,6 +61,7 @@ BUILTIN_ICON BuiltinIconTable[BUILTIN_ICON_COUNT] = {
    { NULL, L"tool_rescue", 48 },
    { NULL, L"tool_apple_rescue", 48 },
    { NULL, L"tool_mok_tool", 48 },
    { NULL, L"tool_rescue", 48 },
    { NULL, L"tool_apple_rescue", 48 },
    { NULL, L"tool_mok_tool", 48 },

+   { NULL, L"tool_memtest", 48 },

    { NULL, L"vol_internal", 32 },
    { NULL, L"vol_external", 32 },
    { NULL, L"vol_optical", 32 },
    { NULL, L"vol_internal", 32 },
    { NULL, L"vol_external", 32 },
    { NULL, L"vol_optical", 32 },

diff --git a/refind/icns.h b/refind/icns.h
index f709b42ba7ece9a2da552d3a13a2324eafe870aa..507f365b7f021d391d18b15633e28a658711d4b2 100644 (file)
--- a/refind/icns.h
+++ b/refind/icns.h
@@ -65,10 +65,11 @@ EG_IMAGE * BuiltinIcon(IN UINTN Id);
 #define BUILTIN_ICON_TOOL_RESCUE       (7)
 #define BUILTIN_ICON_TOOL_APPLE_RESCUE (8)
 #define BUILTIN_ICON_TOOL_MOK_TOOL     (9)
 #define BUILTIN_ICON_TOOL_RESCUE       (7)
 #define BUILTIN_ICON_TOOL_APPLE_RESCUE (8)
 #define BUILTIN_ICON_TOOL_MOK_TOOL     (9)

-#define BUILTIN_ICON_VOL_INTERNAL      (10)
-#define BUILTIN_ICON_VOL_EXTERNAL      (11)
-#define BUILTIN_ICON_VOL_OPTICAL       (12)
-#define BUILTIN_ICON_COUNT             (13)
+#define BUILTIN_ICON_TOOL_MEMTEST      (10)
+#define BUILTIN_ICON_VOL_INTERNAL      (11)
+#define BUILTIN_ICON_VOL_EXTERNAL      (12)
+#define BUILTIN_ICON_VOL_OPTICAL       (13)
+#define BUILTIN_ICON_COUNT             (14)

 
 #endif
 
 
 #endif
 

diff --git a/refind/main.c b/refind/main.c
index 37a0b18ec7e0e11b55163fe7d135f04eeaa18884..c35ab1fa604d7beac79e60a43255b9a36e5f2b94 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -155,7 +155,7 @@ static VOID AboutrEFInd(VOID)
 
     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.6");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.7.3.9");

         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");


@@ -274,21 +274,17 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
 
     // set load options
     if (LoadOptions != NULL) {
 
     // set load options
     if (LoadOptions != NULL) {

-        if (LoaderType == TYPE_EFI) {
-            MergeStrings(&FullLoadOptions, LoadOptions, L' ');
-            if (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 {
-            MergeStrings(&FullLoadOptions, LoadOptions, 0);
-        } // if/else
+       MergeStrings(&FullLoadOptions, LoadOptions, 0);
+       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.
     } 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" ");
+       FullLoadOptions = StrDuplicate(L"");

     }
     if (Verbose)
        Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions);
     }
     if (Verbose)
        Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions);


@@ -2313,7 +2309,7 @@ static VOID ScanForTools(VOID) {
                      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,
                      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_FUNC_FIRMWARE), 'S', FALSE);
+                                     BuiltinIcon(BUILTIN_ICON_TOOL_MEMTEST), 'S', FALSE);

                      } // if
                   } // for
                   MyFreePool(PathName);
                      } // if
                   } // for
                   MyFreePool(PathName);