HII Library Class interface refine.

The "HiiLib" prefix for all HII Library API function names changed to "Hii".

Remove: 
  HiiLibPreparePackageList(), replaced by HiiAddPackages()
  HiiLibNewString(), replaced by HiiSetString()
  HiiLibGetStringFromHandle(), replaced by HiiGetString()
  HiiLibGetStringFromToken(), replaced by HiiGetPackageString()
  HiiLibExtractGuidFromHiiHandle()
  HiiLibDevicePathToHiiHandle()
  HiiLibGetSupportedSecondaryLanguages()
  HiiLibGetSupportedLanguageNumber()
  HiiLibExportPackageLists()
  HiiLibListPackageLists()
  
Interface change:
  HiiAddPackages()
  HiiSetString()
  HiiGetString()
  HiiGetHiiHandles()

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

2 files changed, 19 insertions, 16 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index 615c189d8d..4918b25b13 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -129,7 +129,8 @@ BootManagerCallback (
   Registers HII packages for the Boot Manger to HII Database.

   It also registers the browser call back function.

 

-  @return Status of gBS->InstallMultipleProtocolInterfaces() and gHiiDatabase->NewPackageList()

+  @retval  EFI_SUCCESS           HII packages for the Boot Manager were registered successfully.

+  @retval  EFI_OUT_OF_RESOURCES  HII packages for the Boot Manager failed to be registered.

 

 **/

 EFI_STATUS

@@ -138,7 +139,6 @@ InitializeBootManager (
   )

 {

   EFI_STATUS                  Status;

-  EFI_HII_PACKAGE_LIST_HEADER *PackageList;

 

   //

   // Install Device Path Protocol and Config Access protocol to driver handle

@@ -156,17 +156,18 @@ InitializeBootManager (
   //

   // Publish our HII data

   //

-  PackageList = HiiLibPreparePackageList (2, &mBootManagerGuid, BootManagerVfrBin, BdsDxeStrings);

-  ASSERT (PackageList != NULL);

-

-  Status = gHiiDatabase->NewPackageList (

-                           gHiiDatabase,

-                           PackageList,

-                           gBootManagerPrivate.DriverHandle,

-                           &gBootManagerPrivate.HiiHandle

-                           );

-  FreePool (PackageList);

-

+  gBootManagerPrivate.HiiHandle = HiiAddPackages (

+                                    &mBootManagerGuid,

+                                    gBootManagerPrivate.DriverHandle,

+                                    BootManagerVfrBin,

+                                    BdsDxeStrings,

+                                    NULL

+                                    );

+  if (gBootManagerPrivate.HiiHandle == NULL) {

+    Status = EFI_OUT_OF_RESOURCES;

+  } else {

+    Status = EFI_SUCCESS;

+  }

   return Status;

 }

 

@@ -244,7 +245,7 @@ CallBootManager (
       continue;

     }

 

-    HiiLibNewString (HiiHandle, &Token, Option->Description);

+    Token = HiiSetString (HiiHandle, 0, Option->Description, NULL);

 

     TempStr = DevicePathToStr (Option->DevicePath);

     TempSize = StrSize (TempStr);

@@ -253,7 +254,7 @@ CallBootManager (
     StrCat (HelpString, L"Device Path : ");

     StrCat (HelpString, TempStr);

 

-    HiiLibNewString (HiiHandle, &HelpToken, HelpString);

+    HelpToken = HiiSetString (HiiHandle, 0, HelpString, NULL);

 

     CreateActionOpCode (

       mKeyInput,

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
index d7566f4ccf..90b7b2850d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
@@ -86,7 +86,9 @@ BootManagerCallback (
   Registers HII packages for the Boot Manger to HII Database.

   It also registers the browser call back function.

 

-  @return Status of gBS->InstallMultipleProtocolInterfaces() and gHiiDatabase->NewPackageList()

+  @retval  EFI_SUCCESS           HII packages for the Boot Manager were registered successfully.

+  @retval  EFI_OUT_OF_RESOURCES  HII packages for the Boot Manager failed to be registered.

+

 **/

 EFI_STATUS

 InitializeBootManager (