1. Perfect libraries MSA files

2. Use MemoryAllocationLib to replace gBS memory services in EdkEt32Pkg.

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

12 files changed, 278 insertions, 277 deletions

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
index 846ba8e..1d6f913 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
@@ -445,7 +445,7 @@ Returns:
   TmpStr = GetStringById (STRING_TOKEN (STR_BOOT_SUCCEEDED));

   if (TmpStr != NULL) {

     BdsLibOutputStrings (gST->ConOut, TmpStr, Option->Description, L"\n\r", NULL);

-    gBS->FreePool (TmpStr);

+    FreePool (TmpStr);

   }

 }

 

@@ -487,7 +487,7 @@ Returns:
   TmpStr = GetStringById (STRING_TOKEN (STR_BOOT_FAILED));

   if (TmpStr != NULL) {

     BdsLibOutputStrings (gST->ConOut, TmpStr, Option->Description, L"\n\r", NULL);

-    gBS->FreePool (TmpStr);

+    FreePool (TmpStr);

   }

 

 }

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
index c9f2402..37c0475 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                          

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -486,19 +486,19 @@ BdsDeleteAllInvalidLegacyBootOptions (
       Index++;

       continue;

     }

- 

+

     //

     // Check if BBS Description String is changed

     //

     DescStringMatch = FALSE;

-    

+

     BdsBuildLegacyDevNameString (

-      &LocalBbsTable[BbsIndex], 

-      BbsIndex, 

-      sizeof(BootDesc), 

+      &LocalBbsTable[BbsIndex],

+      BbsIndex,

+      sizeof(BootDesc),

       BootDesc

       );

-    

+

     if (StrCmp (BootDesc, (UINT16*)(BootOptionVar + sizeof (UINT32) + sizeof (UINT16))) == 0) {

       DescStringMatch = TRUE;

     }

@@ -634,7 +634,7 @@ BdsCreateOneLegacyBootOption (
             );

   BbsItem->BootPriority = 0x00;

 

-  gBS->FreePool (DevPath);

+  FreePool (DevPath);

 

   return Status;

 }

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
index b4f6d48..8804b14 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
@@ -1,18 +1,18 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

   BmLib.c

-    

+

 AgBStract:

 

   Boot Maintainence Helper functions

@@ -30,13 +30,13 @@ EfiLibLocateProtocol (
 

 Routine Description:

 

-  Find the first instance of this Protocol 

+  Find the first instance of this Protocol

   in the system and return it's interface

 

 Arguments:

 

   ProtocolGuid    - Provides the protocol to search for

-  Interface       - On return, a pointer to the first interface 

+  Interface       - On return, a pointer to the first interface

                     that matches ProtocolGuid

 

 Returns:

@@ -72,7 +72,7 @@ Arguments:
   DeviceHandle         - A handle for a device

 

 Returns:

-  

+

   A valid file handle or NULL is returned

 

 --*/

@@ -118,7 +118,7 @@ EfiGrowBuffer (
 Routine Description:

 

     Helper function called as part of the code needed

-    to allocate the proper sized buffer for various 

+    to allocate the proper sized buffer for various

     EFI interfaces.

 

 Arguments:

@@ -128,10 +128,10 @@ Arguments:
     Buffer      - Current allocated buffer, or NULL

 

     BufferSize  - Current buffer size needed

-    

+

 Returns:

-    

-    TRUE - if the buffer was reallocated and the caller 

+

+    TRUE - if the buffer was reallocated and the caller

     should try the API again.

 

 --*/

@@ -182,7 +182,7 @@ Routine Description:
   Function returns the value of the specified variable.

 

 Arguments:

-  Name                - A Null-terminated Unicode string that is 

+  Name                - A Null-terminated Unicode string that is

                         the name of the vendor's variable.

 

   VendorGuid          - A unique identifier for the vendor.

@@ -209,7 +209,7 @@ Routine Description:
   Function deletes the variable specified by VarName and VarGuid.

 

 Arguments:

-  VarName              - A Null-terminated Unicode string that is 

+  VarName              - A Null-terminated Unicode string that is

                          the name of the vendor's variable.

 

   VendorGuid           - A unique identifier for the vendor.

@@ -252,7 +252,7 @@ EfiLibFileSystemVolumeLabelInfo (
 

 Routine Description:

 

-  Function gets the file system information from an open file descriptor, 

+  Function gets the file system information from an open file descriptor,

   and stores it in a buffer allocated from pool.

 

 Arguments:

@@ -260,7 +260,7 @@ Arguments:
   Fhand         - A file handle

 

 Returns:

-  

+

   A pointer to a buffer with file information or NULL is returned

 

 --*/

@@ -315,7 +315,7 @@ EfiLibFileInfo (
 

 Routine Description:

 

-  Function gets the file information from an open file descriptor, and stores it 

+  Function gets the file information from an open file descriptor, and stores it

   in a buffer allocated from pool.

 

 Arguments:

@@ -323,7 +323,7 @@ Arguments:
   Fhand         - A file handle

 

 Returns:

-  

+

   A pointer to a buffer with file information or NULL is returned

 

 --*/

@@ -360,7 +360,7 @@ EfiDevicePathInstanceCount (
 /*++

 

 Routine Description:

-  Function is used to determine the number of device path instances 

+  Function is used to determine the number of device path instances

   that exist in a device path.

 

 Arguments:

@@ -368,7 +368,7 @@ Arguments:
 

 Returns:

 

-  This function counts and returns the number of device path instances 

+  This function counts and returns the number of device path instances

   in DevicePath.

 

 --*/

@@ -437,15 +437,15 @@ EfiLibGetStringFromToken (
 /*++

 

 Routine Description:

-  

+

   Acquire the string associated with the ProducerGuid and return it.

 

 Arguments:

-  

+

   ProducerGuid - The Guid to search the HII database for

   Token        - The token value of the string to extract

   String       - The string that is extracted

-  

+

 Returns:

 

   EFI_SUCCESS           -  Buffer filled with the requested forms. BufferLength

@@ -469,7 +469,7 @@ Returns:
   //

   HandleBufferLength  = 0;

   HiiHandleBuffer     = NULL;

-  

+

   Status = gBS->LocateProtocol (

                   &gEfiHiiProtocolGuid,

                   NULL,

@@ -484,7 +484,7 @@ Returns:
   //

   Status = BdsLibGetHiiHandles (Hii, &HandleBufferLength, &HiiHandleBuffer);

   ASSERT_EFI_ERROR (Status);

-  

+

   //

   // Get the Hii Handle that matches the StructureNode->ProducerName

   //

@@ -518,7 +518,7 @@ Returns:
                   *String

                   );

 

-  gBS->FreePool (HiiHandleBuffer);

+  FreePool (HiiHandleBuffer);

 

   return Status;

 }

@@ -541,7 +541,7 @@ Arguments:
 Returns:

   TRUE              The FirstTime is not later than the SecondTime.

   FALSE             The FirstTime is later than the SecondTime.

-  

+

 --*/

 {

   if (FirstTime->Year != SecondTime->Year) {

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 2f90e3c..77b530d 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
@@ -1,18 +1,18 @@
-/*++ 

+/*++

+

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

   BootMaint.c

-    

+

 Abstract:

 

   Boot Maintainence Main File

@@ -58,15 +58,15 @@ Routine Description:
 Arguments:

 

   HiiHandle       - Hii Handle of the package to be updated.

-  

+

   MenuOption      - The Menu whose string tokens need to be created

 

 Returns:

 

   EFI_SUCCESS     - string tokens created successfully

-  

+

   others          - contain some errors

-  

+

 --*/

 {

   BM_MENU_ENTRY *NewMenuEntry;

@@ -113,7 +113,7 @@ Routine Description:
 

 Arguments:

 

-  This            - File explorer callback protocol pointer.     

+  This            - File explorer callback protocol pointer.

   KeyValue        - Key value to identify the type of data to expect.

   Data            - A pointer to the data being sent to the original exporting driver.

   Packet          - A pointer to a packet of information which a driver passes back to the browser.

@@ -122,7 +122,7 @@ Returns:
 

   EFI_SUCCESS     - Callback ended successfully.

   Others          - Contain some errors.

-  

+

 --*/

 {

   BMM_CALLBACK_DATA *Private;

@@ -729,15 +729,15 @@ Routine Description:
 Arguments:

 

   ImageHandle     - caller provided handle

-  

+

   SystemTable     - caller provided system tables

 

 Returns:

 

   EFI_SUCCESS     - utility ended successfully

-  

+

   others          - contain some errors

-  

+

 --*/

 {

   EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;

@@ -849,13 +849,13 @@ Returns:
   //

   PackageList = PreparePackages (1, &gBdsStringPackGuid, bmBin);

   Status      = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   BmmCallbackInfo->BmmHiiHandle = HiiHandle;

 

   PackageList                   = PreparePackages (1, &gBdsStringPackGuid, FEBin);

   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   BmmCallbackInfo->FeHiiHandle = HiiHandle;

 

@@ -1036,7 +1036,7 @@ Arguments:
   None.

 

 Returns:

-  None.  

+  None.

 --*/

 {

   STRING_DEPOSITORY *StringDepository;

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
index 3fccd99..b5afc7c 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
@@ -1,17 +1,17 @@
 /*++

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

   BootOption.c

-  

+

 Abstract:

 

   Provide boot option support for Application "BootMaint"

@@ -19,7 +19,7 @@ Abstract:
   Include file system navigation, system handle selection

 

   Boot option manipulation

-  

+

 Revision History

 

 --*/

@@ -42,7 +42,7 @@ Arguments:
                       Menu type

 

 Returns:

-  NULL                Cannot allocate memory for current menu 

+  NULL                Cannot allocate memory for current menu

                       entry

   Others              A valid pointer pointing to the allocated

                       memory pool for current menu entry

@@ -195,11 +195,11 @@ BOpt_GetMenuEntry (
   )

 /*++

   Rountine Description :

-    Use this routine to get one particular menu entry in specified 

+    Use this routine to get one particular menu entry in specified

     menu

 

   Arguments :

-    MenuOption        The menu that we will search 

+    MenuOption        The menu that we will search

 

     MenuNumber        The menunubmer that we want

 

@@ -238,7 +238,7 @@ Routine Description
   protocol, Load File protocol.

 

   Building up the FileSystem Menu for user selection

-  All file system will be stored in FsOptionMenu 

+  All file system will be stored in FsOptionMenu

   for future use.

 

 Arguments:

@@ -303,7 +303,7 @@ Returns:
         //

         // If block IO exists check to see if it's remobable media

         //

-        RemovableMedia = BlkIo->Media->RemovableMedia; 

+        RemovableMedia = BlkIo->Media->RemovableMedia;

       }

 

       //

@@ -311,12 +311,12 @@ Returns:
       //

       MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);

       if (NULL == MenuEntry) {

-        SafeFreePool (SimpleFsHandle);    

+        SafeFreePool (SimpleFsHandle);

         return EFI_OUT_OF_RESOURCES;

       }

 

       FileContext = (BM_FILE_CONTEXT *) MenuEntry->VariableContext;

-            

+

       FileContext->Handle     = SimpleFsHandle[Index];

       MenuEntry->OptionNumber = Index;

       FileContext->FHandle    = EfiLibOpenRoot (FileContext->Handle);

@@ -364,7 +364,7 @@ Returns:
         TempStr

         );

       OptionNumber++;

-      InsertTailList (&FsOptionMenu.Head, &MenuEntry->Link);      

+      InsertTailList (&FsOptionMenu.Head, &MenuEntry->Link);

     }

   }

 

@@ -386,7 +386,7 @@ Returns:
     for (Index = 0; Index < NoLoadFileHandles; Index++) {

       MenuEntry = BOpt_CreateMenuEntry (BM_FILE_CONTEXT_SELECT);

       if (NULL == MenuEntry) {

-        SafeFreePool (LoadFileHandle);    

+        SafeFreePool (LoadFileHandle);

         return EFI_OUT_OF_RESOURCES;

       }

 

@@ -494,7 +494,7 @@ Arguments:
 

 Returns:

   VOID

-  

+

 --*/

 {

   BM_MENU_ENTRY *MenuEntry;

@@ -675,15 +675,15 @@ BOpt_GetLegacyOptions (
   )

 /*++

 Routine Description:

-  

+

   Build the LegacyFDMenu LegacyHDMenu LegacyCDMenu according to LegacyBios.GetBbsInfo().

-    

+

 Arguments:

   None

 

 Returns:

   The device info of legacy device.

-  

+

 --*/

 {

   BM_MENU_ENTRY             *NewMenuEntry;

@@ -832,16 +832,16 @@ BOpt_GetBootOptions (
 /*++

 

 Routine Description:

-  

+

   Build the BootOptionMenu according to BootOrder Variable.

-  This Routine will access the Boot#### to get EFI_LOAD_OPTION 

-  

+  This Routine will access the Boot#### to get EFI_LOAD_OPTION

+

 Arguments:

   None

 

 Returns:

   The number of the Var Boot####

-  

+

 --*/

 {

   UINTN                     Index;

@@ -1148,7 +1148,7 @@ BOpt_IsEfiImageName (
 /*++

 

 Routine Description

-  Check whether current FileName point to a valid 

+  Check whether current FileName point to a valid

   Efi Image File.

 

 Arguments:

@@ -1157,7 +1157,7 @@ Arguments:
 Returns:

   TRUE  -   Is Efi Image

   FALSE -   Not a valid Efi Image

-  

+

 --*/

 {

   //

@@ -1198,7 +1198,7 @@ IsEfiAppReadFromFile (
 {

   EFI_STATUS        Status;

   EFI_FILE_HANDLE   File;

-    

+

   File = (EFI_FILE_HANDLE)FileHandle;

   Status = File->SetPosition (File, FileOffset);

   if (EFI_ERROR (Status)) {

@@ -1219,15 +1219,15 @@ BOpt_IsEfiApp (
 

 Routine Description:

   Check whether current FileName point to a valid Efi Application

-  

+

 Arguments:

   Dir       -   Pointer to current Directory

   FileName  -   Pointer to current File name.

-  

+

 Returns:

   TRUE      -   Is a valid Efi Application

   FALSE     -   not a valid Efi Application

-  

+

 --*/

 {

   EFI_STATUS                            Status;

@@ -1268,7 +1268,7 @@ Routine Description
   in current system environment

   All valid handles in the system except those consume SimpleFs, LoadFile

   are stored in DriverMenu for future use.

-  

+

 Arguments:

   None

 

@@ -1363,13 +1363,13 @@ BOpt_GetBootOptionNumber (
 /*++

 

 Routine Description:

-  Get the Option Number that does not used 

-  

+  Get the Option Number that does not used

+

 Arguments:

 

 Returns:

   The Option Number

-  

+

 --*/

 {

   BM_MENU_ENTRY *NewMenuEntry;

@@ -1415,7 +1415,7 @@ Returns:
                 &gEfiGlobalVariableGuid,

                 &OptionSize

                 );

-      if (NULL == OptionBuffer) 

+      if (NULL == OptionBuffer)

         break;

       }

     }

@@ -1440,13 +1440,13 @@ BOpt_GetDriverOptionNumber (
 /*++

 

 Routine Description:

-  Get the Option Number that does not used 

-  

+  Get the Option Number that does not used

+

 Arguments:

 

 Returns:

   The Option Number

-  

+

 --*/

 {

   BM_MENU_ENTRY *NewMenuEntry;

@@ -1507,12 +1507,12 @@ BOpt_GetDriverOptions (
 

 Routine Description:

   Build up all DriverOptionMenu

-  

+

 Arguments:

 

 Returns:

   The Option Number

-  

+

 --*/

 {

   UINTN           Index;

@@ -1671,7 +1671,7 @@ SafeFreePool (
 Routine Description:

   Wrap original FreePool gBS call

   in order to decrease code length

-  

+

 Arguments:

 

 Returns:

@@ -1679,7 +1679,7 @@ Returns:
 --*/

 {

   if (Buffer != NULL) {

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     Buffer = NULL;

   }

 }

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
index 9c72f23..1134c95 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
@@ -1,18 +1,18 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

   UpdatePage.c

-    

+

 AgBStract:

 

   Dynamically Update the pages

@@ -179,7 +179,8 @@ BootThisFile (
   CHAR16            *ExitData;

   BDS_COMMON_OPTION *Option;

 

-  Status                  = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), &Option);

+  Option                  = AllocatePool (sizeof (BDS_COMMON_OPTION));

+

   Option->Description     = FileContext->FileName;

   Option->DevicePath      = FileContext->DevicePath;

   Option->LoadOptionsSize = 0;

@@ -218,7 +219,7 @@ UpdateConCOMPage (
   if (!EFI_ERROR (Status)) {

     for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {

       NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);

- 

+

       CreateGotoOpCode (

         FORM_CON_COM_SETUP_ID,

         NewMenuEntry->DisplayStringToken,

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMngr/BootManager.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMngr/BootManager.c
index 23b8789..77e079e 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMngr/BootManager.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMngr/BootManager.c
@@ -1,15 +1,15 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

 

-Module Name: 

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+Module Name:

 

   BootManager.c

 

@@ -47,7 +47,7 @@ Routine Description:
 

   This is the function that is called to provide results data to the driver.  This data

   consists of a unique key which is used to identify what data is either being passed back

-  or being asked for. 

+  or being asked for.

 

 Arguments:

 

@@ -57,7 +57,7 @@ Arguments:
 

   Data -            A pointer to the data being sent to the original exporting driver.

 

-Returns: 

+Returns:

 

 --*/

 {

@@ -170,7 +170,7 @@ Returns:
   //

   PackageList = PreparePackages (2, &BmGuid, BootManagerVfrBin, BdsStrings);

   Status      = Hii->NewPack (Hii, PackageList, &gBootManagerHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   //

   // This example does not implement worker functions

@@ -296,20 +296,20 @@ Returns:
 

   Hii->UpdateForm (Hii, gBootManagerHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);

 

-  gBS->FreePool (UpdateData);

+  FreePool (UpdateData);

 

   ASSERT (gBrowser);

 

   BootMngrMenuResetRequired = FALSE;

   gBrowser->SendForm (

-              gBrowser, 

-              TRUE, 

-              &gBootManagerHandle, 

-              1, 

-              NULL, 

-              NULL, 

-              NULL, 

-              NULL, 

+              gBrowser,

+              TRUE,

+              &gBootManagerHandle,

+              1,

+              NULL,

+              NULL,

+              NULL,

+              NULL,

               &BootMngrMenuResetRequired

               );

 

@@ -322,12 +322,12 @@ Returns:
   if (gOption == NULL) {

     return ;

   }

-  

+

   //

   //Will leave browser, check any reset required change is applied? if yes, reset system

   //

   SetupResetReminder ();

-  

+

   //

   // BugBug: This code looks repeated from the BDS. Need to save code space.

   //

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
index 2da9c6f..7189a6e 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
@@ -1,15 +1,15 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

 

-Module Name: 

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+Module Name:

 

   DeviceManager.c

 

@@ -51,7 +51,7 @@ Routine Description:
 

   This is the function that is called to provide results data to the driver.  This data

   consists of a unique key which is used to identify what data is either being passed back

-  or being asked for. 

+  or being asked for.

 

 Arguments:

 

@@ -61,7 +61,7 @@ Arguments:
 

   Data -            A pointer to the data being sent to the original exporting driver.

 

-Returns: 

+Returns:

 

 --*/

 {

@@ -103,7 +103,7 @@ Routine Description:
 

 Arguments:

   None

-            

+

 Returns:

 

 --*/

@@ -120,7 +120,7 @@ Returns:
 

   PackageList = PreparePackages (1, &gBdsStringPackGuid, DeviceManagerVfrBin);

   Status      = Hii->NewPack (Hii, PackageList, &FPCallbackInfo.DevMgrHiiHandle);

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   //

   // This example does not implement worker functions for the NV accessor functions.  Only a callback evaluator

@@ -157,7 +157,7 @@ Returns:
   //

   Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) 0x0000, TRUE, UpdateData);

 

-  gBS->FreePool (UpdateData);

+  FreePool (UpdateData);

   return Status;

 }

 

@@ -168,17 +168,17 @@ CallDeviceManager (
 /*++

 

 Routine Description:

-  

+

   Call the browser and display the device manager

 

 Arguments:

-  

+

   None

-  

+

 Returns:

   EFI_SUCCESS            - Operation is successful.

   EFI_INVALID_PARAMETER  - If the inputs to SendForm function is not valid.

-  

+

 --*/

 {

   EFI_STATUS          Status;

@@ -337,7 +337,7 @@ Returns:
           }

         }

 

-        gBS->FreePool (String);

+        FreePool (String);

 

         CreateGotoOpCode (

           0x1000,     // Device Manager Page

@@ -391,7 +391,7 @@ Returns:
       //

       // Reset Buffer pointer to original location

       //

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

     }

   }

   //

@@ -406,12 +406,12 @@ Returns:
     FPCallbackInfo.Data.VideoBIOS = 0;

   } else {

     FPCallbackInfo.Data.VideoBIOS = VideoOption[0];

-    gBS->FreePool (VideoOption);

+    FreePool (VideoOption);

   }

 

   ASSERT (FPCallbackInfo.Data.VideoBIOS <= 1);

 

-  Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), &IfrOptionList);

+  IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));

   if (IfrOptionList != NULL) {

     IfrOptionList[0].Flags        = EFI_IFR_FLAG_INTERACTIVE;

     IfrOptionList[0].Key          = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;

@@ -437,7 +437,7 @@ Returns:
 

     UpdateData->DataCount = 4;

     Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) EFI_VBIOS_CLASS, TRUE, UpdateData);

-    gBS->FreePool (IfrOptionList);

+    FreePool (IfrOptionList);

   }

 

   BootDeviceMngrMenuResetRequired = FALSE;

@@ -490,8 +490,8 @@ Returns:
     gCallbackKey = 4;

   }

 

-  gBS->FreePool (UpdateData);

-  gBS->FreePool (HiiHandles);

+  FreePool (UpdateData);

+  FreePool (HiiHandles);

 

   return Status;

 }

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/FrontPage.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/FrontPage.c
index c659384..62ffd8f 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/FrontPage.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/FrontPage.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -16,7 +16,7 @@ Module Name:
 Abstract:

 

   FrontPage routines to handle the callbacks and browser calls

-  

+

 --*/

 

 #include "Bds.h"

@@ -53,7 +53,7 @@ Routine Description:
 

   This is the function that is called to provide results data to the driver.  This data

   consists of a unique key which is used to identify what data is either being passed back

-  or being asked for. 

+  or being asked for.

 

 Arguments:

 

@@ -63,7 +63,7 @@ Arguments:
 

   Data -            A pointer to the data being sent to the original exporting driver.

 

-Returns: 

+Returns:

 

 --*/

 {

@@ -136,7 +136,7 @@ Returns:
                     Lang

                     );

 

-    gBS->FreePool (LanguageString);

+    FreePool (LanguageString);

     gCallbackKey = 2;

     break;

 

@@ -179,7 +179,7 @@ Returns:
         (UINTN) (((EFI_IFR_DATA_ENTRY *) (DataArray+1))->Data),

         0

         );

-      gBS->FreePool (TmpStr);

+      FreePool (TmpStr);

     }

     break;

 

@@ -198,12 +198,12 @@ InitializeFrontPage (
 /*++

 

 Routine Description:

-  

+

   Initialize HII information for the FrontPage

 

 Arguments:

   None

-            

+

 Returns:

   EFI_SUCCESS       - The operation is successful.

   EFI_DEVICE_ERROR  - If the dynamic opcode creation failed.

@@ -254,7 +254,7 @@ Returns:
 

   Status        = Hii->NewPack (Hii, PackageList, &gFrontPageHandle);

 

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 

   //

   // There will be only one FormConfig in the system

@@ -364,11 +364,11 @@ ReInitStrings:
     OptionCount++;

   }

 

-  gBS->FreePool (LanguageString);

+  FreePool (LanguageString);

 

   if (ReInitializeStrings) {

-    gBS->FreePool (StringBuffer);

-    gBS->FreePool (OptionList);

+    FreePool (StringBuffer);

+    FreePool (OptionList);

     return EFI_SUCCESS;

   }

 

@@ -389,11 +389,11 @@ ReInitStrings:
 

   Hii->UpdateForm (Hii, gFrontPageHandle, (EFI_FORM_LABEL) 0x0002, TRUE, UpdateData);

 

-  gBS->FreePool (UpdateData);

+  FreePool (UpdateData);

   //

-  // gBS->FreePool (OptionList);

+  // FreePool (OptionList);

   //

-  gBS->FreePool (StringBuffer);

+  FreePool (StringBuffer);

   return Status;

 }

 

@@ -404,13 +404,13 @@ CallFrontPage (
 /*++

 

 Routine Description:

-  

+

   Call the browser and display the front page

 

 Arguments:

-  

+

   None

-  

+

 Returns:

 

 --*/

@@ -442,7 +442,7 @@ Returns:
                       );

   //

   // Check whether user change any option setting which needs a reset to be effective

-  //                      

+  //

   if (FrontPageMenuResetRequired) {

     EnableResetRequired ();

   }

@@ -461,15 +461,15 @@ GetStringFromToken (
 /*++

 

 Routine Description:

-  

+

   Acquire the string associated with the ProducerGuid and return it.

 

 Arguments:

-  

+

   ProducerGuid - The Guid to search the HII database for

   Token - The token value of the string to extract

   String - The string that is extracted

-  

+

 Returns:

 

   EFI_SUCCESS - The function returns EFI_SUCCESS always.

@@ -529,11 +529,11 @@ Returns:
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (*String);

+    FreePool (*String);

     *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));

   }

 

-  gBS->FreePool (HiiHandleBuffer);

+  FreePool (HiiHandleBuffer);

   return EFI_SUCCESS;

 }

 

@@ -545,14 +545,14 @@ ConvertProcessorToString (
 /*++

 

 Routine Description:

-  

+

   Convert Processor Frequency Data to a string

 

 Arguments:

-  

+

   ProcessorFrequency - The frequency data to process

   String - The string that is created

-  

+

 Returns:

 

 --*/

@@ -590,14 +590,14 @@ ConvertMemorySizeToString (
 /*++

 

 Routine Description:

-  

+

   Convert Memory Size to a string

 

 Arguments:

-  

+

   MemorySize - The size of the memory to process

   String - The string that is created

-  

+

 Returns:

 

 --*/

@@ -621,13 +621,13 @@ UpdateFrontPageStrings (
 /*++

 

 Routine Description:

-  

+

   Update the banner information for the Front Page based on DataHub information

 

 Arguments:

-  

+

   None

-  

+

 Returns:

 

 --*/

@@ -689,7 +689,7 @@ Returns:
         GetStringFromToken (&Record->ProducerName, BiosVendor->BiosVersion, &NewString);

         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_BIOS_VERSION;

         Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);

-        gBS->FreePool (NewString);

+        FreePool (NewString);

         Find[0] = TRUE;

       }

 

@@ -700,7 +700,7 @@ Returns:
         GetStringFromToken (&Record->ProducerName, SystemManufacturer->SystemProductName, &NewString);

         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_COMPUTER_MODEL;

         Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);

-        gBS->FreePool (NewString);

+        FreePool (NewString);

         Find[1] = TRUE;

       }

 

@@ -711,7 +711,7 @@ Returns:
         GetStringFromToken (&Record->ProducerName, *ProcessorVersion, &NewString);

         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_CPU_MODEL;

         Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);

-        gBS->FreePool (NewString);

+        FreePool (NewString);

         Find[2] = TRUE;

       }

 

@@ -722,7 +722,7 @@ Returns:
         ConvertProcessorToString (ProcessorFrequency, &NewString);

         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_CPU_SPEED;

         Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);

-        gBS->FreePool (NewString);

+        FreePool (NewString);

         Find[3] = TRUE;

       }

 

@@ -730,12 +730,12 @@ Returns:
           (DataHeader->RecordType == EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER)

           ) {

         MemoryArray = (EFI_MEMORY_ARRAY_START_ADDRESS_DATA *) (DataHeader + 1);

-        ConvertMemorySizeToString((UINT32)(RShiftU64((MemoryArray->MemoryArrayEndAddress - 

+        ConvertMemorySizeToString((UINT32)(RShiftU64((MemoryArray->MemoryArrayEndAddress -

                                   MemoryArray->MemoryArrayStartAddress + 1), 20)),

                                   &NewString);

         TokenToUpdate = (STRING_REF) STR_FRONT_PAGE_MEMORY_SIZE;

         Hii->NewString (Hii, Lang, gFrontPageHandle, &TokenToUpdate, NewString);

-        gBS->FreePool (NewString);

+        FreePool (NewString);

         Find[4] = TRUE;

       }

     }

@@ -753,15 +753,15 @@ PlatformBdsEnterFrontPage (
 

 Routine Description:

   This function is the main entry of the platform setup entry.

-  The function will present the main menu of the system setup, 

+  The function will present the main menu of the system setup,

   this is the platform reference part and can be customize.

-  

+

 Arguments:

   TimeoutDefault     - The fault time out value before the system

                        continue to boot.

   ConnectAllHappened - The indicater to check if the connect all have

                        already happended.

-  

+

 Returns:

   None

 

@@ -890,7 +890,7 @@ Returns:
   //Will leave browser, check any reset required change is applied? if yes, reset system

   //

   SetupResetReminder ();

-  

+

   //

   // Automatically load current entry

   // Note: The following lines of code only execute when Auto boot

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.c
index 21d61f1..7057cab 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -16,7 +16,7 @@ Module Name:
 Abstract:

 

  Language settings

-  

+

 Revision History

 

 --*/

@@ -311,7 +311,7 @@ Routine Description:
 

 Arguments:

   None

-            

+

 Returns:

 

 --*/

@@ -326,7 +326,7 @@ Returns:
   HiiHandle = 0;

   Hii->NewPack (Hii, PackageList, &HiiHandle);

 

-  gBS->FreePool (PackageList);

+  FreePool (PackageList);

 }

 

 VOID

@@ -336,12 +336,12 @@ InitializeLanguage (
 /*++

 

 Routine Description:

-  Determine the current language that will be used 

+  Determine the current language that will be used

   based on language related EFI Variables

 

 Arguments:

   LangCodesSettingRequired - If required to set LangCode variable

-            

+

 Returns:

 

 --*/

@@ -421,11 +421,11 @@ Returns:
   }

 

   if (LangCodes) {

-    gBS->FreePool (LangCodes);

+    FreePool (LangCodes);

   }

 

   if (LanguageString != NULL) {

-    gBS->FreePool (LanguageString);

+    FreePool (LanguageString);

   }

 

 }

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
index d4e5bc5..40467c0 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/MemoryTest.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -38,19 +38,19 @@ PlatformBdsShowProgress (
 /*++

 

 Routine Description:

-  

+

   Show progress bar with title above it. It only works in UGA mode.

 

 Arguments:

-  

+

   TitleForeground - Foreground color for Title.

   TitleBackground - Background color for Title.

   Title           - Title above progress bar.

   ProgressColor   - Progress bar color.

   Progress        - Progress (0-100)

 

-Returns: 

-  

+Returns:

+

   EFI_STATUS      - Success update the progress bar

 

 --*/

@@ -203,19 +203,19 @@ BdsMemoryTest (
 /*++

 

 Routine Description:

-  

-  Perform the memory test base on the memory test intensive level, 

+

+  Perform the memory test base on the memory test intensive level,

   and update the memory resource.

 

 Arguments:

-  

+

   Level  - The memory test intensive level.

 

-Returns: 

-  

+Returns:

+

   EFI_STATUS      - Success test all the system memory and update

                     the memory resource

-                    

+

 --*/

 {

   EFI_STATUS                        Status;

@@ -274,7 +274,7 @@ Returns:
                   &GenMemoryTest

                   );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Pos);

+    FreePool (Pos);

     return EFI_SUCCESS;

   }

 

@@ -291,7 +291,7 @@ Returns:
     // do the test, and then the status of EFI_NO_MEDIA will be returned by

     // "MemoryTestInit". So it does not need to test memory again, just return.

     //

-    gBS->FreePool (Pos);

+    FreePool (Pos);

     return EFI_SUCCESS;

   }

 

@@ -300,7 +300,7 @@ Returns:
 

   if (TmpStr != NULL) {

     gST->ConOut->OutputString (gST->ConOut, TmpStr);

-    gBS->FreePool (TmpStr);

+    FreePool (TmpStr);

   }

 

   do {

@@ -317,7 +317,7 @@ Returns:
         PrintXY (10, 10, NULL, NULL, TmpStr);

         gST->ConOut->SetCursorPosition (gST->ConOut, 0, 4);

         gST->ConOut->OutputString (gST->ConOut, TmpStr);

-        gBS->FreePool (TmpStr);

+        FreePool (TmpStr);

       }

 

       ASSERT (0);

@@ -333,7 +333,7 @@ Returns:
       TmpStr = GetStringById (STRING_TOKEN (STR_MEMORY_TEST_PERCENT));

       if (TmpStr != NULL) {

         BdsLibOutputStrings (gST->ConOut, StrPercent, TmpStr, NULL);

-        gBS->FreePool (TmpStr);

+        FreePool (TmpStr);

       }

 

       TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));

@@ -346,7 +346,7 @@ Returns:
           TestPercent,

           (UINTN) PreviousValue

           );

-        gBS->FreePool (TmpStr);

+        FreePool (TmpStr);

       }

     }

 

@@ -365,7 +365,7 @@ Returns:
             100,

             (UINTN) PreviousValue

             );

-          gBS->FreePool (TmpStr);

+          FreePool (TmpStr);

         }

 

         gST->ConOut->SetCursorPosition (gST->ConOut, 0, 0);

@@ -389,7 +389,7 @@ Done:
   TmpStr = GetStringById (STRING_TOKEN (STR_MEM_TEST_COMPLETED));

   if (TmpStr != NULL) {

     StrCat (StrTotalMemory, TmpStr);

-    gBS->FreePool (TmpStr);

+    FreePool (TmpStr);

   }

 

   gST->ConOut->ClearScreen (gST->ConOut);

@@ -405,7 +405,7 @@ Done:
     (UINTN) PreviousValue

     );

 

-  gBS->FreePool (Pos);

+  FreePool (Pos);

 

   DataSize = sizeof (Value);

   Status = gRT->GetVariable (

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/String.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/String.c
index 412b7f8..604528d 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/String.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/String.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -36,7 +36,7 @@ InitializeStringSupport (
 /*++

 

 Routine Description:

-  

+

   Initialize HII global accessor for string support

 

 Arguments:

@@ -60,7 +60,7 @@ Returns:
   if (!EFI_ERROR (Status)) {

     PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);

     Status      = Hii->NewPack (Hii, PackageList, &gStringPackHandle);

-    gBS->FreePool (PackageList);

+    FreePool (PackageList);

   }

 

   return Status;

@@ -79,7 +79,7 @@ Routine Description:
 Arguments:

 

   Id       - String ID.

-           

+

 Returns:

 

   CHAR16 * - String from ID.

@@ -112,7 +112,7 @@ Returns:
       //

       // Free the old pool

       //

-      gBS->FreePool (String);

+      FreePool (String);

 

       //

       // Allocate new pool with correct value