Improved text-mode display's initial list & scrolling

[refind] / refind / main.c

diff --git a/refind/main.c b/refind/main.c
index 21d8aa837579c2403272f46e21b141cf284d032e..8ea0fc5d746d60e88660c889cc117536bf212c74 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -104,7 +104,7 @@ static VOID AboutrEFInd(VOID)
 {
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.0.2");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.2.1");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
@@ -736,6 +736,7 @@ static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *P
                 SPrint(FileName, 255, L"\\%s\\%s", Path, DirEntry->FileName);
           else
                 SPrint(FileName, 255, L"\\%s", DirEntry->FileName);
+          CleanUpPathNameSlashes(FileName);
           NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST));
           if (NewLoader != NULL) {
              NewLoader->FileName = StrDuplicate(FileName);
@@ -792,7 +793,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) {
       }
 
       // scan the root directory for EFI executables
-      ScanLoaderDir(Volume, NULL, MatchPatterns);
+      ScanLoaderDir(Volume, L"\\", MatchPatterns);
 
       // scan subdirectories of the EFI directory (as per the standard)
       DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter);
@@ -1109,7 +1110,7 @@ static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) {
          Volume->BlockIOOffset == 0 &&
          Volume->OSName == NULL)
          // this is a whole disk (MBR) entry; hide if we have entries for partitions
-      HideIfOthersFound = TRUE;
+         HideIfOthersFound = TRUE;
    }
    if (HideIfOthersFound) {
       // check for other bootable entries on the same disk
@@ -1172,10 +1173,10 @@ static VOID ScanLegacyExternal(VOID)
 
 static VOID StartTool(IN LOADER_ENTRY *Entry)
 {
-    BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6);  // assumes "Start <title>" as assigned below
-    StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath),
-                  Basename(Entry->LoaderPath), NULL, TRUE);
-    FinishExternalScreen();
+   BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6);  // assumes "Start <title>" as assigned below
+   StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath),
+                 Basename(Entry->LoaderPath), NULL, TRUE);
+   FinishExternalScreen();
 } /* static VOID StartTool() */
 
 static LOADER_ENTRY * AddToolEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN EG_IMAGE *Image,