From deb53fbf9687d73d13ff1547f95fcee240224fdc Mon Sep 17 00:00:00 2001 From: srs5694 Date: Fri, 13 Feb 2015 21:01:19 -0500 Subject: [PATCH] Work around problem with (bogus, I think) "invalid parameter" errors from some EFIs when scanning directories. --- NEWS.txt | 12 +++++++++++- refind/main.c | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 724ad0d..93f0eff 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,4 +1,14 @@ -0.8.6 (2/8/2016): +0.8.7 (?/??/2015): +------------------ + +- Fixed more instances of "invalid parameter" errors on some EFIs. + +- Improved Secure Boot detection in install.sh. + +- install.sh should no longer complain when copying Shim or MokManager over + itself. + +0.8.6 (2/8/2015): ----------------- - Removed special case of ignoring an HFS+ name of "HFS+ volume", since the diff --git a/refind/main.c b/refind/main.c index 8c27da2..a7da984 100644 --- a/refind/main.c +++ b/refind/main.c @@ -166,7 +166,7 @@ static VOID AboutrEFInd(VOID) if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.6.1"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.6.2"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith"); @@ -1472,7 +1472,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { ScanFallbackLoader = FALSE; } // while() Status = DirIterClose(&EfiDirIter); - if (Status != EFI_NOT_FOUND) + if ((Status != EFI_NOT_FOUND) && (Status != EFI_INVALID_PARAMETER)) CheckError(Status, L"while scanning the EFI directory"); // Scan user-specified (or additional default) directories.... @@ -1613,7 +1613,7 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) L"", TYPE_EFI, DirEntry->FileName, 0, NULL, FALSE, TRUE); } Status = DirIterClose(&DirIter); - if (Status != EFI_NOT_FOUND) { + if ((Status != EFI_NOT_FOUND) && (Status != EFI_INVALID_PARAMETER)) { SPrint(FileName, 255, L"while scanning the %s directory", Path); CheckError(Status, FileName); } -- 2.39.2