Don't unload drivers immediately after loading them. (Fix required for

[refind] / refind / global.h

diff --git a/refind/global.h b/refind/global.h
index 5058d9d0c9979a36ebea9314adff9da1282242bb..4397db831f526e5c2e7b766dd80ce2039afbd6c9 100644 (file)
--- a/refind/global.h
+++ b/refind/global.h
@@ -50,8 +50,8 @@
 #include <efilib.h>
 #else
 #include "../include/tiano_includes.h"
-#include "../EfiLib/GenericBdsLib.h"
 #endif
+#include "../EfiLib/GenericBdsLib.h"
 
 #include "libeg.h"
 
@@ -146,9 +146,10 @@
 // Directories to search for memtest86....
 #define MEMTEST_LOCATIONS       L"EFI\\tools,EFI\\tools\\memtest86,EFI\\tools\\memtest,EFI\\memtest86,EFI\\memtest"
 // Files that may be Windows recovery files
-#define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi"
+#define WINDOWS_RECOVERY_FILES  L"EFI\\Microsoft\\Boot\\LrsBootmgr.efi,Recovery:\\EFI\\BOOT\\bootx64.efi,Recovery:\\EFI\\BOOT\\bootia32.efi"
 
-#define NULL_GUID_VALUE { 00000000, 0000, 0000, {0000, 0000, 0000, 0000} };
+#define NULL_GUID_VALUE { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
+#define REFIND_GUID_VALUE { 0x36D08FA7, 0xCF0B, 0x42F5, {0x8F, 0x14, 0x68, 0xDF, 0x73, 0xED, 0x37, 0x40} };
 
 //
 // global definitions
@@ -174,6 +175,7 @@ typedef struct {
    EFI_HANDLE          DeviceHandle;
    EFI_FILE            *RootDir;
    CHAR16              *VolName;
+   CHAR16              *PartName;
    EFI_GUID            VolUuid;
    EFI_GUID            PartGuid;
    UINTN               VolNumber;
@@ -235,9 +237,7 @@ typedef struct {
 typedef struct {
    REFIT_MENU_ENTRY  me;
    REFIT_VOLUME      *Volume;
-#ifndef __MAKEWITH_GNUEFI
    BDS_COMMON_OPTION *BdsOption;
-#endif
    CHAR16            *LoadOptions;
    BOOLEAN           Enabled;
 } LEGACY_ENTRY;
@@ -245,6 +245,7 @@ typedef struct {
 typedef struct {
    BOOLEAN     TextOnly;
    BOOLEAN     ScanAllLinux;
+   BOOLEAN     DeepLegacyScan;
    UINTN       RequestedScreenWidth;
    UINTN       RequestedScreenHeight;
    UINTN       BannerBottomEdge;