Update HiiConfigAccess.ExtractConfig interface to support NULL request string and ConfigHdr request string.

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

2 files changed, 55 insertions, 7 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 2f632247a8..f7b821f906 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -1,7 +1,7 @@
 /** @file

   The functions for Boot Maintainence Main menu.

 

-Copyright (c) 2004 - 2009, Intel Corporation. <BR>

+Copyright (c) 2004 - 2010, Intel Corporation. <BR>

 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

@@ -184,25 +184,70 @@ BootMaintExtractConfig (
   EFI_STATUS         Status;

   UINTN              BufferSize;

   BMM_CALLBACK_DATA  *Private;

+  EFI_STRING                       ConfigRequestHdr;

+  EFI_STRING                       ConfigRequest;

+  BOOLEAN                          AllocatedRequest;

+  UINTN                            Size;

 

-  if (Request == NULL) {

+  if (Progress == NULL || Results == NULL) {

     return EFI_INVALID_PARAMETER;

   }

 

-  Private = BMM_CALLBACK_DATA_FROM_THIS (This);

+  *Progress = Request;

+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {

+    return EFI_NOT_FOUND;

+  }

 

+  ConfigRequestHdr = NULL;

+  ConfigRequest    = NULL;

+  AllocatedRequest = FALSE;

+  Size             = 0;

+

+  Private = BMM_CALLBACK_DATA_FROM_THIS (This);

   //

   // Convert buffer data to <ConfigResp> by helper function BlockToConfig()

   //

   BufferSize = sizeof (BMM_FAKE_NV_DATA);

+  ConfigRequest = Request;

+  if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {

+    //

+    // Request has no request element, construct full request string.

+    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

+    // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

+    //

+    ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);

+    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

+    ConfigRequest = AllocateZeroPool (Size);

+    ASSERT (ConfigRequest != NULL);

+    AllocatedRequest = TRUE;

+    UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

+    FreePool (ConfigRequestHdr);

+  }

+

   Status = gHiiConfigRouting->BlockToConfig (

                                 gHiiConfigRouting,

-                                Request,

+                                ConfigRequest,

                                 (UINT8 *) &Private->BmmFakeNvData,

                                 BufferSize,

                                 Results,

                                 Progress

                                 );

+  //

+  // Free the allocated config request string.

+  //

+  if (AllocatedRequest) {

+    FreePool (ConfigRequest);

+    ConfigRequest = NULL;

+  }

+  //

+  // Set Progress string to the original request string.

+  //

+  if (Request == NULL) {

+    *Progress = NULL;

+  } else if (StrStr (Request, L"OFFSET") == NULL) {

+    *Progress = Request + StrLen (Request);

+  }

+

   return Status;

 }

 

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index f112040a4a..48cd70f2f8 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -78,7 +78,7 @@ HII_VENDOR_DEVICE_PATH  mFrontPageHiiVendorDevicePath = {
 

   @retval  EFI_SUCCESS            The Results is filled with the requested values.

   @retval  EFI_OUT_OF_RESOURCES   Not enough memory to store the results.

-  @retval  EFI_INVALID_PARAMETER  Request is NULL, illegal syntax, or unknown name.

+  @retval  EFI_INVALID_PARAMETER  Request is illegal syntax, or unknown name.

   @retval  EFI_NOT_FOUND          Routing data doesn't match any storage in this driver.

 

 **/

@@ -91,7 +91,7 @@ FakeExtractConfig (
   OUT EFI_STRING                             *Results

   )

 {

-  if (Request == NULL || Progress == NULL || Results == NULL) {

+  if (Progress == NULL || Results == NULL) {

     return EFI_INVALID_PARAMETER;

   }

   *Progress = Request;

@@ -310,6 +310,7 @@ InitializeFrontPage (
   EFI_IFR_GUID_LABEL          *StartLabel;

   EFI_IFR_GUID_LABEL          *EndLabel;

   BOOLEAN                     FirstFlag;

+  EFI_STRING_ID               Temp;

 

   if (InitializeHiiData) {

     //

@@ -424,11 +425,13 @@ InitializeFrontPage (
       GetNextLanguage (&LangCode, Lang);

       OptionCount ++;

     }

-    gFrontPagePrivate.LanguageToken = AllocatePool (OptionCount * sizeof (EFI_STRING_ID));

+    gFrontPagePrivate.LanguageToken = AllocatePool ((OptionCount + 1) * sizeof (EFI_STRING_ID));

     ASSERT (gFrontPagePrivate.LanguageToken != NULL);

     FirstFlag = TRUE;

   }

 

+  Status = gHiiString->NewString (gHiiString, HiiHandle, &Temp, "de-DE", L"Dedede", L"TEST", NULL);

+

   OptionCount = 0;

   LangCode = LanguageString;

   while (*LangCode != 0) {