Added "windows_recovery" option to "showtools" token and

[refind] / refind / icns.c

diff --git a/refind/icns.c b/refind/icns.c
index 7b3af026b4509c6b8db3efb310a26c429dfc2c83..45c50490cc9b625cb2f720efcbadcc8c19982196 100644 (file)
--- a/refind/icns.c
+++ b/refind/icns.c
@@ -55,11 +55,14 @@ BUILTIN_ICON BuiltinIconTable[BUILTIN_ICON_COUNT] = {
    { NULL, L"func_reset", 48 },
    { NULL, L"func_shutdown", 48 },
    { NULL, L"func_exit", 48 },
+   { NULL, L"func_firmware", 48 },
    { NULL, L"tool_shell", 48 },
    { NULL, L"tool_part", 48 },
    { NULL, L"tool_rescue", 48 },
    { NULL, L"tool_apple_rescue", 48 },
+   { NULL, L"tool_windows_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 },
@@ -122,23 +125,6 @@ EG_IMAGE * LoadOSIcon(IN CHAR16 *OSIconName OPTIONAL, IN CHAR16 *FallbackIconNam
 } /* EG_IMAGE * LoadOSIcon() */
 
 
-// Load an image from a .icns or .png file. FileNames contains a comma-delimited
-// list of potential filanems; the function tries each in turn until it finds
-// a loadable icon. If no file has a valid icon, it returns NULL.
-EG_IMAGE * LoadIcns(IN EFI_FILE_HANDLE BaseDir, IN CHAR16 *FileNames, IN UINTN PixelSize) {
-   CHAR16   *FileName;
-   EG_IMAGE *Image = NULL;
-   UINTN    Index = 0;
-
-   if (GlobalConfig.TextOnly)      // skip loading if it's not used anyway
-      return NULL;
-
-   while (((FileName = FindCommaDelimited(FileNames, Index++)) != NULL) && (Image == NULL)) {
-      Image = egLoadIcon(BaseDir, FileName, PixelSize);
-   }
-   return Image;
-} // EG_IMAGE * LoadIcns()
-
 static EG_PIXEL BlackPixel  = { 0x00, 0x00, 0x00, 0 };
 //static EG_PIXEL YellowPixel = { 0x00, 0xff, 0xff, 0 };