1. Use MemoryAllocationLib to replace boot services memory services functions in...

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / SetupBrowser / Dxe / Setup.c

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c
index 759eb5efb993398e5c51870e4163939ade7dd616..a0a7f1ba78891842aa95740caf3a09859cb8fbab 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c
@@ -1,14 +1,14 @@
 /**@file\r
   Entry and initialization module for the browser.\r
-  \r
+\r
 Copyright (c) 2006 - 2007 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \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
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -21,7 +21,7 @@ FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = {
   //\r
   {\r
     {\r
-      0x847bc3fe, \r
+      0x847bc3fe,\r
       0xb974,\r
       0x446d,\r
       {\r
@@ -162,7 +162,7 @@ SendForm (
 Routine Description:\r
 \r
   This is the routine which an external caller uses to direct the browser\r
-  where to obtain it's information.  \r
+  where to obtain it's information.\r
 \r
 Arguments:\r
 \r
@@ -185,7 +185,7 @@ Arguments:
                     needs to provide to the browser the current settings for the "fake" NV variable.  If used, no saving\r
                     of an NV variable will be possible.  This parameter is also ignored if HandleCount > 1.\r
 \r
-Returns: \r
+Returns:\r
 \r
 --*/\r
 {\r
@@ -292,7 +292,7 @@ Returns:
                       );\r
 \r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (CallbackData);\r
+        FreePool (CallbackData);\r
         return Status;;\r
       }\r
 \r
@@ -304,7 +304,7 @@ Returns:
     Status = InitializeBinaryStructures (Handle, UseDatabase, Packet, NvMapOverride, HandleCount, &FileFormTagsHead);\r
 \r
     if (EFI_ERROR (Status)) {\r
-      gBS->FreePool (CallbackData);\r
+      FreePool (CallbackData);\r
       return Status;\r
     }\r
     //\r
@@ -327,7 +327,7 @@ Returns:
 \r
     if (UseDatabase && (HandleCount > 1)) {\r
       if (Selection == NULL) {\r
-        gBS->FreePool (CallbackData);\r
+        FreePool (CallbackData);\r
         return EFI_SUCCESS;\r
       }\r
     }\r
@@ -357,12 +357,12 @@ Returns:
     *Handle = BackupHandle;\r
 \r
     if (EFI_ERROR (Status)) {\r
-      gBS->FreePool (CallbackData);\r
+      FreePool (CallbackData);\r
       return Status;\r
     }\r
 \r
     if (Callback && (AltSelection == NULL)) {\r
-      gBS->FreePool (CallbackData);\r
+      FreePool (CallbackData);\r
       return Status;\r
     }\r
 \r
@@ -379,7 +379,7 @@ Returns:
         //\r
         // If this is the FrontPage, return after every selection\r
         //\r
-        gBS->FreePool (Selection);\r
+        FreePool (Selection);\r
         UiFreeMenu ();\r
 \r
         //\r
@@ -390,11 +390,11 @@ Returns:
         gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
         gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
-        gBS->FreePool (CallbackData);\r
+        FreePool (CallbackData);\r
         return EFI_SUCCESS;\r
       }\r
 \r
-      gBS->FreePool (Selection);\r
+      FreePool (Selection);\r
       UiFreeMenu ();\r
 \r
       //\r
@@ -405,14 +405,14 @@ Returns:
       gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
       if (!Callback) {\r
-        gBS->FreePool (CallbackData);\r
+        FreePool (CallbackData);\r
         return EFI_SUCCESS;\r
       }\r
     }\r
 \r
   } while (!EFI_ERROR (Status));\r
 \r
-  gBS->FreePool (CallbackData);\r
+  FreePool (CallbackData);\r
   return Status;\r
 }\r
 \r
@@ -426,11 +426,11 @@ InitializeSetup (
 \r
 Routine Description:\r
   Initialize Setup\r
-  \r
+\r
 Arguments:\r
   (Standard EFI Image entry - EFI_IMAGE_ENTRY_POINT)\r
 \r
-Returns: \r
+Returns:\r
   EFI_SUCCESS - Setup loaded.\r
   other       - Setup Error\r
 \r
@@ -491,7 +491,7 @@ Returns:
 \r
   Status      = Hii->NewPack (Hii, PackageList, &gHiiHandle);\r
 \r
-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r
 \r
   //\r
   // Install protocol interface\r
@@ -532,7 +532,7 @@ Arguments:
   Index            - Offset of the current opcode in the Ifr raw data.\r
   FileFormTags     - Pointer of current EFI_FILE_FORM_TAGS structure.\r
   CurrentVariable  - Current variable number.\r
-           \r
+\r
 Returns:\r
   None.\r
 --*/\r
@@ -605,7 +605,7 @@ Arguments:
   NumberOfLines    - Number of lines this opcode occupied.\r
   FileFormTags     - Pointer of current EFI_FILE_FORM_TAGS structure.\r
   CurrentVariable  - Current variable number.\r
-           \r
+\r
 Returns:\r
   None.\r
 --*/\r
@@ -661,7 +661,7 @@ Returns:
         CopyMem (&Tag->Value, &Tag->Default, sizeof (UINT16));\r
       }\r
       break;\r
-    } \r
+    }\r
   }\r
 }\r
 \r
@@ -713,11 +713,11 @@ AddNextInconsistentTag (
 \r
 Routine Description:\r
   Initialize the next inconsistent tag data and add it to the inconsistent tag list.\r
-  \r
+\r
 Arguments:\r
  InconsistentTagsPtr   - Pointer of the inconsistent tag's pointer.\r
 \r
-Returns: \r
+Returns:\r
   None.\r
 \r
 --*/\r
@@ -829,13 +829,14 @@ InitializeTagStructures (
       //\r
       for (Index = 0; Index < NumberOfTags; Index++) {\r
         if (FormTags->Tags[Index].IntList != NULL) {\r
-          gBS->FreePool (FormTags->Tags[Index].IntList);\r
+          FreePool (FormTags->Tags[Index].IntList);\r
         }\r
       }\r
 \r
-      gBS->FreePool (FormTags->Tags);\r
-      gBS->FreePool (FormTags->Next);\r
-      FormTags->Next  = NULL;\r
+      FreePool (FormTags->Tags);\r
+\r
+      ASSERT (FormTags->Next == NULL);\r
+\r
       FormTags->Tags  = NULL;\r
 \r
       FormTags        = SavedFormTags;\r
@@ -1350,7 +1351,7 @@ InitializeTagStructures (
       // Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
       // Unfortunately 0 is a valid offset value for a QuestionId\r
       //\r
-      \r
+\r
       //\r
       // Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but\r
       // have no coresponding id. The examination of id is needed by evaluating boolean expression.\r
@@ -1571,8 +1572,8 @@ InitPage (
     HomeEscapeString\r
     );\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
-  gBS->FreePool (HomeEscapeString);\r
-  gBS->FreePool (HomePageString);\r
+  FreePool (HomeEscapeString);\r
+  FreePool (HomePageString);\r
 \r
   return ;\r
 }\r
@@ -1585,14 +1586,14 @@ GetToken (
 /*++\r
 \r
 Routine Description:\r
-  \r
+\r
   Get the string based on the TokenID and HII Handle.\r
 \r
 Arguments:\r
 \r
   Token       - The Token ID.\r
   HiiHandle   - Handle of Ifr to be fetched.\r
-           \r
+\r
 Returns:\r
 \r
   The output string.\r
@@ -1618,7 +1619,7 @@ Returns:
       //\r
       // Free the old pool\r
       //\r
-      gBS->FreePool (Buffer);\r
+      FreePool (Buffer);\r
 \r
       //\r
       // Allocate new pool with correct value\r
@@ -1955,8 +1956,8 @@ InitializeBinaryStructures (
             //\r
             // Free the buffer that was allocated that was too small\r
             //\r
-            gBS->FreePool (VariableDefinition->NvRamMap);\r
-            gBS->FreePool (VariableDefinition->FakeNvRamMap);\r
+            FreePool (VariableDefinition->NvRamMap);\r
+            FreePool (VariableDefinition->FakeNvRamMap);\r
 \r
             VariableDefinition->NvRamMap = AllocateZeroPool (SizeOfNvStore);\r
             VariableDefinition->FakeNvRamMap = AllocateZeroPool (SizeOfNvStore + VariableDefinition->VariableFakeSize);\r
@@ -1986,18 +1987,18 @@ InitializeBinaryStructures (
           // if the variable was not found, we will retrieve default values\r
           //\r
           if (Status == EFI_NOT_FOUND) {\r
-        \r
+\r
             if (0 == CompareMem (VariableDefinition->VariableName, L"Setup", 10)) {\r
 \r
               NvMapListHead = NULL;\r
-              \r
+\r
               Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
 \r
               if (!EFI_ERROR (Status)) {\r
                 ASSERT_EFI_ERROR (NULL != NvMapListHead);\r
-                \r
+\r
                 NvMapListNode = NvMapListHead;\r
-                \r
+\r
                 while (NULL != NvMapListNode) {\r
                   if (VariableDefinition->VariableId == NvMapListNode->VariablePack->VariableId) {\r
                     NvMap     = (VOID *) ((CHAR8 *) NvMapListNode->VariablePack + sizeof (EFI_HII_VARIABLE_PACK) + NvMapListNode->VariablePack->VariableNameLength);\r
@@ -2006,25 +2007,25 @@ InitializeBinaryStructures (
                     }\r
                   NvMapListNode = NvMapListNode->NextVariablePack;\r
                 }\r
-                \r
+\r
                 //\r
                 // Free the buffer that was allocated.\r
                 //\r
-                gBS->FreePool (VariableDefinition->NvRamMap);\r
-                gBS->FreePool (VariableDefinition->FakeNvRamMap);\r
-                \r
+                FreePool (VariableDefinition->NvRamMap);\r
+                FreePool (VariableDefinition->FakeNvRamMap);\r
+\r
                 //\r
                 // Allocate, copy the NvRamMap.\r
                 //\r
                 VariableDefinition->VariableFakeSize = (UINT16) (VariableDefinition->VariableFakeSize - VariableDefinition->VariableSize);\r
                 VariableDefinition->VariableSize = (UINT16) NvMapSize;\r
                 VariableDefinition->VariableFakeSize = (UINT16) (VariableDefinition->VariableFakeSize + VariableDefinition->VariableSize);\r
-                \r
+\r
                 VariableDefinition->NvRamMap = AllocateZeroPool (VariableDefinition->VariableSize);\r
                 VariableDefinition->FakeNvRamMap = AllocateZeroPool (NvMapSize + VariableDefinition->VariableFakeSize);\r
 \r
                 CopyMem (VariableDefinition->NvRamMap, NvMap, NvMapSize);\r
-                gBS->FreePool (NvMapListHead);\r
+                FreePool (NvMapListHead);\r
               }\r
 \r
             }\r
@@ -2060,7 +2061,7 @@ Arguments:
   HiiHandle   - Handle of Ifr to be fetched.\r
   Packet      - Pointer to IFR packet.\r
   BinaryData  - Buffer to copy the string into\r
-           \r
+\r
 Returns:\r
   Returns the number of CHAR16 characters that were copied into the OutputString buffer.\r
 \r
@@ -2098,7 +2099,7 @@ Returns:
 \r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-      gBS->FreePool (Buffer);\r
+      FreePool (Buffer);\r
 \r
       //\r
       // Allocate memory for our Form binary\r
@@ -2121,7 +2122,7 @@ Returns:
 \r
     Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
 \r
-    gBS->FreePool (PackageList);\r
+    FreePool (PackageList);\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r