From 45819ae8739dea4a9710626b5817313e63b07c1a Mon Sep 17 00:00:00 2001
From: srs5694 <srs5694@users.sourceforge.net>
Date: Sun, 18 May 2014 19:27:24 -0400
Subject: [PATCH] Fixed very minor GUID-interpretation bug and adjusted
 refind.conf-sample to reference .png rather than .icns icons.

---
 NEWS.txt           | 3 +++
 refind.conf-sample | 8 ++++----
 refind/lib.c       | 7 ++++---
 refind/main.c      | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index 05ec22f..fac4224 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,9 @@
 0.8.2 (5/??/2014):
 ------------------
 
+- Fixed bug that could misidentify a not-quite-GUID as a GUID in a
+  manual boot stanza's "volume" line.
+
 - I've updated my personal build system, and therefore the rEFInd Makefiles
   and related files, to use TianoCore UDK2014 rather than UDK2010.
 
diff --git a/refind.conf-sample b/refind.conf-sample
index 9355a1f..30f62b7 100644
--- a/refind.conf-sample
+++ b/refind.conf-sample
@@ -392,7 +392,7 @@ scan_all_linux_kernels
 # specification. Also note that a leading slash is optional in file
 # specifications.
 menuentry Linux {
-	icon EFI/refind/icons/os_linux.icns
+	icon EFI/refind/icons/os_linux.png
 	volume KERNELS
 	loader bzImage-3.3.0-rc7
 	initrd initrd-3.3.0.img
@@ -404,7 +404,7 @@ menuentry Linux {
 # its GRUB 2 boot loader. Note uses of Linux-style forward slashes
 menuentry Ubuntu {
 	loader /EFI/ubuntu/grubx64.efi
-	icon /EFI/refined/icons/os_linux.icns
+	icon /EFI/refined/icons/os_linux.png
 	disabled
 }
 
@@ -429,7 +429,7 @@ menuentry "Windows 7" {
 # could initialize hardware and then launch an OS, or it could
 # do something entirely different.
 menuentry "Windows via shell script" {
-	icon \EFI\refind\icons\os_win.icns
+	icon \EFI\refind\icons\os_win.png
 	loader \EFI\tools\shell.efi
 	options "fs0:\EFI\tools\launch_windows.nsh"
 	disabled
@@ -442,7 +442,7 @@ menuentry "Windows via shell script" {
 # certainly need to change the "volume" line for this example
 # to work.
 menuentry "My Mac OS X" {
-	icon \EFI\refind\icons\os_mac.icns
+	icon \EFI\refind\icons\os_mac.png
 	volume "OS X boot"
 	loader \System\Library\CoreServices\boot.efi
 	disabled
diff --git a/refind/lib.c b/refind/lib.c
index b4dc2ec..12b5ce3 100644
--- a/refind/lib.c
+++ b/refind/lib.c
@@ -2025,11 +2025,12 @@ BOOLEAN IsGuid(CHAR16 *UnknownString) {
 
    for (i = 0; i < Length; i++) {
       a = UnknownString[i];
-      if (((i == 8) || (i == 13) || (i == 18) || (i == 23)) && (a != '-')) {
-         retval = FALSE;
+      if ((i == 8) || (i == 13) || (i == 18) || (i == 23)) {
+         if (a != '-')
+            retval = FALSE;
       } else if (((a < 'a') || (a > 'f')) && ((a < 'A') || (a > 'F')) && ((a < '0') && (a > '9'))) {
          retval = FALSE;
-      } // if/else
+      } // if/else if
    } // for
    return retval;
 } // BOOLEAN IsGuid()
diff --git a/refind/main.c b/refind/main.c
index 45d544c..da6026d 100644
--- a/refind/main.c
+++ b/refind/main.c
@@ -168,7 +168,7 @@ static VOID AboutrEFInd(VOID)
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.1.1");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.1.2");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2014 Roderick W. Smith");
-- 
2.39.2