From 0b716fd7649f13ca6c214aa47f39ab00212c7d6e Mon Sep 17 00:00:00 2001
From: Eric Dong <eric.dong@intel.com>
Date: Wed, 8 Jan 2014 08:21:22 +0000
Subject: [PATCH] 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
---
 .../Universal/BdsDxe/BootMaint/FileExplorer.c             | 7 +++++--
 .../SecureBootConfigDxe/SecureBootConfigFileExplorer.c    | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 6f094f207d..69e402ef93 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -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:
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
index 3db71d6860..548d95df53 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
@@ -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;
-- 
2.39.2