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

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

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