X-Git-Url: https://code.delx.au/refind/blobdiff_plain/4de918f70e9382d26cc9f2047a3c1fb1b7ca12a1..65eb839a6d8d68a439056473a0d3728dfd39d2c4:/refind/main.c

diff --git a/refind/main.c b/refind/main.c
index 1f57438..8dd041e 100644
--- a/refind/main.c
+++ b/refind/main.c
@@ -58,8 +58,10 @@
 #define MACOSX_LOADER_PATH      L"System\\Library\\CoreServices\\boot.efi"
 #if defined (EFIX64)
 #define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\shellx64.efi"
+#define DRIVER_DIRS             L"drivers,drivers_x64"
 #elif defined (EFI32)
 #define SHELL_NAMES             L"\\EFI\\tools\\shell.efi,\\shellia32.efi"
+#define DRIVER_DIRS             L"drivers,drivers_ia32"
 #else
 #define SHELL_NAMES             L"\\EFI\\tools\\shell.efi"
 #endif
@@ -104,7 +106,7 @@ static VOID AboutrEFInd(VOID)
 {
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.5");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.4.0");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
@@ -701,7 +703,13 @@ LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN
       Entry->me.Title = PoolPrint(L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath, Volume->VolName);
       Entry->me.Row = 0;
       Entry->me.BadgeImage = Volume->VolBadgeImage;
-      Entry->LoaderPath = StrDuplicate(LoaderPath);
+      if ((LoaderPath != NULL) && (LoaderPath[0] != L'\\')) {
+         Entry->LoaderPath = StrDuplicate(L"\\");
+      } else {
+         Entry->LoaderPath = NULL;
+      }
+      MergeStrings(&(Entry->LoaderPath), LoaderPath, 0);
+//      Entry->LoaderPath = StrDuplicate(LoaderPath);
       Entry->VolName = Volume->VolName;
       Entry->DevicePath = FileDevicePath(Volume->DeviceHandle, Entry->LoaderPath);
       SetLoaderDefaults(Entry, LoaderPath, Volume);
@@ -1366,16 +1374,22 @@ Done:
 // file line.
 static VOID LoadDrivers(VOID)
 {
-    CHAR16        *Directory;
+    CHAR16        *Directory, *SelfDirectory;
     UINTN         i = 0, Length, NumFound = 0;
 
-    // load drivers from the "drivers" subdirectory of rEFInd's home directory
-    Directory = StrDuplicate(SelfDirPath);
-    CleanUpPathNameSlashes(Directory);
-    MergeStrings(&Directory, L"drivers", L'\\');
-    NumFound += ScanDriverDir(Directory);
+    // load drivers from the subdirectories of rEFInd's home directory specified
+    // in the DRIVER_DIRS constant.
+    while ((Directory = FindCommaDelimited(DRIVER_DIRS, i++)) != NULL) {
+       SelfDirectory = StrDuplicate(SelfDirPath);
+       CleanUpPathNameSlashes(SelfDirectory);
+       MergeStrings(&SelfDirectory, Directory, L'\\');
+       NumFound += ScanDriverDir(SelfDirectory);
+       FreePool(Directory);
+       FreePool(SelfDirectory);
+    }
 
     // Scan additional user-specified driver directories....
+    i = 0;
     while ((Directory = FindCommaDelimited(GlobalConfig.DriverDirs, i++)) != NULL) {
        CleanUpPathNameSlashes(Directory);
        Length = StrLen(Directory);
@@ -1393,18 +1407,6 @@ static VOID ScanForBootloaders(VOID) {
    UINTN i;
 
    ScanVolumes();
-   // Commented-out below: Was part of an attempt to get rEFInd to
-   // re-scan disk devices on pressing Esc; but doesn't work (yet), so
-   // removed....
-//     MainMenu.Title = StrDuplicate(L"Main Menu 2");
-//     MainMenu.TitleImage = NULL;
-//     MainMenu.InfoLineCount = 0;
-//     MainMenu.InfoLines = NULL;
-//     MainMenu.EntryCount = 0;
-//     MainMenu.Entries = NULL;
-//     MainMenu.TimeoutSeconds = 20;
-//     MainMenu.TimeoutText = StrDuplicate(L"Automatic boot");
-   //    DebugPause();
 
    // scan for loaders and tools, add them to the menu
    for (i = 0; i < NUM_SCAN_OPTIONS; i++) {