1) Remove the variable initalization in declaration.

2) Change all gBS->FreePool to use the MdePkg/BaseLib's FreePool.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6662 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index c853dc2f5268fcb5127a3a4bfe777e593ec14c85..037c8cc4f387070d33cbf2d52b5ed423bb7b606b 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -301,7 +301,7 @@ ReallocatePool (
       CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);\r
     }\r
 \r
-    gBS->FreePool (OldPool);\r
+    FreePool (OldPool);\r
   }\r
 \r
   return NewPool;\r
@@ -779,7 +779,7 @@ HiiConfigRoutingExportConfig (
       AccessResults = NULL;\r
     }\r
   }\r
-  gBS->FreePool (ConfigAccessHandles);\r
+  FreePool (ConfigAccessHandles);\r
 \r
   return EFI_SUCCESS;  \r
 }\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index eb109f4dfc02c3c726db9b1f073686018b3a4414..a56c7318b4856d8feb4c692283f0dcb59b7c7bf2 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -79,7 +79,7 @@ GrowStack (
     //\r
     // Free The Old Stack\r
     //\r
-    gBS->FreePool (*Stack);\r
+    FreePool (*Stack);\r
   }\r
 \r
   //\r
@@ -650,7 +650,7 @@ IfrToUint (
       // BUGBUG: Need handle decimal string\r
       //\r
     }\r
-    gBS->FreePool (String);\r
+    FreePool (String);\r
   } else {\r
     CopyMem (Result, &Value, sizeof (EFI_HII_VALUE));\r
   }\r
@@ -949,7 +949,7 @@ IfrMid (
   Result->Type = EFI_IFR_TYPE_STRING;\r
   Result->Value.string = NewString (SubString, FormSet->HiiHandle);\r
 \r
-  gBS->FreePool (String);\r
+  FreePool (String);\r
 \r
   return Status;\r
 }\r
@@ -1271,14 +1271,14 @@ CompareHiiValue (
 \r
     Str2 = GetToken (Value2->Value.string, HiiHandle);\r
     if (Str2 == NULL) {\r
-      gBS->FreePool (Str1);\r
+      FreePool (Str1);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
     Result = StrCmp (Str1, Str2);\r
 \r
-    gBS->FreePool (Str1);\r
-    gBS->FreePool (Str2);\r
+    FreePool (Str1);\r
+    FreePool (Str2);\r
 \r
     return Result;\r
   }\r
@@ -1525,7 +1525,7 @@ EvaluateExpression (
 \r
       Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
       Value->Value.u64 = StrLen (StrPtr);\r
-      gBS->FreePool (StrPtr);\r
+      FreePool (StrPtr);\r
       break;\r
 \r
     case EFI_IFR_NOT_OP:\r
@@ -1589,7 +1589,7 @@ EvaluateExpression (
       } else {\r
         Index = (UINT16) Value->Value.u64;\r
         Value->Value.string = Index;\r
-        gBS->FreePool (StrPtr);\r
+        FreePool (StrPtr);\r
       }\r
       break;\r
 \r
@@ -1629,7 +1629,7 @@ EvaluateExpression (
         } else {\r
           Value->Value.b = FALSE;\r
         }\r
-        gBS->FreePool (StrPtr);\r
+        FreePool (StrPtr);\r
         Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
       }\r
       break;\r
@@ -1669,7 +1669,7 @@ EvaluateExpression (
         mUnicodeCollation->StrUpr (mUnicodeCollation, StrPtr);\r
       }\r
       Value->Value.string = NewString (StrPtr, FormSet->HiiHandle);\r
-      gBS->FreePool (StrPtr);\r
+      FreePool (StrPtr);\r
       break;\r
 \r
     case EFI_IFR_BITWISE_NOT_OP:\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index fe029a35234c84c0f6913f1eba9f22a53340818f..a01b4abe12ed5f1b404832fdf84587c9852f0f15 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -435,7 +435,7 @@ InitializeRequestElement (
     NewStr = AllocateZeroPool (StringSize + CONFIG_REQUEST_STRING_INCREMENTAL * sizeof (CHAR16));\r
     if (Storage->ConfigRequest != NULL) {\r
       CopyMem (NewStr, Storage->ConfigRequest, StringSize);\r
-      gBS->FreePool (Storage->ConfigRequest);\r
+      FreePool (Storage->ConfigRequest);\r
     }\r
     Storage->ConfigRequest = NewStr;\r
     Storage->SpareStrLen   = CONFIG_REQUEST_STRING_INCREMENTAL;\r
@@ -476,7 +476,7 @@ DestroyExpression (
   //\r
   // Free this Expression\r
   //\r
-  gBS->FreePool (Expression);\r
+  FreePool (Expression);\r
 }\r
 \r
 \r
@@ -560,7 +560,7 @@ DestroyStatement (
     Default = QUESTION_DEFAULT_FROM_LINK (Link);\r
     RemoveEntryList (&Default->Link);\r
 \r
-    gBS->FreePool (Default);\r
+    FreePool (Default);\r
   }\r
 \r
   //\r
@@ -571,7 +571,7 @@ DestroyStatement (
     Option = QUESTION_OPTION_FROM_LINK (Link);\r
     RemoveEntryList (&Option->Link);\r
 \r
-    gBS->FreePool (Option);\r
+    FreePool (Option);\r
   }\r
 \r
   //\r
@@ -645,7 +645,7 @@ DestroyForm (
   //\r
   // Free this Form\r
   //\r
-  gBS->FreePool (Form);\r
+  FreePool (Form);\r
 }\r
 \r
 \r
@@ -692,7 +692,7 @@ DestroyFormSet (
       DefaultStore = FORMSET_DEFAULTSTORE_FROM_LINK (Link);\r
       RemoveEntryList (&DefaultStore->Link);\r
 \r
-      gBS->FreePool (DefaultStore);\r
+      FreePool (DefaultStore);\r
     }\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 5235d32fe88d5e7270b33518121d2b926827788a..90aa31143163108fc690352df39f80ab7ddbea61 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -114,8 +114,8 @@ ReadString (
         break;\r
 \r
       case SCAN_ESC:\r
-        gBS->FreePool (TempString);\r
-        gBS->FreePool (BufferedString);\r
+        FreePool (TempString);\r
+        FreePool (BufferedString);\r
         gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
         gST->ConOut->EnableCursor (gST->ConOut, CursorVisible);\r
         return EFI_DEVICE_ERROR;\r
@@ -129,8 +129,8 @@ ReadString (
     case CHAR_CARRIAGE_RETURN:\r
       if (GetStringWidth (StringPtr) >= ((Minimum + 1) * sizeof (CHAR16))) {\r
 \r
-        gBS->FreePool (TempString);\r
-        gBS->FreePool (BufferedString);\r
+        FreePool (TempString);\r
+        FreePool (BufferedString);\r
         gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
         gST->ConOut->EnableCursor (gST->ConOut, CursorVisible);\r
         return EFI_SUCCESS;\r
@@ -143,8 +143,8 @@ ReadString (
           CreateDialog (4, TRUE, 0, NULL, &Key, &NullCharacter, gMiniString, gPressEnter, &NullCharacter);\r
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
 \r
-        gBS->FreePool (TempString);\r
-        gBS->FreePool (BufferedString);\r
+        FreePool (TempString);\r
+        FreePool (BufferedString);\r
         gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
         gST->ConOut->EnableCursor (gST->ConOut, CursorVisible);\r
         return EFI_DEVICE_ERROR;\r
@@ -804,7 +804,7 @@ GetSelectionInputPopUp (
     if (StrLen (StringPtr) > PopUpWidth) {\r
       PopUpWidth = StrLen (StringPtr);\r
     }\r
-    gBS->FreePool (StringPtr);\r
+    FreePool (StringPtr);\r
 \r
     if (!OrderedList && CompareHiiValue (&Question->HiiValue, &OneOfOption->Value, NULL) == 0) {\r
       //\r
@@ -901,7 +901,7 @@ GetSelectionInputPopUp (
         TempStringPtr = AllocateZeroPool (sizeof (CHAR16) * (PopUpWidth - 1));\r
         ASSERT ( TempStringPtr != NULL );\r
         CopyMem (TempStringPtr, StringPtr, (sizeof (CHAR16) * (PopUpWidth - 5)));\r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
         StringPtr = TempStringPtr;\r
         StrCat (StringPtr, L"...");\r
       }\r
@@ -921,7 +921,7 @@ GetSelectionInputPopUp (
         }\r
 \r
       Index2++;\r
-      gBS->FreePool (StringPtr);\r
+      FreePool (StringPtr);\r
     }\r
 \r
     Character = BOXDRAW_UP_RIGHT;\r
@@ -1067,7 +1067,7 @@ TheKey:
           }\r
         }\r
 \r
-        gBS->FreePool (HiiValueArray);\r
+        FreePool (HiiValueArray);\r
         return EFI_DEVICE_ERROR;\r
 \r
       default:\r
@@ -1100,7 +1100,7 @@ TheKey:
       }\r
 \r
       gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
-      gBS->FreePool (HiiValueArray);\r
+      FreePool (HiiValueArray);\r
 \r
       Status = ValidateQuestion (Selection->FormSet, Selection->Form, Question, EFI_HII_EXPRESSION_INCONSISTENT_IF);\r
       if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 6b51cc62802f0697d0c21053c8589ed6e24e9a5a..956db889663b9befa05bbaa8ff33cdea0b056d67 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -66,7 +66,7 @@ ClearLines (
 \r
   gST->ConOut->SetCursorPosition (gST->ConOut, LeftColumn, TopRow);\r
 \r
-  gBS->FreePool (Buffer);\r
+  FreePool (Buffer);\r
   return ;\r
 }\r
 \r
@@ -269,7 +269,7 @@ DisplayPageFrame (
           break;\r
         }\r
 \r
-        gBS->FreePool (StrFrontPageBanner);\r
+        FreePool (StrFrontPageBanner);\r
       }\r
     }\r
   }\r
@@ -350,7 +350,7 @@ DisplayPageFrame (
     }\r
   }\r
 \r
-  gBS->FreePool (Buffer);\r
+  FreePool (Buffer);\r
 \r
 }\r
 \r
@@ -486,7 +486,7 @@ DisplayForm (
   //\r
   // Remove Buffer allocated for StringPtr after it has been used.\r
   //\r
-  gBS->FreePool (StringPtr);\r
+  FreePool (StringPtr);\r
 \r
   //\r
   // Evaluate all the Expressions in this Form\r
@@ -521,7 +521,7 @@ DisplayForm (
           NumberOfLines++;\r
         }\r
 \r
-        gBS->FreePool (OutputString);\r
+        FreePool (OutputString);\r
       }\r
 \r
       //\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
index 7bbe6d49ca4ed31480949feb7e1ccc0f3dc09961..1acf7ee61712ec6fc8db9bfbefa1fc08d82d6c3a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
@@ -147,8 +147,8 @@ PrintInternal (
   Out->OutputString (Out, &BackupBuffer[PreviousIndex]);\r
   Count += StrLen (&BackupBuffer[PreviousIndex]);\r
 \r
-  gBS->FreePool (Buffer);\r
-  gBS->FreePool (BackupBuffer);\r
+  FreePool (Buffer);\r
+  FreePool (BackupBuffer);\r
   return Count;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index dc7ce782364da78ba42df71ecc06fd6e6a0f3126..d72578ddfbfa52fb37b9bd13b9541802b25d1fc0 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -383,7 +383,7 @@ ProcessOptions (
           Status = SetQuestionValue (Selection->FormSet, Selection->Form, Question, TRUE);\r
           UpdateStatusBar (NV_UPDATE_REQUIRED, Question->QuestionFlags, TRUE);\r
 \r
-          gBS->FreePool (*OptionString);\r
+          FreePool (*OptionString);\r
           *OptionString = NULL;\r
           return EFI_NOT_FOUND;\r
         }\r
@@ -407,7 +407,7 @@ ProcessOptions (
           Character[0] = CHAR_CARRIAGE_RETURN;\r
           NewStrCat (OptionString[0], Character);\r
 \r
-          gBS->FreePool (StringPtr);\r
+          FreePool (StringPtr);\r
         }\r
       }\r
     }\r
@@ -450,7 +450,7 @@ ProcessOptions (
           Link = GetNextNode (&Question->OptionListHead, Link);\r
         }\r
 \r
-        gBS->FreePool (*OptionString);\r
+        FreePool (*OptionString);\r
         *OptionString = NULL;\r
       }\r
 \r
@@ -495,7 +495,7 @@ ProcessOptions (
         Character[0] = RIGHT_ONEOF_DELIMITER;\r
         NewStrCat (OptionString[0], Character);\r
 \r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
       }\r
     }\r
     break;\r
@@ -521,7 +521,7 @@ ProcessOptions (
         // Inconsistent check fail, restore Question Value\r
         //\r
         QuestionValue->Value.b = (BOOLEAN) (QuestionValue->Value.b ? FALSE : TRUE);\r
-        gBS->FreePool (*OptionString);\r
+        FreePool (*OptionString);\r
         *OptionString = NULL;\r
         return Status;\r
       }\r
@@ -641,7 +641,7 @@ ProcessOptions (
         UpdateStatusBar (NV_UPDATE_REQUIRED, Question->QuestionFlags, TRUE);\r
       }\r
 \r
-      gBS->FreePool (StringPtr);\r
+      FreePool (StringPtr);\r
     } else {\r
       *OptionString = AllocateZeroPool (BufferSize);\r
       ASSERT (*OptionString);\r
@@ -675,7 +675,7 @@ ProcessOptions (
           //\r
           // Callback request to terminate password input\r
           //\r
-          gBS->FreePool (StringPtr);\r
+          FreePool (StringPtr);\r
           return EFI_SUCCESS;\r
         }\r
 \r
@@ -685,7 +685,7 @@ ProcessOptions (
           //\r
           Status = ReadString (MenuOption, gPromptForPassword, StringPtr);\r
           if (EFI_ERROR (Status)) {\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return Status;\r
           }\r
 \r
@@ -703,7 +703,7 @@ ProcessOptions (
               Status = EFI_SUCCESS;\r
             }\r
 \r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return Status;\r
           }\r
         }\r
@@ -717,7 +717,7 @@ ProcessOptions (
           //\r
           Status = ReadString (MenuOption, gPromptForPassword, StringPtr);\r
           if (EFI_ERROR (Status)) {\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return Status;\r
           }\r
 \r
@@ -730,12 +730,12 @@ ProcessOptions (
             //\r
             PasswordInvalid ();\r
 \r
-            gBS->FreePool (StringPtr);\r
-            gBS->FreePool (TempString);\r
+            FreePool (StringPtr);\r
+            FreePool (TempString);\r
             return Status;\r
           }\r
 \r
-          gBS->FreePool (TempString);\r
+          FreePool (TempString);\r
         }\r
       }\r
 \r
@@ -752,7 +752,7 @@ ProcessOptions (
           PasswordCallback (Selection, MenuOption, NULL);\r
         }\r
 \r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
         return Status;\r
       }\r
 \r
@@ -770,8 +770,8 @@ ProcessOptions (
           PasswordCallback (Selection, MenuOption, NULL);\r
         }\r
 \r
-        gBS->FreePool (StringPtr);\r
-        gBS->FreePool (TempString);\r
+        FreePool (StringPtr);\r
+        FreePool (TempString);\r
         return Status;\r
       }\r
 \r
@@ -804,8 +804,8 @@ ProcessOptions (
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
       }\r
 \r
-      gBS->FreePool (TempString);\r
-      gBS->FreePool (StringPtr);\r
+      FreePool (TempString);\r
+      FreePool (StringPtr);\r
     }\r
     break;\r
 \r
@@ -833,7 +833,7 @@ ProcessHelpString (
   IN  UINTN   RowCount\r
   )\r
 {\r
-  UINTN BlockWidth = (UINTN) gHelpBlockWidth - 1;\r
+  UINTN BlockWidth;\r
   UINTN AllocateSize;\r
   //\r
   // [PrevCurrIndex, CurrIndex) forms a range of a screen-line\r
@@ -866,6 +866,8 @@ ProcessHelpString (
   UINTN *IndexArray;\r
   UINTN *OldIndexArray;\r
 \r
+  BlockWidth = (UINTN) gHelpBlockWidth - 1;\r
+  \r
   //\r
   // every three elements of IndexArray form a screen-line of string:[ IndexArray[i*3], IndexArray[i*3+1] )\r
   // IndexArray[i*3+2] stores the initial glyph width of single character. to save this is because we want\r
@@ -877,7 +879,7 @@ ProcessHelpString (
   IndexArray    = AllocatePool (AllocateSize * sizeof (UINTN) * 3);\r
 \r
   if (*FormattedString != NULL) {\r
-    gBS->FreePool (*FormattedString);\r
+    FreePool (*FormattedString);\r
     *FormattedString = NULL;\r
   }\r
 \r
@@ -891,7 +893,7 @@ ProcessHelpString (
       OldIndexArray  = IndexArray;\r
       IndexArray = AllocatePool (AllocateSize * sizeof (UINTN) * 3);\r
       CopyMem (IndexArray, OldIndexArray, LineCount * sizeof (UINTN) * 3);\r
-      gBS->FreePool (OldIndexArray);\r
+      FreePool (OldIndexArray);\r
     }\r
     switch (StringPtr[CurrIndex]) {\r
 \r
@@ -1020,5 +1022,5 @@ ProcessHelpString (
       );\r
   }\r
 \r
-  gBS->FreePool (IndexArray);\r
+  FreePool (IndexArray);\r
 }\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 847679fce5d3f01631ef23b2558d7022453b8881..ba391143e61c16e0c06546152c997b025837d84f 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -333,7 +333,7 @@ SendForm (
 \r
     } while (Selection->Action == UI_ACTION_REFRESH_FORMSET);\r
 \r
-    gBS->FreePool (Selection);\r
+    FreePool (Selection);\r
   }\r
 \r
   if (ActionRequest != NULL) {\r
@@ -482,14 +482,14 @@ BrowserCallback (
     if (*ResultsDataSize < BufferSize) {\r
       *ResultsDataSize = BufferSize;\r
 \r
-      gBS->FreePool (ConfigResp);\r
+      FreePool (ConfigResp);\r
       return EFI_BUFFER_TOO_SMALL;\r
     }\r
 \r
     *ResultsDataSize = BufferSize;\r
     CopyMem (ResultsData, StrPtr, BufferSize);\r
 \r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
   } else {\r
     //\r
     // Prepare <ConfigResp>\r
@@ -701,7 +701,7 @@ GetToken (
   Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
 \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    gBS->FreePool (String);\r
+    FreePool (String);\r
     String = AllocateZeroPool (BufferLength);\r
     ASSERT (String != NULL);\r
 \r
@@ -762,7 +762,7 @@ NewStringCat (
   StrCpy (NewString, *Dest);\r
   StrCat (NewString, Src);\r
 \r
-  gBS->FreePool (*Dest);\r
+  FreePool (*Dest);\r
   *Dest = NewString;\r
 }\r
 \r
@@ -1188,7 +1188,7 @@ GetQuestionValue (
         Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
       }\r
 \r
-      gBS->FreePool (Value);\r
+      FreePool (Value);\r
     }\r
   } else {\r
     //\r
@@ -1241,7 +1241,7 @@ GetQuestionValue (
       Value = Value + 6;\r
     }\r
     if (*Value != '=') {\r
-      gBS->FreePool (Result);\r
+      FreePool (Result);\r
       return EFI_NOT_FOUND;\r
     }\r
     //\r
@@ -1267,7 +1267,7 @@ GetQuestionValue (
     } else {\r
       Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (Result);\r
+        FreePool (Result);\r
         return Status;\r
       }\r
     }\r
@@ -1280,7 +1280,7 @@ GetQuestionValue (
     } else {\r
       SetValueByName (Storage, Question->VariableName, Value);\r
     }\r
-    gBS->FreePool (Result);\r
+    FreePool (Result);\r
   }\r
 \r
   return Status;\r
@@ -1450,7 +1450,7 @@ SetQuestionValue (
     }\r
 \r
     Status = SetValueByName (Storage, Question->VariableName, Value);\r
-    gBS->FreePool (Value);\r
+    FreePool (Value);\r
   }\r
 \r
   if (!Cached) {\r
@@ -1505,11 +1505,11 @@ SetQuestionValue (
                                         &Progress\r
                                         );\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (ConfigResp);\r
+        FreePool (ConfigResp);\r
         return Status;\r
       }\r
     }\r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
 \r
     //\r
     // Synchronize shadow Buffer\r
@@ -1577,7 +1577,7 @@ ValidateQuestion (
         do {\r
           CreateDialog (4, TRUE, 0, NULL, &Key, gEmptyString, PopUp, gPressEnter, gEmptyString);\r
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-        gBS->FreePool (PopUp);\r
+        FreePool (PopUp);\r
       }\r
 \r
       return EFI_NOT_READY;\r
@@ -1692,11 +1692,11 @@ SubmitForm (
                                         &Progress\r
                                         );\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (ConfigResp);\r
+        FreePool (ConfigResp);\r
         return Status;\r
       }\r
     }\r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
 \r
     //\r
     // Config success, update storage shadow Buffer\r
@@ -2034,7 +2034,7 @@ LoadStorage (
   }\r
 \r
   Status = ConfigRespToStorage (Storage, Result);\r
-  gBS->FreePool (Result);\r
+  FreePool (Result);\r
   return Status;\r
 }\r
 \r
@@ -2211,7 +2211,7 @@ GetIfrBinaryData (
     //\r
     // Form package not found in this Package List\r
     //\r
-    gBS->FreePool (HiiPackageList);\r
+    FreePool (HiiPackageList);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -2230,7 +2230,7 @@ GetIfrBinaryData (
   *BinaryLength = PackageHeader.Length - Offset2;\r
   *BinaryData = AllocateCopyPool (*BinaryLength, OpCodeData);\r
 \r
-  gBS->FreePool (HiiPackageList);\r
+  FreePool (HiiPackageList);\r
 \r
   if (*BinaryData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 962437455093a0ce3711e753aa4b0c95543e8729..fad0f7f4893475bcfc146f6c2c047579daf85554 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -190,7 +190,7 @@ UiRemoveMenuListEntry (
     Selection->FormId = UiMenuList->FormId;\r
     Selection->QuestionId = UiMenuList->QuestionId;\r
     RemoveEntryList (&UiMenuList->MenuLink);\r
-    gBS->FreePool (UiMenuList);\r
+    FreePool (UiMenuList);\r
   }\r
 }\r
 \r
@@ -209,7 +209,7 @@ UiFreeMenuList (
   while (!IsListEmpty (&gMenuList)) {\r
     UiMenuList = CR (gMenuList.ForwardLink, UI_MENU_LIST, MenuLink, UI_MENU_LIST_SIGNATURE);\r
     RemoveEntryList (&UiMenuList->MenuLink);\r
-    gBS->FreePool (UiMenuList);\r
+    FreePool (UiMenuList);\r
   }\r
 }\r
 \r
@@ -262,9 +262,9 @@ UiFreeMenu (
       // Data format :      [01/02/2004]      [11:22:33]\r
       // Line number :        0  0    1         0  0  1\r
       //\r
-      gBS->FreePool (MenuOption->Description);\r
+      FreePool (MenuOption->Description);\r
     }\r
-    gBS->FreePool (MenuOption);\r
+    FreePool (MenuOption);\r
   }\r
 }\r
 \r
@@ -282,7 +282,7 @@ UiFreeRefreshList (
 \r
   while (gMenuRefreshHead != NULL) {\r
     OldMenuRefreshEntry = gMenuRefreshHead->Next;\r
-    gBS->FreePool (gMenuRefreshHead);\r
+    FreePool (gMenuRefreshHead);\r
     gMenuRefreshHead = OldMenuRefreshEntry;\r
   }\r
 \r
@@ -341,7 +341,7 @@ RefreshForm (
           ;\r
 \r
         PrintStringAt (MenuRefreshEntry->CurrentColumn, MenuRefreshEntry->CurrentRow, &OptionString[Index]);\r
-        gBS->FreePool (OptionString);\r
+        FreePool (OptionString);\r
       }\r
 \r
       //\r
@@ -728,8 +728,8 @@ CreateDialog (
       case CHAR_NULL:\r
         switch (Key.ScanCode) {\r
         case SCAN_ESC:\r
-          gBS->FreePool (TempString);\r
-          gBS->FreePool (BufferedString);\r
+          FreePool (TempString);\r
+          FreePool (BufferedString);\r
           gST->ConOut->SetAttribute (gST->ConOut, CurrentAttribute);\r
           gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
           return EFI_DEVICE_ERROR;\r
@@ -742,8 +742,8 @@ CreateDialog (
 \r
       case CHAR_CARRIAGE_RETURN:\r
         SelectionComplete = TRUE;\r
-        gBS->FreePool (TempString);\r
-        gBS->FreePool (BufferedString);\r
+        FreePool (TempString);\r
+        FreePool (BufferedString);\r
         gST->ConOut->SetAttribute (gST->ConOut, CurrentAttribute);\r
         gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
         return EFI_SUCCESS;\r
@@ -1017,8 +1017,8 @@ UpdateStatusBar (
     break;\r
   }\r
 \r
-  gBS->FreePool (InputErrorMessage);\r
-  gBS->FreePool (NvUpdateMessage);\r
+  FreePool (InputErrorMessage);\r
+  FreePool (NvUpdateMessage);\r
   return ;\r
 }\r
 \r
@@ -1050,7 +1050,7 @@ GetWidth (
   if ((Statement->Operand == EFI_IFR_TEXT_OP) && (Statement->TextTwo != 0)) {\r
     String = GetToken (Statement->TextTwo, Handle);\r
     Size   = StrLen (String);\r
-    gBS->FreePool (String);\r
+    FreePool (String);\r
   }\r
 \r
   if ((Statement->Operand == EFI_IFR_SUBTITLE_OP) ||\r
@@ -1234,7 +1234,7 @@ UpdateOptionSkipLines (
         }\r
       }\r
 \r
-      gBS->FreePool (OutputString);\r
+      FreePool (OutputString);\r
       if (SkipValue != 0) {\r
         SkipValue--;\r
       }\r
@@ -1641,7 +1641,7 @@ UiDisplayMenu (
               }\r
             }\r
 \r
-            gBS->FreePool (OutputString);\r
+            FreePool (OutputString);\r
             if (Temp != 0) {\r
               Temp--;\r
             }\r
@@ -1746,7 +1746,7 @@ UiDisplayMenu (
                 }\r
               }\r
 \r
-              gBS->FreePool (OutputString);\r
+              FreePool (OutputString);\r
               if (Temp2 != 0) {\r
                 Temp2--;\r
               }\r
@@ -1755,7 +1755,7 @@ UiDisplayMenu (
             Temp2 = 0;\r
             Row   = OriginalRow;\r
 \r
-            gBS->FreePool (OptionString);\r
+            FreePool (OptionString);\r
           }\r
           //\r
           // If this is a text op with secondary text information\r
@@ -1789,14 +1789,14 @@ UiDisplayMenu (
                 }\r
               }\r
 \r
-              gBS->FreePool (OutputString);\r
+              FreePool (OutputString);\r
               if (Temp2 != 0) {\r
                 Temp2--;\r
               }\r
             }\r
 \r
             Row = OriginalRow;\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
           }\r
 \r
           //\r
@@ -1951,12 +1951,12 @@ UiDisplayMenu (
                 MenuOption->Row++;\r
               }\r
 \r
-              gBS->FreePool (OutputString);\r
+              FreePool (OutputString);\r
             }\r
 \r
             MenuOption->Row = OriginalRow;\r
 \r
-            gBS->FreePool (OptionString);\r
+            FreePool (OptionString);\r
           } else {\r
             if (NewLine) {\r
               if (MenuOption->GrayOut) {\r
@@ -1979,7 +1979,7 @@ UiDisplayMenu (
                   MenuOption->Row++;\r
                 }\r
 \r
-                gBS->FreePool (OutputString);\r
+                FreePool (OutputString);\r
               }\r
 \r
               MenuOption->Row = OriginalRow;\r
@@ -2057,12 +2057,12 @@ UiDisplayMenu (
               MenuOption->Row++;\r
             }\r
 \r
-            gBS->FreePool (OutputString);\r
+            FreePool (OutputString);\r
           }\r
 \r
           MenuOption->Row = OriginalRow;\r
 \r
-          gBS->FreePool (OptionString);\r
+          FreePool (OptionString);\r
         } else {\r
           if (NewLine) {\r
             OriginalRow = MenuOption->Row;\r
@@ -2080,7 +2080,7 @@ UiDisplayMenu (
                 MenuOption->Row++;\r
               }\r
 \r
-              gBS->FreePool (OutputString);\r
+              FreePool (OutputString);\r
             }\r
 \r
             MenuOption->Row = OriginalRow;\r
@@ -2372,8 +2372,8 @@ UiDisplayMenu (
             break;\r
           }\r
 \r
-          gBS->FreePool (StringPtr);\r
-          gBS->FreePool (DevicePath);\r
+          FreePool (StringPtr);\r
+          FreePool (DevicePath);\r
 \r
           CopyMem (&Selection->FormSetGuid, &Statement->RefFormSetId, sizeof (EFI_GUID));\r
           Selection->FormId = Statement->RefFormId;\r