Fix a UI hang bug when adding Boot Option or Driver Option.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / FileExplorer.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 2cde6e0d0f95832c7e31b7025e1cdd3c3864785c..98dc54c9399a61d4962a6c956d46e8f1268fda79 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 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -47,9 +47,9 @@ UpdateFileExplorePage (
       continue;\r
     }\r
 \r
-    if ((NewFileContext->IsDir) || (BOOT_FROM_FILE_STATE == CallbackData->FeCurrentState)) {\r
+    if ((NewFileContext->IsDir) || (FileExplorerStateBootFromFile == CallbackData->FeCurrentState)) {\r
       //\r
-      // Create Text opcode for directory, also create Text opcode for file in BOOT_FROM_FILE_STATE.\r
+      // Create Text opcode for directory, also create Text opcode for file in FileExplorerStateBootFromFile.\r
       //\r
       HiiCreateActionOpCode (\r
         mStartOpCodeHandle,\r
@@ -61,11 +61,11 @@ UpdateFileExplorePage (
         );\r
     } else {\r
       //\r
-      // Create Goto opcode for file in ADD_BOOT_OPTION_STATE or ADD_DRIVER_OPTION_STATE.\r
+      // Create Goto opcode for file in FileExplorerStateAddBootOption or FileExplorerStateAddDriverOptionState.\r
       //\r
-      if (ADD_BOOT_OPTION_STATE == CallbackData->FeCurrentState) {\r
+      if (FileExplorerStateAddBootOption == CallbackData->FeCurrentState) {\r
         FormId = FORM_BOOT_ADD_DESCRIPTION_ID;\r
-      } else if (ADD_DRIVER_OPTION_STATE == CallbackData->FeCurrentState) {\r
+      } else if (FileExplorerStateAddDriverOptionState == CallbackData->FeCurrentState) {\r
         FormId = FORM_DRIVER_ADD_FILE_DESCRIPTION_ID;\r
       }\r
 \r
@@ -119,7 +119,7 @@ UpdateFileExplorer (
 \r
   FileOptionMask    = (UINT16) (FILE_OPTION_MASK & KeyValue);\r
 \r
-  if (UNKNOWN_CONTEXT == CallbackData->FeDisplayContext) {\r
+  if (FileExplorerDisplayUnknown == CallbackData->FeDisplayContext) {\r
     //\r
     // First in, display file system.\r
     //\r
@@ -129,19 +129,19 @@ UpdateFileExplorer (
 \r
     UpdateFileExplorePage (CallbackData, &FsOptionMenu);\r
 \r
-    CallbackData->FeDisplayContext = FILE_SYSTEM;\r
+    CallbackData->FeDisplayContext = FileExplorerDisplayFileSystem;\r
   } else {\r
-    if (FILE_SYSTEM == CallbackData->FeDisplayContext) {\r
+    if (FileExplorerDisplayFileSystem == CallbackData->FeDisplayContext) {\r
       NewMenuEntry = BOpt_GetMenuEntry (&FsOptionMenu, FileOptionMask);\r
-    } else if (DIRECTORY == CallbackData->FeDisplayContext) {\r
+    } else if (FileExplorerDisplayDirectory == CallbackData->FeDisplayContext) {\r
       NewMenuEntry = BOpt_GetMenuEntry (&DirectoryMenu, FileOptionMask);\r
     }\r
 \r
-    CallbackData->FeDisplayContext  = DIRECTORY;\r
-\r
-    NewFileContext                  = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;\r
+    CallbackData->FeDisplayContext  = FileExplorerDisplayDirectory;\r
 \r
     if (NewFileContext->IsDir ) {\r
+      NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;\r
+\r
       RemoveEntryList (&NewMenuEntry->Link);\r
       BOpt_FreeMenu (&DirectoryMenu);\r
       Status = BOpt_FindFiles (CallbackData, NewMenuEntry);\r
@@ -156,7 +156,7 @@ UpdateFileExplorer (
 \r
     } else {\r
       switch (CallbackData->FeCurrentState) {\r
-      case BOOT_FROM_FILE_STATE:\r
+      case FileExplorerStateBootFromFile:\r
         //\r
         // Here boot from file\r
         //\r
@@ -164,9 +164,9 @@ UpdateFileExplorer (
         ExitFileExplorer = TRUE;\r
         break;\r
 \r
-      case ADD_BOOT_OPTION_STATE:\r
-      case ADD_DRIVER_OPTION_STATE:\r
-        if (ADD_BOOT_OPTION_STATE == CallbackData->FeCurrentState) {\r
+      case FileExplorerStateAddBootOption:\r
+      case FileExplorerStateAddDriverOptionState:\r
+        if (FileExplorerStateAddBootOption == CallbackData->FeCurrentState) {\r
           FormId = FORM_BOOT_ADD_DESCRIPTION_ID;\r
         } else {\r
           FormId = FORM_DRIVER_ADD_FILE_DESCRIPTION_ID;\r
@@ -267,7 +267,7 @@ FileExplorerCallback (
     //\r
     // Apply changes and exit formset\r
     //\r
-    if (ADD_BOOT_OPTION_STATE == Private->FeCurrentState) {\r
+    if (FileExplorerStateAddBootOption == Private->FeCurrentState) {\r
       Status = Var_UpdateBootOption (Private, NvRamMap);\r
       if (EFI_ERROR (Status)) {\r
         return Status;\r
@@ -275,7 +275,7 @@ FileExplorerCallback (
 \r
       BOpt_GetBootOptions (Private);\r
       CreateMenuStringToken (Private, Private->FeHiiHandle, &BootOptionMenu);\r
-    } else if (ADD_DRIVER_OPTION_STATE == Private->FeCurrentState) {\r
+    } else if (FileExplorerStateAddDriverOptionState == Private->FeCurrentState) {\r
       Status = Var_UpdateDriverOption (\r
                 Private,\r
                 Private->FeHiiHandle,\r