tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollback the patch 15054. 

Signed-off-by: Eric Dong <eric.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15059 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2014-01-08 08:21:22 +00:00 committed by ydong10
parent 6f497f8f71
commit 0b716fd764
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
View File

@ -1,7 +1,7 @@
/** @file
File explorer related functions.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -140,6 +140,9 @@ UpdateFileExplorer (
NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
if (NewFileContext->IsDir ) {
CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
RemoveEntryList (&NewMenuEntry->Link);
BOpt_FreeMenu (&DirectoryMenu);
Status = BOpt_FindFiles (CallbackData, NewMenuEntry);
if (EFI_ERROR (Status)) {
@ -147,10 +150,10 @@ UpdateFileExplorer (
goto exit;
}
CreateMenuStringToken (CallbackData, CallbackData->FeHiiHandle, &DirectoryMenu);
BOpt_DestroyMenuEntry (NewMenuEntry);
UpdateFileExplorePage (CallbackData, &DirectoryMenu);
CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
} else {
switch (CallbackData->FeCurrentState) {
case FileExplorerStateBootFromFile:

8
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
View File

@ -1,7 +1,7 @@
/** @file
Internal file explorer functions for SecureBoot configuration module.
Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -1133,6 +1133,9 @@ UpdateFileExplorer (
NewFileContext = (SECUREBOOT_FILE_CONTEXT *) NewMenuEntry->FileContext;
if (NewFileContext->IsDir ) {
PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;
RemoveEntryList (&NewMenuEntry->Link);
FreeMenu (&DirectoryMenu);
Status = FindFiles (NewMenuEntry);
if (EFI_ERROR (Status)) {
@ -1140,9 +1143,10 @@ UpdateFileExplorer (
goto OnExit;
}
CreateMenuStringToken (PrivateData->HiiHandle, &DirectoryMenu);
DestroyMenuEntry (NewMenuEntry);
UpdateFileExplorePage (PrivateData->HiiHandle, &DirectoryMenu, PrivateData->FeCurrentState);
PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;
} else {
if (PrivateData->FeCurrentState == FileExplorerStateEnrollPkFile) {
FormId = SECUREBOOT_ADD_PK_FILE_FORM_ID;