Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c (modified) (102 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/Database.c (modified) (7 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/Font.c (modified) (10 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h (modified) (16 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf (modified) (3 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/Image.c (modified) (12 diffs)
• MdeModulePkg/Universal/HiiDatabaseDxe/String.c (modified) (19 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c

@@ -2 +2 @@
 Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.
 
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -243 +243 @@
     *SubStr = AllocateCopyPool (StrSize (String), String);
     ASSERT (*SubStr != NULL);
-    return ;
+    return;
   }
   
@@ -356 +356 @@
 
   Length = TmpPtr - String;
+  if (Length == 0) {
+    return EFI_NOT_FOUND;
+  }
   Result = AllocateCopyPool (Length * sizeof (CHAR16), String);
   if (Result == NULL) {
@@ -629 +632 @@
     //
     *(AltConfigHdr + HeaderLength) = L'\0';
-    StringPtrDefault = StrStr (StringPtrDefault + 1, AltConfigHdr);    
+    StringPtrDefault = StrStr (StringPtrDefault + 1, AltConfigHdr);
   }
   
@@ -650 +653 @@
 {
   LIST_ENTRY             *Link;
-  IFR_DEFAULT_DATA       *DefaultValueArray;
-
-  for (Link = BlockData->DefaultValueEntry.ForwardLink; Link != &BlockData->DefaultValueEntry; Link = Link->ForwardLink) {
+  IFR_DEFAULT_DATA       *DefaultValueArray; 
+  LIST_ENTRY             *DefaultLink;
+ 
+  DefaultLink   = &BlockData->DefaultValueEntry;
+
+  for (Link = DefaultLink->ForwardLink; Link != DefaultLink; Link = Link->ForwardLink) {
     DefaultValueArray = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
     if (DefaultValueArray->DefaultId == DefaultValueData->DefaultId) {
@@ -682 +688 @@
   This function inserts new BlockData into the block link
 
-  @param  BlockLink   The list entry points to block array.
-  @param  BlockData   The point to BlockData is added.
+  @param  BlockLink      The list entry points to block array.
+  @param  BlockData      The point to BlockData is added.
   
 **/
@@ -692 +698 @@
   )
 {
-  LIST_ENTRY      *Link;
-  IFR_BLOCK_DATA  *BlockArray;
-  IFR_BLOCK_DATA  *BlockSingleData;
+  LIST_ENTRY          *Link;
+  IFR_BLOCK_DATA      *BlockArray;
+  IFR_BLOCK_DATA      *BlockSingleData;
 
   BlockSingleData = *BlockData;
-  
+
+  if (BlockSingleData->Name != NULL) {
+    InsertTailList (BlockLink, &BlockSingleData->Entry);
+    return;
+  }
+
   //
   // Insert block data in its Offset and Width order.
@@ -716 +727 @@
         // The same block array has been added.
         //
-        FreePool (BlockSingleData);
-        *BlockData = BlockArray;
+        if (BlockSingleData != BlockArray) {
+          FreePool (BlockSingleData);
+          *BlockData = BlockArray;
+        }
         return;
       }
@@ -732 +745 @@
   // Add new block data into the tail.
   //
-  InsertTailList (Link, &BlockSingleData->Entry);
-  return;  
+  InsertTailList (Link, &BlockSingleData->Entry); 
+}
+
+/**
+  Retrieves a pointer to the a Null-terminated ASCII string containing the list 
+  of languages that an HII handle in the HII Database supports.  The returned 
+  string is allocated using AllocatePool().  The caller is responsible for freeing
+  the returned string using FreePool().  The format of the returned string follows
+  the language format assumed the HII Database.
+  
+  If HiiHandle is NULL, then ASSERT().
+
+  @param[in]  HiiHandle  A handle that was previously registered in the HII Database.
+
+  @retval NULL   HiiHandle is not registered in the HII database
+  @retval NULL   There are not enough resources available to retrieve the suported 
+                 languages.
+  @retval NULL   The list of suported languages could not be retrieved.
+  @retval Other  A pointer to the Null-terminated ASCII string of supported languages.
+
+**/
+CHAR8 *
+GetSupportedLanguages (
+  IN EFI_HII_HANDLE           HiiHandle
+  )
+{
+  EFI_STATUS  Status;
+  UINTN       LanguageSize;
+  CHAR8       TempSupportedLanguages;
+  CHAR8       *SupportedLanguages;
+
+  ASSERT (HiiHandle != NULL);
+
+  //
+  // Retrieve the size required for the supported languages buffer.
+  //
+  LanguageSize = 0;
+  Status = mPrivate.HiiString.GetLanguages (&mPrivate.HiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);
+
+  //
+  // If GetLanguages() returns EFI_SUCCESS for a zero size, 
+  // then there are no supported languages registered for HiiHandle.  If GetLanguages() 
+  // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present
+  // in the HII Database
+  //
+  if (Status != EFI_BUFFER_TOO_SMALL) {
+    //
+    // Return NULL if the size can not be retrieved, or if HiiHandle is not in the HII Database
+    //
+    return NULL;
+  }
+
+  //
+  // Allocate the supported languages buffer.
+  //
+  SupportedLanguages = AllocateZeroPool (LanguageSize);
+  if (SupportedLanguages == NULL) {
+    //
+    // Return NULL if allocation fails.
+    //
+    return NULL;
+  }
+
+  //
+  // Retrieve the supported languages string
+  //
+  Status = mPrivate.HiiString.GetLanguages (&mPrivate.HiiString, HiiHandle, SupportedLanguages, &LanguageSize);
+  if (EFI_ERROR (Status)) {
+    //
+    // Free the buffer and return NULL if the supported languages can not be retrieved.
+    //
+    FreePool (SupportedLanguages);
+    return NULL;
+  }
+
+  //
+  // Return the Null-terminated ASCII string of supported languages
+  //
+  return SupportedLanguages;
+}
+
+/**
+  Retrieves a string from a string package.
+  
+  If HiiHandle is NULL, then ASSERT().
+  If StringId is 0, then ASSET.
+
+  @param[in]  HiiHandle  A handle that was previously registered in the HII Database.
+  @param[in]  StringId   The identifier of the string to retrieved from the string 
+                         package associated with HiiHandle.
+
+  @retval NULL   The string specified by StringId is not present in the string package.
+  @retval Other  The string was returned.
+
+**/
+EFI_STRING
+InternalGetString (
+  IN EFI_HII_HANDLE  HiiHandle,
+  IN EFI_STRING_ID   StringId
+  )
+{
+  EFI_STATUS  Status;
+  UINTN       StringSize;
+  CHAR16      TempString;
+  EFI_STRING  String;
+  CHAR8       *SupportedLanguages;
+  CHAR8       *PlatformLanguage;
+  CHAR8       *BestLanguage;
+  CHAR8       *Language;
+
+  ASSERT (HiiHandle != NULL);
+  ASSERT (StringId != 0);
+
+  //
+  // Initialize all allocated buffers to NULL
+  // 
+  SupportedLanguages = NULL;
+  PlatformLanguage   = NULL;
+  BestLanguage       = NULL;
+  String             = NULL;
+  Language           = "";
+
+  //
+  // Get the languages that the package specified by HiiHandle supports
+  //
+  SupportedLanguages = GetSupportedLanguages (HiiHandle);
+  if (SupportedLanguages == NULL) {
+    goto Error;
+  }
+
+  //
+  // Get the current platform language setting
+  //
+  GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);
+
+  //
+  // Get the best matching language from SupportedLanguages
+  //
+  BestLanguage = GetBestLanguage (
+                   SupportedLanguages, 
+                   FALSE,                                             // RFC 4646 mode
+                   Language,                                          // Highest priority 
+                   PlatformLanguage != NULL ? PlatformLanguage : "",  // Next highest priority
+                   SupportedLanguages,                                // Lowest priority 
+                   NULL
+                   );
+  if (BestLanguage == NULL) {
+    goto Error;
+  }
+
+  //
+  // Retrieve the size of the string in the string package for the BestLanguage
+  //
+  StringSize = 0;
+  Status = mPrivate.HiiString.GetString (
+                         &mPrivate.HiiString,
+                         BestLanguage,
+                         HiiHandle,
+                         StringId,
+                         &TempString,
+                         &StringSize,
+                         NULL
+                         );
+  //
+  // If GetString() returns EFI_SUCCESS for a zero size, 
+  // then there are no supported languages registered for HiiHandle.  If GetString() 
+  // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present
+  // in the HII Database
+  //
+  if (Status != EFI_BUFFER_TOO_SMALL) {
+    goto Error;
+  }
+
+  //
+  // Allocate a buffer for the return string
+  //
+  String = AllocateZeroPool (StringSize);
+  if (String == NULL) {
+    goto Error;
+  }
+
+  //
+  // Retrieve the string from the string package
+  //
+  Status = mPrivate.HiiString.GetString (
+                         &mPrivate.HiiString,
+                         BestLanguage,
+                         HiiHandle,
+                         StringId,
+                         String,
+                         &StringSize,
+                         NULL
+                         );
+  if (EFI_ERROR (Status)) {
+    //
+    // Free the buffer and return NULL if the supported languages can not be retrieved.
+    //
+    FreePool (String);
+    String = NULL;
+  }
+
+Error:
+  //
+  // Free allocated buffers
+  //
+  if (SupportedLanguages != NULL) {
+    FreePool (SupportedLanguages);
+  }
+  if (PlatformLanguage != NULL) {
+    FreePool (PlatformLanguage);
+  }
+  if (BestLanguage != NULL) {
+    FreePool (BestLanguage);
+  }
+
+  //
+  // Return the Null-terminated Unicode string
+  //
+  return String;
 }
 
@@ -742 +972 @@
   @param  VarOffset          Offset of var to the structure
   @param  VarWidth           Width of var.
+  @param  IsNameValueType    Whether this varstore is name/value varstore or not.
+  @param  HiiHandle          Hii handle for this hii package.
   
   @retval TRUE   This Var is in the block range.
@@ -750 +982 @@
   IN IFR_BLOCK_DATA  *RequestBlockArray,
   IN UINT16          VarOffset,
-  IN UINT16          VarWidth
+  IN UINT16          VarWidth,
+  IN BOOLEAN         IsNameValueType,
+  IN EFI_HII_HANDLE  HiiHandle
   )
 {
   LIST_ENTRY          *Link;
   IFR_BLOCK_DATA      *BlockData;
-  
+  EFI_STRING          Name;
+
   //
   // No Request Block array, all vars are got.
@@ -762 +997 @@
     return TRUE;
   }
-  
+
   //
   // Check the input var is in the request block range.
@@ -768 +1003 @@
   for (Link = RequestBlockArray->Entry.ForwardLink; Link != &RequestBlockArray->Entry; Link = Link->ForwardLink) {
     BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
-    if ((VarOffset >= BlockData->Offset) && ((VarOffset + VarWidth) <= (BlockData->Offset + BlockData->Width))) {
-      return TRUE;
+
+    if (IsNameValueType) {
+      Name = InternalGetString (HiiHandle, VarOffset);
+      ASSERT (Name != NULL);
+
+      if (StrnCmp (BlockData->Name, Name, StrLen (Name)) == 0) {
+        FreePool (Name);
+        return TRUE;
+      }
+      FreePool (Name);
+    } else {
+      if ((VarOffset >= BlockData->Offset) && ((VarOffset + VarWidth) <= (BlockData->Offset + BlockData->Width))) {
+        return TRUE;
+      }
     }
   }
@@ -862 +1109 @@
   OUT    BOOLEAN                    *IsEfiVarstore,
   OUT    EFI_IFR_VARSTORE_EFI       **EfiVarStore
-  
   )
 {
   EFI_STATUS               Status;
   UINTN                    IfrOffset;
+  UINTN                    PackageOffset;
   EFI_IFR_OP_HEADER        *IfrOpHdr;
   CHAR16                   *VarStoreName;
@@ -876 +1123 @@
   UINTN                    PackageSize;
   EFI_IFR_VARSTORE_EFI     *IfrEfiVarStore;
+  EFI_HII_PACKAGE_HEADER   *PackageHeader;
   
   HiiFormPackage = NULL;
@@ -883 +1131 @@
   NameStr          = NULL;
   TempStr          = NULL;
+  *IsEfiVarstore   = FALSE;
 
   Status = GetFormPackageData(DataBaseRecord, &HiiFormPackage, &PackageSize);
@@ -889 +1138 @@
   }
 
-  IfrOffset   = sizeof (EFI_HII_PACKAGE_HEADER);
+  IfrOffset     = sizeof (EFI_HII_PACKAGE_HEADER);
+  PackageOffset = IfrOffset;
+  PackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiFormPackage;
+
   while (IfrOffset < PackageSize) {
-    IfrOpHdr  = (EFI_IFR_OP_HEADER *) (HiiFormPackage + IfrOffset);    
+    //
+    // More than one form packages exist.
+    //
+    if (PackageOffset >= PackageHeader->Length) {
+        //
+        // Process the new form package.
+        //
+        PackageOffset = sizeof (EFI_HII_PACKAGE_HEADER);
+        IfrOffset    += PackageOffset;
+        PackageHeader = (EFI_HII_PACKAGE_HEADER *) (HiiFormPackage + IfrOffset);
+    }
+
+    IfrOpHdr  = (EFI_IFR_OP_HEADER *) (HiiFormPackage + IfrOffset);
     IfrOffset += IfrOpHdr->Length;
+    PackageOffset += IfrOpHdr->Length;
 
     if (IfrOpHdr->OpCode == EFI_IFR_VARSTORE_EFI_OP ) {
@@ -947 +1212 @@
       FreePool (NameStr);
       FreePool (TempStr);
+
+      //
+      // Already found the varstore, break;
+      //
+      if (*IsEfiVarstore) {
+        break;
+      }
     }
   }
@@ -958 +1230 @@
 
 /**
+  Check whether the ConfigRequest string has the request elements.
+  For EFI_HII_VARSTORE_BUFFER type, the request has "&OFFSET=****&WIDTH=****..." format.
+  For EFI_HII_VARSTORE_NAME_VALUE type, the request has "&NAME1**&NAME2..." format.
+
+  @param  ConfigRequest      The input config request string.
+
+  @retval  TRUE              The input include config request elements.
+  @retval  FALSE             The input string not includes.
+
+**/
+BOOLEAN
+GetElementsFromRequest (
+  IN EFI_STRING    ConfigRequest
+  )
+{
+  EFI_STRING   TmpRequest;
+
+  TmpRequest = StrStr (ConfigRequest, L"PATH=");
+  ASSERT (TmpRequest != NULL);
+
+  if ((StrStr (TmpRequest, L"&OFFSET=") != NULL) || (StrStr (TmpRequest, L"&") != NULL)) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+/**
+  Check whether the this varstore is the request varstore.
+
+  @param  VarstoreGuid      Varstore guid.
+  @param  Name              Varstore name.
+  @param  ConfigHdr         Current configRequest info.
+
+  @retval  TRUE              This varstore is the requst one.
+  @retval  FALSE             This varstore is not the requst one.
+                                 
+**/
+BOOLEAN
+IsThisVarstore (
+  IN EFI_GUID    *VarstoreGuid,
+  IN CHAR16      *Name,
+  IN CHAR16      *ConfigHdr
+  )
+{
+  EFI_STRING               GuidStr;
+  EFI_STRING               NameStr;
+  EFI_STRING               TempStr;
+  UINTN                    LengthString;
+  BOOLEAN                  RetVal;
+
+  RetVal       = FALSE;
+  GuidStr      = NULL;
+  TempStr      = NULL;
+
+  //
+  // If ConfigHdr has name field and varstore not has name, return FALSE.
+  //
+  if (Name == NULL && ConfigHdr != NULL && StrStr (ConfigHdr, L"NAME=&") == NULL) {
+    return FALSE;
+  }
+
+  GenerateSubStr (L"GUID=", sizeof (EFI_GUID), (VOID *)VarstoreGuid, 1, &GuidStr);
+  if (Name != NULL) {
+    GenerateSubStr (L"NAME=", StrLen (Name) * sizeof (CHAR16), (VOID *) Name, 2, &NameStr);
+  } else {
+    GenerateSubStr (L"NAME=", 0, NULL, 2, &NameStr);
+  }
+  LengthString = StrLen (GuidStr);
+  LengthString = LengthString + StrLen (NameStr) + 1;
+  TempStr = AllocateZeroPool (LengthString * sizeof (CHAR16));
+  if (TempStr == NULL) {
+    goto Done;
+  }
+
+  StrCpy (TempStr, GuidStr);
+  StrCat (TempStr, NameStr);
+
+  if (ConfigHdr == NULL || StrnCmp (ConfigHdr, TempStr, StrLen (TempStr)) == 0) {
+    RetVal = TRUE;
+  }
+
+Done:
+  if (GuidStr != NULL) {
+    FreePool (GuidStr); 
+  }
+
+  if (NameStr != NULL) {
+    FreePool (NameStr);
+  }
+
+  if (TempStr != NULL) {
+    FreePool (TempStr);
+  }
+
+  return RetVal;
+}
+
+/**
+  This function parses Form Package to get the efi varstore info according to the request ConfigHdr.
+
+  @param  DataBaseRecord        The DataBaseRecord instance contains the found Hii handle and package.
+  @param  ConfigHdr             Request string ConfigHdr. If it is NULL,
+                                the first found varstore will be as ConfigHdr.
+  @retval  TRUE                 This hii package is the reqeust one.
+  @retval  FALSE                This hii package is not the reqeust one.
+**/                                
+BOOLEAN
+IsThisPackageList (
+  IN     HII_DATABASE_RECORD        *DataBaseRecord,
+  IN     EFI_STRING                 ConfigHdr
+  )
+{
+  EFI_STATUS               Status;
+  UINTN                    IfrOffset;
+  UINTN                    PackageOffset;
+  EFI_IFR_OP_HEADER        *IfrOpHdr;
+  CHAR16                   *VarStoreName;
+  UINT8                    *HiiFormPackage;
+  UINTN                    PackageSize;
+  EFI_IFR_VARSTORE_EFI     *IfrEfiVarStore;
+  EFI_HII_PACKAGE_HEADER   *PackageHeader;
+  EFI_IFR_VARSTORE         *IfrVarStore;
+  EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
+  BOOLEAN                  FindVarstore;
+
+  HiiFormPackage   = NULL;
+  VarStoreName     = NULL;
+  Status           = EFI_SUCCESS;
+  FindVarstore     = FALSE;
+
+  Status = GetFormPackageData(DataBaseRecord, &HiiFormPackage, &PackageSize);
+  if (EFI_ERROR (Status)) {
+    return FALSE;
+  }
+
+  IfrOffset     = sizeof (EFI_HII_PACKAGE_HEADER);
+  PackageOffset = IfrOffset;
+  PackageHeader = (EFI_HII_PACKAGE_HEADER *) HiiFormPackage;
+
+  while (IfrOffset < PackageSize) {
+    //
+    // More than one form packages exist.
+    //
+    if (PackageOffset >= PackageHeader->Length) {
+        //
+        // Process the new form package.
+        //
+        PackageOffset = sizeof (EFI_HII_PACKAGE_HEADER);
+        IfrOffset    += PackageOffset;
+        PackageHeader = (EFI_HII_PACKAGE_HEADER *) (HiiFormPackage + IfrOffset);
+    }
+
+    IfrOpHdr  = (EFI_IFR_OP_HEADER *) (HiiFormPackage + IfrOffset);
+    IfrOffset += IfrOpHdr->Length;
+    PackageOffset += IfrOpHdr->Length;
+
+    switch (IfrOpHdr->OpCode) {
+    
+    case EFI_IFR_VARSTORE_OP:
+      IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;
+
+      VarStoreName = AllocateZeroPool (AsciiStrSize ((CHAR8 *)IfrVarStore->Name) * sizeof (CHAR16));
+      if (VarStoreName == NULL) {
+        goto Done;
+      }
+      AsciiStrToUnicodeStr ((CHAR8 *)IfrVarStore->Name, VarStoreName);
+
+      if (IsThisVarstore((VOID *)&IfrVarStore->Guid, VarStoreName, ConfigHdr)) {
+        FindVarstore = TRUE;
+        goto Done;
+      }
+      break;
+
+    case EFI_IFR_VARSTORE_EFI_OP:
+      IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;
+      VarStoreName = AllocateZeroPool (AsciiStrSize ((CHAR8 *)IfrEfiVarStore->Name) * sizeof (CHAR16));
+      if (VarStoreName == NULL) {
+        goto Done;
+      }
+      AsciiStrToUnicodeStr ((CHAR8 *)IfrEfiVarStore->Name, VarStoreName);
+
+      if (IsThisVarstore (&IfrEfiVarStore->Guid, VarStoreName, ConfigHdr)) {
+        FindVarstore = TRUE;
+        goto Done;
+      }
+      break;
+
+    case EFI_IFR_VARSTORE_NAME_VALUE_OP:
+      IfrNameValueVarStore = (EFI_IFR_VARSTORE_NAME_VALUE *) IfrOpHdr;
+
+      if (IsThisVarstore (&IfrNameValueVarStore->Guid, NULL, ConfigHdr)) {
+        FindVarstore = TRUE;
+        goto Done;
+      }
+      break;
+      
+    case EFI_IFR_FORM_OP:
+    case EFI_IFR_FORM_MAP_OP:
+      //
+      // No matched varstore is found and directly return.
+      //
+      goto Done;
+
+    default:
+      break;
+    }
+  }
+Done:
+  if (HiiFormPackage != NULL) {
+    FreePool (HiiFormPackage);
+  }
+
+  if (VarStoreName != NULL) {
+    FreePool (VarStoreName);
+  }
+
+  return FindVarstore;
+}
+
+/**
+  Check whether the this op code is required.
+
+  @param  RequestBlockArray      The array includes all the request info or NULL.
+  @param  HiiHandle              The hii handle for this form package.
+  @param  VarStorageData         The varstore data strucure.
+  @param  IfrOpHdr               Ifr opcode header for this opcode.
+  @param  VarWidth               The buffer width for this opcode.
+  @param  ReturnData             The data block added for this opcode.
+
+  @retval  EFI_SUCCESS           This opcode is required.
+  @retval  Others                This opcode is not required or error occur.
+                                 
+**/
+EFI_STATUS
+IsThisOpcodeRequired (
+  IN     IFR_BLOCK_DATA           *RequestBlockArray,
+  IN     EFI_HII_HANDLE           HiiHandle,
+  IN OUT IFR_VARSTORAGE_DATA      *VarStorageData,
+  IN     EFI_IFR_OP_HEADER        *IfrOpHdr,
+  IN     UINT16                   VarWidth,
+  OUT    IFR_BLOCK_DATA           **ReturnData
+  )
+{
+  IFR_BLOCK_DATA           *BlockData;
+  UINT16                   VarOffset;
+  EFI_STRING_ID            NameId;
+  EFI_IFR_QUESTION_HEADER  *IfrQuestionHdr;
+
+  NameId    = 0;
+  VarOffset = 0;
+  IfrQuestionHdr = (EFI_IFR_QUESTION_HEADER  *)((CHAR8 *) IfrOpHdr + sizeof (EFI_IFR_OP_HEADER));
+
+  if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+    NameId = IfrQuestionHdr->VarStoreInfo.VarName;
+
+    //
+    // Check whether this question is in requested block array.
+    //
+    if (!BlockArrayCheck (RequestBlockArray, NameId, 0, TRUE, HiiHandle)) {
+      //
+      // This question is not in the requested string. Skip it.
+      //
+      return EFI_SUCCESS;
+    }
+  } else {
+    VarOffset = IfrQuestionHdr->VarStoreInfo.VarOffset;
+    
+    //
+    // Check whether this question is in requested block array.
+    //
+    if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth, FALSE, HiiHandle)) {
+      //
+      // This question is not in the requested string. Skip it.
+      //
+      return EFI_SUCCESS;
+    }
+
+    //
+    // Check this var question is in the var storage 
+    //
+    if (((VarOffset + VarWidth) > VarStorageData->Size)) {
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+
+  BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+  if (BlockData == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+    BlockData->Name   = InternalGetString(HiiHandle, NameId);
+  } else {
+    BlockData->Offset = VarOffset;
+  }
+
+  BlockData->Width      = VarWidth;
+  BlockData->QuestionId = IfrQuestionHdr->QuestionId;
+  BlockData->OpCode     = IfrOpHdr->OpCode;
+  BlockData->Scope      = IfrOpHdr->Scope;
+  InitializeListHead (&BlockData->DefaultValueEntry);
+  //
+  // Add Block Data into VarStorageData BlockEntry
+  //
+  InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
+  *ReturnData = BlockData;
+
+  return EFI_SUCCESS;
+}
+
+/**
   This function parses Form Package to get the block array and the default
   value array according to the request ConfigHdr.
 
+  @param  HiiHandle             Hii Handle for this hii package.
   @param  Package               Pointer to the form package data.
   @param  PackageLength         Length of the pacakge.
@@ -967 +1552 @@
   @param  RequestBlockArray     The block array is retrieved from the request string.
   @param  VarStorageData        VarStorage structure contains the got block and default value.
-  @param  PIfrDefaultIdArray    Point to the got default id and default name array.
+  @param  DefaultIdArray        Point to the got default id and default name array.
 
   @retval EFI_SUCCESS           The block array and the default value array are got.
@@ -977 +1562 @@
 EFIAPI
 ParseIfrData (
+  IN     EFI_HII_HANDLE      HiiHandle,
   IN     UINT8               *Package,
   IN     UINT32              PackageLength,
@@ -987 +1573 @@
   EFI_STATUS               Status;
   UINTN                    IfrOffset;
+  UINTN                    PackageOffset;
   EFI_IFR_VARSTORE         *IfrVarStore;
   EFI_IFR_VARSTORE_EFI     *IfrEfiVarStore;
@@ -998 +1585 @@
   EFI_IFR_PASSWORD         *IfrPassword;
   EFI_IFR_STRING           *IfrString;
+  EFI_IFR_DATE             *IfrDate;
+  EFI_IFR_TIME             *IfrTime;
   IFR_DEFAULT_DATA         DefaultData;
   IFR_DEFAULT_DATA         *DefaultDataPtr;
   IFR_BLOCK_DATA           *BlockData;
   CHAR16                   *VarStoreName;
-  UINT16                   VarOffset;
   UINT16                   VarWidth;
   UINT16                   VarDefaultId;
-  EFI_STRING               GuidStr;
-  EFI_STRING               NameStr;
-  EFI_STRING               TempStr;
-  UINTN                    LengthString;
   BOOLEAN                  FirstOneOfOption;
   LIST_ENTRY               *LinkData;
   LIST_ENTRY               *LinkDefault;
-
-  LengthString     = 0;
+  EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
+  EFI_HII_PACKAGE_HEADER   *PackageHeader;
+  EFI_VARSTORE_ID          VarStoreId;
+
   Status           = EFI_SUCCESS;
-  GuidStr          = NULL;
-  NameStr          = NULL;
-  TempStr          = NULL;
   BlockData        = NULL;
   DefaultDataPtr   = NULL;
   FirstOneOfOption = FALSE;
+  VarStoreId       = 0;
   ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA));
 
@@ -1026 +1610 @@
   // Go through the form package to parse OpCode one by one.
   //
-  IfrOffset   = sizeof (EFI_HII_PACKAGE_HEADER);
+  PackageOffset = sizeof (EFI_HII_PACKAGE_HEADER);
+  PackageHeader = (EFI_HII_PACKAGE_HEADER *) Package;
+  IfrOffset     = PackageOffset;
   while (IfrOffset < PackageLength) {
+
+    //
+    // More than one form package found.
+    //
+    if (PackageOffset >= PackageHeader->Length) {
+        //
+        // Already found varstore for this request, break;
+        //
+        if (VarStoreId != 0) {
+          VarStoreId = 0;
+        }
+
+        //
+        // Get next package header info.
+        //
+        IfrOffset    += sizeof (EFI_HII_PACKAGE_HEADER);
+        PackageOffset = sizeof (EFI_HII_PACKAGE_HEADER);
+        PackageHeader = (EFI_HII_PACKAGE_HEADER *) (Package + IfrOffset);
+    }
+
     IfrOpHdr  = (EFI_IFR_OP_HEADER *) (Package + IfrOffset);
-
     switch (IfrOpHdr->OpCode) {
     case EFI_IFR_VARSTORE_OP:
@@ -1035 +1640 @@
       // VarStore is found. Don't need to search any more.
       //
-      if (VarStorageData->Size != 0) {
+      if (VarStoreId != 0) {
         break;
       }
 
-      //
-      // Get the requied varstore information
-      // Add varstore by Guid and Name in ConfigHdr
-      // Make sure Offset is in varstore size and varstoreid
-      //
       IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;
+
       VarStoreName = AllocateZeroPool (AsciiStrSize ((CHAR8 *)IfrVarStore->Name) * sizeof (CHAR16));
       if (VarStoreName == NULL) {
@@ -1050 +1651 @@
         goto Done;
       }
-      AsciiStrToUnicodeStr ((CHAR8 *) IfrVarStore->Name, VarStoreName);
-
-      GenerateSubStr (L"GUID=", sizeof (EFI_GUID), (VOID *) &IfrVarStore->Guid, 1, &GuidStr);
-      GenerateSubStr (L"NAME=", StrLen (VarStoreName) * sizeof (CHAR16), (VOID *) VarStoreName, 2, &NameStr);
-      LengthString = StrLen (GuidStr);
-      LengthString = LengthString + StrLen (NameStr) + 1;
-      TempStr = AllocateZeroPool (LengthString * sizeof (CHAR16));
-      if (TempStr == NULL) {
-        FreePool (GuidStr);
-        FreePool (NameStr);
-        FreePool (VarStoreName);
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      StrCpy (TempStr, GuidStr);
-      StrCat (TempStr, NameStr);
-      if (ConfigHdr == NULL || StrnCmp (ConfigHdr, TempStr, StrLen (TempStr)) == 0) {
+      AsciiStrToUnicodeStr ((CHAR8 *)IfrVarStore->Name, VarStoreName);
+
+      if (IsThisVarstore((VOID *)&IfrVarStore->Guid, VarStoreName, ConfigHdr)) {
         //
         // Find the matched VarStore
         //
         CopyGuid (&VarStorageData->Guid, (EFI_GUID *) (VOID *) &IfrVarStore->Guid);
-        VarStorageData->VarStoreId = IfrVarStore->VarStoreId;
         VarStorageData->Size       = IfrVarStore->Size;
         VarStorageData->Name       = VarStoreName;
-      } else {
-        //
-        // No found, free the allocated memory 
-        //
-        FreePool (VarStoreName);
-      }
-      //
-      // Free alllocated temp string.
-      //
-      FreePool (GuidStr);
-      FreePool (NameStr);
-      FreePool (TempStr);
+        VarStorageData->Type       = EFI_HII_VARSTORE_BUFFER;
+        VarStoreId                 = IfrVarStore->VarStoreId;
+      }
       break;
 
@@ -1092 +1669 @@
       // VarStore is found. Don't need to search any more.
       //
-      if (VarStorageData->Size != 0) {
+      if (VarStoreId != 0) {
         break;
       }
 
-      //
-      // Get the requied varstore information
-      // Add varstore by Guid and Name in ConfigHdr
-      // Make sure Offset is in varstore size and varstoreid
-      //
       IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;
 
@@ -1117 +1689 @@
         goto Done;
       }
-      AsciiStrToUnicodeStr ((CHAR8 *) IfrEfiVarStore->Name, VarStoreName);
-
-      GenerateSubStr (L"GUID=", sizeof (EFI_GUID), (VOID *) &IfrEfiVarStore->Guid, 1, &GuidStr);
-      GenerateSubStr (L"NAME=", StrLen (VarStoreName) * sizeof (CHAR16), (VOID *) VarStoreName, 2, &NameStr);
-      LengthString = StrLen (GuidStr);
-      LengthString = LengthString + StrLen (NameStr) + 1;
-      TempStr = AllocateZeroPool (LengthString * sizeof (CHAR16));
-      if (TempStr == NULL) {
-        FreePool (GuidStr);
-        FreePool (NameStr);
-        FreePool (VarStoreName);
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      StrCpy (TempStr, GuidStr);
-      StrCat (TempStr, NameStr);
-      if (ConfigHdr == NULL || StrnCmp (ConfigHdr, TempStr, StrLen (TempStr)) == 0) {
+      AsciiStrToUnicodeStr ((CHAR8 *)IfrEfiVarStore->Name, VarStoreName);
+
+      if (IsThisVarstore (&IfrEfiVarStore->Guid, VarStoreName, ConfigHdr)) {
         //
         // Find the matched VarStore
         //
         CopyGuid (&VarStorageData->Guid, (EFI_GUID *) (VOID *) &IfrEfiVarStore->Guid);
-        VarStorageData->VarStoreId = IfrEfiVarStore->VarStoreId;
         VarStorageData->Size       = IfrEfiVarStore->Size;
         VarStorageData->Name       = VarStoreName;
-      } else {
-        //
-        // No found, free the allocated memory 
-        //
-        FreePool (VarStoreName);
-      }
-      //
-      // Free alllocated temp string.
-      //
-      FreePool (GuidStr);
-      FreePool (NameStr);
-      FreePool (TempStr);
+        VarStorageData->Type       = EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER;
+        VarStoreId                 = IfrEfiVarStore->VarStoreId;
+      }
+      break;
+
+    case EFI_IFR_VARSTORE_NAME_VALUE_OP:
+      //
+      // VarStore is found. Don't need to search any more.
+      //
+      if (VarStoreId != 0) {
+        break;
+      }
+
+      IfrNameValueVarStore = (EFI_IFR_VARSTORE_NAME_VALUE *) IfrOpHdr;
+
+      if (IsThisVarstore (&IfrNameValueVarStore->Guid, NULL, ConfigHdr)) {
+        //
+        // Find the matched VarStore
+        //
+        CopyGuid (&VarStorageData->Guid, (EFI_GUID *) (VOID *) &IfrNameValueVarStore->Guid);
+        VarStorageData->Type       = EFI_HII_VARSTORE_NAME_VALUE;
+        VarStoreId                 = IfrNameValueVarStore->VarStoreId;
+      }
       break;
 
@@ -1174 +1742 @@
       // No matched varstore is found and directly return.
       //
-      if (VarStorageData->Size == 0) {
+      if ( VarStoreId == 0) {
         Status = EFI_SUCCESS;
         goto Done;
@@ -1184 +1752 @@
       // Ref question is not in IFR Form. This IFR form is not valid. 
       //
-      if (VarStorageData->Size == 0) {
+      if ( VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
@@ -1192 +1760 @@
       //
       IfrRef = (EFI_IFR_REF4 *) IfrOpHdr;
-      if (IfrRef->Question.VarStoreId != VarStorageData->VarStoreId) {
+      if (IfrRef->Question.VarStoreId != VarStoreId) {
         break;
       }
-      
-      //
-      // Get Offset/Width by Question header.
-      //
-      VarOffset = IfrRef->Question.VarStoreInfo.VarOffset;
       VarWidth  = (UINT16) (sizeof (EFI_HII_REF));
-      //
-      // Check whether this question is in requested block array.
-      //
-      if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {
-        //
-        // This question is not in the requested string. Skip it.
-        //
-        break;
-      }
-
-      //
-      // Check this var question is in the var storage 
-      //
-      if ((VarOffset + VarWidth) > VarStorageData->Size) {
+
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+      break;
+
+    case EFI_IFR_ONE_OF_OP:
+    case EFI_IFR_NUMERIC_OP:
+      //
+      // Numeric and OneOf has the same opcode structure.
+      //
+
+      //
+      // Numeric and OneOf question is not in IFR Form. This IFR form is not valid. 
+      //
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
       }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+      //
+      // Check whether this question is for the requested varstore.
+      //
+      IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;
+      if (IfrOneOf->Question.VarStoreId != VarStoreId) {
+        break;
+      }
+      VarWidth  = (UINT16) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));
+
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+
       if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrRef->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      BlockData->Scope      = IfrOpHdr->Scope;
-      InitializeListHead (&BlockData->DefaultValueEntry);
-      //
-      // Add Block Data into VarStorageData BlockEntry
-      //
-      InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
-      break;
-
-    case EFI_IFR_ONE_OF_OP:
-    case EFI_IFR_NUMERIC_OP:
-      //
-      // Numeric and OneOf has the same opcode structure.
-      //
-
-      //
-      // Numeric and OneOf question is not in IFR Form. This IFR form is not valid. 
-      //
-      if (VarStorageData->Size == 0) {
-        Status = EFI_INVALID_PARAMETER;
-        goto Done;
-      }
-      //
-      // Check whether this question is for the requested varstore.
-      //
-      IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;
-      if (IfrOneOf->Question.VarStoreId != VarStorageData->VarStoreId) {
+        //
+        // BlockData == NULL means this opcode is not in the requst array.
+        //
         break;
       }
-      
-      //
-      // Get Offset/Width by Question header and OneOf Flags
-      //
-      VarOffset = IfrOneOf->Question.VarStoreInfo.VarOffset;
-      VarWidth  = (UINT16) (1 << (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE));
-      //
-      // Check whether this question is in requested block array.
-      //
-      if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {
-        //
-        // This question is not in the requested string. Skip it.
-        //
-        break;
-      }
-
-      //
-      // Check this var question is in the var storage 
-      //
-      if ((VarOffset + VarWidth) > VarStorageData->Size) {
-        Status = EFI_INVALID_PARAMETER;
-        goto Done;
-      }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrOneOf->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      BlockData->Scope      = IfrOpHdr->Scope;
-      InitializeListHead (&BlockData->DefaultValueEntry);
-      //
-      // Add Block Data into VarStorageData BlockEntry
-      //
-      InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
-      
+
       if (IfrOpHdr->OpCode == EFI_IFR_ONE_OF_OP) {
         //
@@ -1316 +1819 @@
           DefaultData.Value.u8 = IfrOneOf->data.u8.MinValue;
           break;
-  
+
         case EFI_IFR_NUMERIC_SIZE_2:
           CopyMem (&DefaultData.Value.u16, &IfrOneOf->data.u16.MinValue, sizeof (UINT16));
           break;
-  
+
         case EFI_IFR_NUMERIC_SIZE_4:
           CopyMem (&DefaultData.Value.u32, &IfrOneOf->data.u32.MinValue, sizeof (UINT32));
           break;
-  
+
         case EFI_IFR_NUMERIC_SIZE_8:
           CopyMem (&DefaultData.Value.u64, &IfrOneOf->data.u64.MinValue, sizeof (UINT64));
           break;
+
+        default:
+          Status = EFI_INVALID_PARAMETER;
+          goto Done;
         }
         //
@@ -1333 +1840 @@
         //        
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
-          DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);     
+          DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;
           InsertDefaultValue (BlockData, &DefaultData);
@@ -1350 +1857 @@
       // OrderedList question is not in IFR Form. This IFR form is not valid. 
       //
-      if (VarStorageData->Size == 0) {
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
@@ -1358 +1865 @@
       //
       IfrOrderedList = (EFI_IFR_ORDERED_LIST *) IfrOpHdr;
-      if (IfrOrderedList->Question.VarStoreId != VarStorageData->VarStoreId) {
+      if (IfrOrderedList->Question.VarStoreId != VarStoreId) {
         BlockData = NULL;
         break;
       }
-
-      //
-      // Get Offset/Width by Question header and OneOf Flags
-      //
-      VarOffset = IfrOrderedList->Question.VarStoreInfo.VarOffset;
       VarWidth  = IfrOrderedList->MaxContainers;
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
         goto Done;
       }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrOrderedList->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      BlockData->Scope      = IfrOpHdr->Scope;
-      InitializeListHead (&BlockData->DefaultValueEntry);
       break;
 
@@ -1398 +1889 @@
       // CheckBox question is not in IFR Form. This IFR form is not valid. 
       //
-      if (VarStorageData->Size == 0) {
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
@@ -1406 +1897 @@
       //
       IfrCheckBox = (EFI_IFR_CHECKBOX *) IfrOpHdr;
-      if (IfrCheckBox->Question.VarStoreId != VarStorageData->VarStoreId) {
+      if (IfrCheckBox->Question.VarStoreId != VarStoreId) {
         break;
       }
-      
-      //
-      // Get Offset/Width by Question header and OneOf Flags
-      //
-      VarOffset = IfrCheckBox->Question.VarStoreInfo.VarOffset;
       VarWidth  = (UINT16) sizeof (BOOLEAN);
-
-      //
-      // Check whether this question is in requested block array.
-      //
-      if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {
-        //
-        // This question is not in the requested string. Skip it.
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+
+      if (BlockData == NULL) {
+        //
+        // BlockData == NULL means this opcode is not in the requst array.
         //
         break;
       }
 
-      //
-      // Check this var question is in the var storage 
-      //
-      if ((VarOffset + VarWidth) > VarStorageData->Size) {
-        Status = EFI_INVALID_PARAMETER;
-        goto Done;
-      }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrCheckBox->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      BlockData->Scope      = IfrOpHdr->Scope;
-      InitializeListHead (&BlockData->DefaultValueEntry);
-      //
-      // Add Block Data into VarStorageData BlockEntry
-      //
-      InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
-      
       //
       // Add default value for standard ID by CheckBox Flag
@@ -1497 +1957 @@
         // When flag is not set, defautl value is FASLE.
         //
-        DefaultData.Type    = DefaultValueFromDefault;        
+        DefaultData.Type    = DefaultValueFromDefault;
         DefaultData.Value.b = FALSE;
       }
@@ -1506 +1966 @@
       break;
 
-    case EFI_IFR_STRING_OP:
+    case EFI_IFR_DATE_OP:
       //
       // offset by question header
@@ -1514 +1974 @@
 
       //
-      // String question is not in IFR Form. This IFR form is not valid. 
-      //
-      if (VarStorageData->Size == 0) {
+      // Date question is not in IFR Form. This IFR form is not valid. 
+      //
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
@@ -1523 +1983 @@
       // Check whether this question is for the requested varstore.
       //
-      IfrString = (EFI_IFR_STRING *) IfrOpHdr;
-      if (IfrString->Question.VarStoreId != VarStorageData->VarStoreId) {
+      IfrDate = (EFI_IFR_DATE *) IfrOpHdr;
+      if (IfrDate->Question.VarStoreId != VarStoreId) {
         break;
       }
-      
-      //
-      // Get Offset/Width by Question header and OneOf Flags
-      //
-      VarOffset = IfrString->Question.VarStoreInfo.VarOffset;
-      VarWidth  = (UINT16) (IfrString->MaxSize * sizeof (UINT16));
-
-      //
-      // Check whether this question is in requested block array.
-      //
-      if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {
-        //
-        // This question is not in the requested string. Skip it.
-        //
-        break;
-      }
-
-      //
-      // Check this var question is in the var storage 
-      //
-      if ((VarOffset + VarWidth) > VarStorageData->Size) {
-        Status = EFI_INVALID_PARAMETER;
+
+      VarWidth  = (UINT16) sizeof (EFI_HII_DATE);
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
         goto Done;
       }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrString->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      InitializeListHead (&BlockData->DefaultValueEntry);
-      
-      //
-      // Add Block Data into VarStorageData BlockEntry
-      //
-      InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
-      
-      //
-      // No default value for string.
-      //
-      BlockData = NULL;
       break;
 
-    case EFI_IFR_PASSWORD_OP:
+    case EFI_IFR_TIME_OP:
       //
       // offset by question header
@@ -1585 +2003 @@
 
       //
-      // Password question is not in IFR Form. This IFR form is not valid. 
-      //
-      if (VarStorageData->Size == 0) {
+      // Time question is not in IFR Form. This IFR form is not valid. 
+      //
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
@@ -1594 +2012 @@
       // Check whether this question is for the requested varstore.
       //
-      IfrPassword = (EFI_IFR_PASSWORD *) IfrOpHdr;
-      if (IfrPassword->Question.VarStoreId != VarStorageData->VarStoreId) {
+      IfrTime = (EFI_IFR_TIME *) IfrOpHdr;
+      if (IfrTime->Question.VarStoreId != VarStoreId) {
         break;
       }
-      
-      //
-      // Get Offset/Width by Question header and OneOf Flags
-      //
-      VarOffset = IfrPassword->Question.VarStoreInfo.VarOffset;
-      VarWidth  = (UINT16) (IfrPassword->MaxSize * sizeof (UINT16));
-
-      //
-      // Check whether this question is in requested block array.
-      //
-      if (!BlockArrayCheck (RequestBlockArray, VarOffset, VarWidth)) {
-        //
-        // This question is not in the requested string. Skip it.
-        //
-        break;
-      }
-
-      //
-      // Check this var question is in the var storage 
-      //
-      if ((VarOffset + VarWidth) > VarStorageData->Size) {
+
+      VarWidth  = (UINT16) sizeof (EFI_HII_TIME);
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+      break;
+
+    case EFI_IFR_STRING_OP:
+      //
+      // offset by question header
+      // width MaxSize * sizeof (CHAR16)
+      // no default value, only block array
+      //
+
+      //
+      // String question is not in IFR Form. This IFR form is not valid. 
+      //
+      if (VarStoreId == 0) {
         Status = EFI_INVALID_PARAMETER;
         goto Done;
       }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
+      //
+      // Check whether this question is for the requested varstore.
+      //
+      IfrString = (EFI_IFR_STRING *) IfrOpHdr;
+      if (IfrString->Question.VarStoreId != VarStoreId) {
+        break;
+      }
+
+      VarWidth  = (UINT16) (IfrString->MaxSize * sizeof (UINT16));
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
         goto Done;
       }
-      BlockData->Offset     = VarOffset;
-      BlockData->Width      = VarWidth;
-      BlockData->QuestionId = IfrPassword->Question.QuestionId;
-      BlockData->OpCode     = IfrOpHdr->OpCode;
-      InitializeListHead (&BlockData->DefaultValueEntry);
-      
-      //
-      // Add Block Data into VarStorageData BlockEntry
-      //
-      InsertBlockData (&VarStorageData->BlockEntry, &BlockData);
-      
+
       //
       // No default value for string.
@@ -1648 +2058 @@
       break;
 
+    case EFI_IFR_PASSWORD_OP:
+      //
+      // offset by question header
+      // width MaxSize * sizeof (CHAR16)
+      // no default value, only block array
+      //
+
+      //
+      // Password question is not in IFR Form. This IFR form is not valid. 
+      //
+      if (VarStoreId == 0) {
+        Status = EFI_INVALID_PARAMETER;
+        goto Done;
+      }
+      //
+      // Check whether this question is for the requested varstore.
+      //
+      IfrPassword = (EFI_IFR_PASSWORD *) IfrOpHdr;
+      if (IfrPassword->Question.VarStoreId != VarStoreId) {
+        break;
+      }
+
+      VarWidth  = (UINT16) (IfrPassword->MaxSize * sizeof (UINT16));
+      Status = IsThisOpcodeRequired(RequestBlockArray, HiiHandle, VarStorageData, IfrOpHdr, VarWidth, &BlockData);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+
+      //
+      // No default value for string.
+      //
+      BlockData = NULL;
+      break;
+
     case EFI_IFR_ONE_OF_OPTION_OP:
       //
@@ -1655 +2099 @@
         break;
       }
-      
+
       IfrOneOfOption = (EFI_IFR_ONE_OF_OPTION *) IfrOpHdr;
       if (BlockData->OpCode == EFI_IFR_ORDERED_LIST_OP) {
@@ -1674 +2118 @@
           //
           Status = EFI_INVALID_PARAMETER;
+          if (BlockData->Name != NULL) {
+            FreePool (BlockData->Name);
+          }
           FreePool (BlockData);
           goto Done;
@@ -1685 +2132 @@
         // Check whether this question is in requested block array.
         //
-        if (!BlockArrayCheck (RequestBlockArray, BlockData->Offset, BlockData->Width)) {
+        if (!BlockArrayCheck (RequestBlockArray, BlockData->Offset, BlockData->Width, (BOOLEAN)(BlockData->Name != NULL), HiiHandle)) {
           //
           // This question is not in the requested string. Skip it.
           //
+          if (BlockData->Name != NULL) {
+            FreePool (BlockData->Name);
+          }
           FreePool (BlockData);
           BlockData = NULL;
@@ -1696 +2146 @@
         // Check this var question is in the var storage 
         //
-        if ((BlockData->Offset + BlockData->Width) > VarStorageData->Size) {
+        if ((BlockData->Name == NULL) && ((BlockData->Offset + BlockData->Width) > VarStorageData->Size)) {
           Status = EFI_INVALID_PARAMETER;
+          if (BlockData->Name != NULL) {
+            FreePool (BlockData->Name);
+          }
           FreePool (BlockData);
           goto Done;
@@ -1725 +2178 @@
         // Prepare new DefaultValue
         //
-        DefaultData.Type  = DefaultValueFromFlag;
-        CopyMem (&DefaultData.Value.u64, &IfrOneOfOption->Value.u64, sizeof (UINT64));
+        DefaultData.Type     = DefaultValueFromFlag;
+        CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
         if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) {
           DefaultData.DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
@@ -1735 +2188 @@
           InsertDefaultValue (BlockData, &DefaultData);
         }
-
-        
-      }
-      
+      }
+
       //
       // 2. Set as the default value when this is the first option.
@@ -1750 +2201 @@
         // Prepare new DefaultValue
         //        
-        DefaultData.Type        = DefaultValueFromDefault;
-        CopyMem (&DefaultData.Value.u64, &IfrOneOfOption->Value.u64, sizeof (UINT64));      
+        DefaultData.Type     = DefaultValueFromDefault;
+        CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
           DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry); 
           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;
           InsertDefaultValue (BlockData, &DefaultData);
-        }        
+        }
       }
       break;
@@ -1766 +2217 @@
       if (BlockData == NULL || BlockData->Scope == 0) {
         //
-        // No matched block data is ignored.        
+        // No matched block data is ignored.
         //
         break;
@@ -1787 +2238 @@
       DefaultData.Type        = DefaultValueFromOpcode;
       DefaultData.DefaultId   = VarDefaultId;
-      CopyMem (&DefaultData.Value, &IfrDefault->Value, sizeof (EFI_IFR_TYPE_VALUE));
-      
+      CopyMem (&DefaultData.Value, &IfrDefault->Value, IfrDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));
+
       // If the value field is expression, set the cleaned flag.
       if (IfrDefault->Type ==  EFI_IFR_TYPE_OTHER) {
@@ -1797 +2248 @@
       //
       InsertDefaultValue (BlockData, &DefaultData);
-       
+
       //
       // After insert the default value, reset the cleaned value for next 
@@ -1805 +2256 @@
       DefaultData.Cleaned     = FALSE;
       break;
+
     case EFI_IFR_END_OP:
       //
       // End Opcode is for Var question.
       //
-      if (BlockData != NULL && BlockData->Scope > 0) {
-        BlockData->Scope--;
-      }
+      if (BlockData != NULL) {
+        if (BlockData->Scope > 0) {
+          BlockData->Scope--;
+        }
+        if (BlockData->Scope == 0) {
+          BlockData = NULL;
+        }
+      }
+
       break;
+
     default:
-      if (BlockData != NULL && BlockData->Scope > 0) {
-        BlockData->Scope = (UINT8) (BlockData->Scope + IfrOpHdr->Scope);
+      if (BlockData != NULL) {
+        if (BlockData->Scope > 0) {
+          BlockData->Scope = (UINT8) (BlockData->Scope + IfrOpHdr->Scope);
+        }
+
+        if (BlockData->Scope == 0) {
+          BlockData = NULL;
+        }
       }
       break;
     }
 
-    IfrOffset += IfrOpHdr->Length;
+    IfrOffset     += IfrOpHdr->Length;
+    PackageOffset += IfrOpHdr->Length;
   }
 
@@ -1836 +2302 @@
   }
 
-  return Status;  
+  return Status;
+}
+
+/**
+  parse the configrequest string, get the elements.
+
+  @param      ConfigRequest         The input configrequest string.
+  @param      Progress              Return the progress data.
+
+  @retval     Block data pointer.
+**/
+IFR_BLOCK_DATA *
+GetBlockElement (
+  IN  EFI_STRING          ConfigRequest,
+  OUT EFI_STRING          *Progress
+  )
+{
+  EFI_STRING           StringPtr;
+  IFR_BLOCK_DATA       *BlockData;
+  IFR_BLOCK_DATA       *RequestBlockArray;
+  EFI_STATUS           Status;
+  UINT8                *TmpBuffer;
+  UINT16               Offset;
+  UINT16               Width;
+  LIST_ENTRY           *Link;
+  IFR_BLOCK_DATA       *NextBlockData;
+  UINTN                Length;
+
+  TmpBuffer = NULL;
+
+  //
+  // Init RequestBlockArray
+  //
+  RequestBlockArray = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+  if (RequestBlockArray == NULL) {
+    goto Done;
+  }
+  InitializeListHead (&RequestBlockArray->Entry);
+
+  //
+  // Get the request Block array from the request string
+  // Offset and Width
+  //
+
+  //
+  // Parse each <RequestElement> if exists
+  // Only <BlockName> format is supported by this help function.
+  // <BlockName> ::= &'OFFSET='<Number>&'WIDTH='<Number>
+  //
+  StringPtr = ConfigRequest;
+  while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {
+    //
+    // Skip the OFFSET string
+    //
+    *Progress   = StringPtr;
+    StringPtr += StrLen (L"&OFFSET=");
+    //
+    // Get Offset
+    //
+    Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
+    if (EFI_ERROR (Status)) {
+      goto Done;
+    }
+    Offset = 0;
+    CopyMem (
+      &Offset,
+      TmpBuffer,
+      (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)
+      );
+    FreePool (TmpBuffer);
+
+    StringPtr += Length;
+    if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {
+      goto Done;
+    }
+    StringPtr += StrLen (L"&WIDTH=");
+
+    //
+    // Get Width
+    //
+    Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
+    if (EFI_ERROR (Status)) {
+      goto Done;
+    }
+    Width = 0;
+    CopyMem (
+      &Width,
+      TmpBuffer,
+      (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)
+      );
+    FreePool (TmpBuffer);
+
+    StringPtr += Length;
+    if (*StringPtr != 0 && *StringPtr != L'&') {
+      goto Done;
+    }
+    
+    //
+    // Set Block Data
+    //
+    BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+    if (BlockData == NULL) {
+      goto Done;
+    }
+    BlockData->Offset = Offset;
+    BlockData->Width  = Width;
+    InsertBlockData (&RequestBlockArray->Entry, &BlockData);
+
+    //
+    // Skip &VALUE string if &VALUE does exists.
+    //
+    if (StrnCmp (StringPtr, L"&VALUE=", StrLen (L"&VALUE=")) == 0) {
+      StringPtr += StrLen (L"&VALUE=");
+
+      //
+      // Get Value
+      //
+      Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
+      if (EFI_ERROR (Status)) {
+        goto Done;
+      }
+
+      StringPtr += Length;
+      if (*StringPtr != 0 && *StringPtr != L'&') {
+        goto Done;
+      }
+    }
+    //
+    // If '\0', parsing is finished. 
+    //
+    if (*StringPtr == 0) {
+      break;
+    }
+  }
+
+  //
+  // Merge the requested block data.
+  //
+  Link = RequestBlockArray->Entry.ForwardLink;
+  while ((Link != &RequestBlockArray->Entry) && (Link->ForwardLink != &RequestBlockArray->Entry)) {
+    BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
+    NextBlockData = BASE_CR (Link->ForwardLink, IFR_BLOCK_DATA, Entry);
+    if ((NextBlockData->Offset >= BlockData->Offset) && (NextBlockData->Offset <= (BlockData->Offset + BlockData->Width))) {
+      if ((NextBlockData->Offset + NextBlockData->Width) > (BlockData->Offset + BlockData->Width)) {
+        BlockData->Width = (UINT16) (NextBlockData->Offset + NextBlockData->Width - BlockData->Offset);
+      }
+      RemoveEntryList (Link->ForwardLink);
+      FreePool (NextBlockData);
+      continue;
+    }
+    Link = Link->ForwardLink;
+  }
+
+  return RequestBlockArray;
+
+Done:
+  if (RequestBlockArray != NULL) {
+    //
+    // Free Link Array RequestBlockArray
+    //
+    while (!IsListEmpty (&RequestBlockArray->Entry)) {
+      BlockData = BASE_CR (RequestBlockArray->Entry.ForwardLink, IFR_BLOCK_DATA, Entry);
+      RemoveEntryList (&BlockData->Entry);
+      FreePool (BlockData);
+    }
+
+    FreePool (RequestBlockArray);
+  }
+
+  return NULL;
+}
+
+/**
+  parse the configrequest string, get the elements.
+
+  @param      ConfigRequest         The input config request string.
+  @param      Progress              Return the progress data.
+
+  @retval     return data block array.
+**/
+IFR_BLOCK_DATA *
+GetNameElement (
+  IN  EFI_STRING           ConfigRequest,
+  OUT EFI_STRING           *Progress
+  )
+{
+  EFI_STRING           StringPtr;
+  EFI_STRING           NextTag;
+  IFR_BLOCK_DATA       *BlockData;
+  IFR_BLOCK_DATA       *RequestBlockArray;
+  BOOLEAN              HasValue;
+
+  StringPtr = ConfigRequest;
+
+  //
+  // Init RequestBlockArray
+  //
+  RequestBlockArray = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+  if (RequestBlockArray == NULL) {
+    goto Done;
+  }
+  InitializeListHead (&RequestBlockArray->Entry);
+
+  //
+  // Get the request Block array from the request string
+  //
+
+  //
+  // Parse each <RequestElement> if exists
+  // Only <BlockName> format is supported by this help function.
+  // <BlockName> ::= &'Name***=***
+  //
+  while (StringPtr != NULL && *StringPtr == L'&') {
+
+    *Progress   = StringPtr;
+    //
+    // Skip the L"&" string
+    //
+    StringPtr += 1;
+
+    HasValue = FALSE;
+    if ((NextTag = StrStr (StringPtr, L"=")) != NULL) {
+      *NextTag = L'\0';
+      HasValue = TRUE;
+    } else if ((NextTag = StrStr (StringPtr, L"&")) != NULL) {
+      *NextTag = L'\0';
+    }
+
+    //
+    // Set Block Data
+    //
+    BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
+    if (BlockData == NULL) {
+      goto Done;
+    }
+
+    //
+    // Get Name
+    //
+    BlockData->Name = AllocateCopyPool(StrSize (StringPtr), StringPtr);
+    InsertBlockData (&RequestBlockArray->Entry, &BlockData);
+
+    if (HasValue) {
+      //
+      // If has value, skip the value.
+      //    
+      StringPtr = NextTag + 1;
+      *NextTag  = L'=';
+      StringPtr = StrStr (StringPtr, L"&");
+    } else if (NextTag != NULL) {
+      //
+      // restore the '&' text.
+      //
+      StringPtr = NextTag;
+      *NextTag  = L'&';
+    }
+  }
+
+  return RequestBlockArray;
+
+Done:
+  if (RequestBlockArray != NULL) {
+    //
+    // Free Link Array RequestBlockArray
+    //
+    while (!IsListEmpty (&RequestBlockArray->Entry)) {
+      BlockData = BASE_CR (RequestBlockArray->Entry.ForwardLink, IFR_BLOCK_DATA, Entry);
+      RemoveEntryList (&BlockData->Entry);
+      if (BlockData->Name != NULL) {
+        FreePool (BlockData->Name);
+      }
+      FreePool (BlockData);
+    }
+
+    FreePool (RequestBlockArray);
+  }
+
+  return NULL;
+}
+
+/**
+  Generate ConfigRequest string base on the varstore info.
+
+  @param      ConfigHdr             The config header for this varstore.
+  @param      VarStorageData        The varstore info.
+  @param      Status                Return Status.
+  @param      ConfigRequest         The ConfigRequest info may be return.
+
+  @retval     TRUE                  Need to continue
+  @retval     Others                NO need to continue or error occur.
+**/
+BOOLEAN
+GenerateConfigRequest (
+  IN  CHAR16                       *ConfigHdr,
+  IN  IFR_VARSTORAGE_DATA          *VarStorageData,
+  OUT EFI_STATUS                   *Status,
+  IN OUT EFI_STRING                *ConfigRequest
+  )
+{
+  BOOLEAN               DataExist;
+  UINTN                 Length;
+  LIST_ENTRY            *Link;
+  CHAR16                *FullConfigRequest;
+  CHAR16                *StringPtr;
+  IFR_BLOCK_DATA        *BlockData;
+
+  //
+  // Append VarStorageData BlockEntry into *Request string
+  // Now support only one varstore in a form package.
+  //
+  
+  //
+  // Go through all VarStorageData Entry and get BlockEntry for each one for the multiple varstore in a single form package
+  // Then construct them all to return MultiRequest string : ConfigHdr BlockConfig
+  //
+  
+  //
+  // Compute the length of the entire request starting with <ConfigHdr> and a 
+  // Null-terminator
+  //
+  DataExist = FALSE;
+  Length    = StrLen (ConfigHdr) + 1;
+
+  for (Link = VarStorageData->BlockEntry.ForwardLink; Link != &VarStorageData->BlockEntry; Link = Link->ForwardLink) {
+    DataExist = TRUE;
+    BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
+    if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+      //
+      // Add <BlockName> length for each Name
+      //
+      // <BlockName> ::= &Name1&Name2&... 
+      //                 |1| StrLen(Name1)
+      //
+      Length = Length + (1 + StrLen (BlockData->Name));
+    } else {
+      //
+      // Add <BlockName> length for each Offset/Width pair
+      //
+      // <BlockName> ::= &OFFSET=1234&WIDTH=1234
+      //                 |  8   | 4 |   7  | 4 |
+      //
+      Length = Length + (8 + 4 + 7 + 4);
+    }
+  }
+  //
+  // No any request block data is found. The request string can't be constructed.
+  //
+  if (!DataExist) {
+    *Status = EFI_SUCCESS;
+    return FALSE;
+  }
+
+  //
+  // Allocate buffer for the entire <ConfigRequest>
+  //
+  FullConfigRequest = AllocateZeroPool (Length * sizeof (CHAR16));
+  if (FullConfigRequest == NULL) {
+    *Status = EFI_OUT_OF_RESOURCES;
+    return FALSE;
+  }
+  StringPtr = FullConfigRequest;
+
+  //
+  // Start with <ConfigHdr>
+  //
+  StrCpy (StringPtr, ConfigHdr);
+  StringPtr += StrLen (StringPtr);
+
+  //
+  // Loop through all the Offset/Width pairs and append them to ConfigRequest
+  //
+  for (Link = VarStorageData->BlockEntry.ForwardLink; Link != &VarStorageData->BlockEntry; Link = Link->ForwardLink) {
+    BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
+    if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+      //
+      // Append &Name1\0
+      //
+      UnicodeSPrint (
+        StringPtr,
+        (1 + StrLen (BlockData->Name) + 1) * sizeof (CHAR16),
+        L"&%s",
+        BlockData->Name
+      );
+    } else {
+      //
+      // Append &OFFSET=XXXX&WIDTH=YYYY\0
+      //
+      UnicodeSPrint (
+        StringPtr, 
+        (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16), 
+        L"&OFFSET=%04X&WIDTH=%04X", 
+        BlockData->Offset, 
+        BlockData->Width
+      );
+    }
+    StringPtr += StrLen (StringPtr);
+  }
+  //
+  // Set to the got full request string.
+  //
+  HiiToLower (FullConfigRequest);
+
+  if (*ConfigRequest != NULL) {
+    FreePool (*ConfigRequest);
+  }
+  *ConfigRequest = FullConfigRequest;
+
+  return TRUE;
+}
+
+/**
+  Generate ConfigRequest Header base on the varstore info.
+
+  @param      VarStorageData        The varstore info.
+  @param      DevicePath            Device path for this varstore.
+  @param      ConfigHdr             The config header for this varstore.
+
+  @retval     EFI_SUCCESS           Generate the header success.
+  @retval     EFI_OUT_OF_RESOURCES  Allocate buffer fail.
+**/
+EFI_STATUS
+GenerateHdr (
+  IN   IFR_VARSTORAGE_DATA          *VarStorageData,
+  IN   EFI_DEVICE_PATH_PROTOCOL     *DevicePath,
+  OUT  EFI_STRING                   *ConfigHdr
+  )
+{
+  EFI_STRING                   GuidStr;
+  EFI_STRING                   NameStr;
+  EFI_STRING                   PathStr;
+  UINTN                        Length;
+  EFI_STATUS                   Status;
+
+  Status  = EFI_SUCCESS;
+  NameStr = NULL;
+  GuidStr = NULL;
+  PathStr = NULL;
+
+  //
+  // Construct <ConfigHdr> : "GUID=...&NAME=...&PATH=..." by VarStorageData Guid, Name and DriverHandle
+  //
+  GenerateSubStr (L"GUID=", sizeof (EFI_GUID), (VOID *) &VarStorageData->Guid, 1, &GuidStr);
+  if (VarStorageData->Name != NULL) {
+    GenerateSubStr (L"NAME=", StrLen (VarStorageData->Name) * sizeof (CHAR16), (VOID *) VarStorageData->Name, 2, &NameStr);
+  } else {
+    GenerateSubStr (L"NAME=", 0, NULL, 2, &NameStr);
+  }
+  GenerateSubStr (
+    L"PATH=",
+    GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DevicePath),
+    (VOID *) DevicePath,
+    1,
+    &PathStr
+    );
+  Length = StrLen (GuidStr) + StrLen (NameStr) + StrLen (PathStr) + 1;
+  if (VarStorageData->Name == NULL) {
+    Length += 1;
+  }
+
+  *ConfigHdr = AllocateZeroPool (Length * sizeof (CHAR16));
+  if (*ConfigHdr == NULL) {
+    Status = EFI_OUT_OF_RESOURCES;
+    goto Done;
+  }
+  StrCpy (*ConfigHdr, GuidStr);
+  StrCat (*ConfigHdr, NameStr);
+  if (VarStorageData->Name == NULL) {
+    StrCat (*ConfigHdr, L"&");
+  }
+  StrCat (*ConfigHdr, PathStr);
+
+  //
+  // Remove the last character L'&'
+  //
+  *(*ConfigHdr + StrLen (*ConfigHdr) - 1) = L'\0';
+
+Done:
+  if (GuidStr != NULL) {
+    FreePool (GuidStr);
+  }
+
+  if (NameStr != NULL) {
+    FreePool (NameStr);
+  }
+
+  if (PathStr != NULL) {
+    FreePool (PathStr);
+  }
+
+  return Status;
+}
+
+/**
+  Get Data buffer size based on data type.
+
+  @param      ValueType             The input data type.
+
+  @retval     The data buffer size for the input type.
+**/
+UINT16
+GetStorageWidth (
+  IN UINT8       ValueType
+  )
+{
+  UINT16         StorageWidth;
+
+  switch (ValueType) {
+  case EFI_IFR_NUMERIC_SIZE_1:
+  case EFI_IFR_TYPE_BOOLEAN:
+    StorageWidth = (UINT16) sizeof (UINT8);
+    break;
+
+  case EFI_IFR_NUMERIC_SIZE_2:
+    StorageWidth = (UINT16) sizeof (UINT16);
+    break;
+
+  case EFI_IFR_NUMERIC_SIZE_4:
+    StorageWidth = (UINT16) sizeof (UINT32);
+    break;
+
+  case EFI_IFR_NUMERIC_SIZE_8:
+    StorageWidth = (UINT16) sizeof (UINT64);
+    break;
+
+  case EFI_IFR_TYPE_TIME:
+    StorageWidth = (UINT16) sizeof (EFI_IFR_TIME);
+    break;
+
+  case EFI_IFR_TYPE_DATE:
+    StorageWidth = (UINT16) sizeof (EFI_IFR_DATE);
+    break;
+
+  default:
+    StorageWidth = 0;
+    break;
+  }
+
+  return StorageWidth;
+}
+
+/**
+  Generate ConfigAltResp string base on the varstore info.
+
+  @param      ConfigHdr             The config header for this varstore.
+  @param      VarStorageData        The varstore info.
+  @param      DefaultIdArray        The Default id array.
+  @param      DefaultAltCfgResp     The DefaultAltCfgResp info may be return.
+
+  @retval     TRUE                  Need to continue
+  @retval     Others                NO need to continue or error occur.
+**/
+EFI_STATUS
+GenerateAltConfigResp (
+  IN  CHAR16                       *ConfigHdr,
+  IN  IFR_VARSTORAGE_DATA          *VarStorageData,
+  IN  IFR_DEFAULT_DATA             *DefaultIdArray,
+  IN OUT EFI_STRING                *DefaultAltCfgResp
+  )
+{
+  BOOLEAN               DataExist;
+  UINTN                 Length;
+  LIST_ENTRY            *Link;
+  LIST_ENTRY            *LinkData;
+  LIST_ENTRY            *LinkDefault;
+  LIST_ENTRY            *ListEntry;
+  CHAR16                *StringPtr;
+  IFR_BLOCK_DATA        *BlockData;
+  IFR_DEFAULT_DATA      *DefaultId;
+  IFR_DEFAULT_DATA      *DefaultValueData;
+  UINTN                 Width;
+  UINT8                 *TmpBuffer;
+
+  BlockData     = NULL;
+  DataExist     = FALSE;
+
+  //
+  // Add length for <ConfigHdr> + '\0'
+  //
+  Length = StrLen (ConfigHdr) + 1;
+
+  for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {
+    DefaultId = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
+    //
+    // Add length for "&<ConfigHdr>&ALTCFG=XXXX"
+    //                |1| StrLen (ConfigHdr) | 8 | 4 |
+    //
+    Length += (1 + StrLen (ConfigHdr) + 8 + 4);
+    
+    for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {
+      BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);
+      ListEntry     = &BlockData->DefaultValueEntry;
+      for (LinkDefault = ListEntry->ForwardLink; LinkDefault != ListEntry; LinkDefault = LinkDefault->ForwardLink) {
+        DefaultValueData = BASE_CR (LinkDefault, IFR_DEFAULT_DATA, Entry);
+        if (DefaultValueData->DefaultId != DefaultId->DefaultId) {
+          continue;
+        }
+        if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+          //
+          // Add length for "&Name1=zzzzzzzzzzzz"
+          //                |1|Name|1|Value|
+          //
+          Length += (1 + StrLen (BlockData->Name) + 1 + BlockData->Width * 2);
+        } else {
+          //
+          // Add length for "&OFFSET=XXXX&WIDTH=YYYY&VALUE=zzzzzzzzzzzz"
+          //                |    8  | 4 |   7  | 4 |   7  | Width * 2 |
+          //
+          Length += (8 + 4 + 7 + 4 + 7 + BlockData->Width * 2);
+        }
+        DataExist = TRUE;
+      }
+    }
+  }
+  
+  //
+  // No default value is found. The default string doesn't exist.
+  //
+  if (!DataExist) {
+    return EFI_SUCCESS;
+  }
+
+  //
+  // Allocate buffer for the entire <DefaultAltCfgResp>
+  //
+  *DefaultAltCfgResp = AllocateZeroPool (Length * sizeof (CHAR16));
+  if (*DefaultAltCfgResp == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  StringPtr = *DefaultAltCfgResp;
+
+  //
+  // Start with <ConfigHdr>
+  //
+  StrCpy (StringPtr, ConfigHdr);
+  StringPtr += StrLen (StringPtr);
+
+  for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {
+    DefaultId = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
+    //
+    // Add <AltConfigHdr> of the form "&<ConfigHdr>&ALTCFG=XXXX\0"
+    //                                |1| StrLen (ConfigHdr) | 8 | 4 |
+    //
+    UnicodeSPrint (
+      StringPtr, 
+      (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 
+      L"&%s&ALTCFG=%04X", 
+      ConfigHdr, 
+      DefaultId->DefaultId
+      );
+    StringPtr += StrLen (StringPtr);
+
+    for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {
+      BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);
+      ListEntry     = &BlockData->DefaultValueEntry;
+      for (LinkDefault = ListEntry->ForwardLink; LinkDefault != ListEntry; LinkDefault = LinkDefault->ForwardLink) {
+        DefaultValueData = BASE_CR (LinkDefault, IFR_DEFAULT_DATA, Entry);
+        if (DefaultValueData->DefaultId != DefaultId->DefaultId) {
+          continue;
+        }
+        if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {
+          UnicodeSPrint (
+            StringPtr, 
+            (1 + StrLen (ConfigHdr) + 1) * sizeof (CHAR16), 
+            L"&%s=", 
+            BlockData->Name
+            );
+          StringPtr += StrLen (StringPtr);
+        } else {
+          //
+          // Add <BlockConfig>
+          // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>
+          //
+          UnicodeSPrint (
+            StringPtr, 
+            (8 + 4 + 7 + 4 + 7 + 1) * sizeof (CHAR16),
+            L"&OFFSET=%04X&WIDTH=%04X&VALUE=", 
+            BlockData->Offset, 
+            BlockData->Width
+            );
+          StringPtr += StrLen (StringPtr);
+        }
+        Width = BlockData->Width;
+        //
+        // Convert Value to a hex string in "%x" format
+        // NOTE: This is in the opposite byte that GUID and PATH use
+        //
+        TmpBuffer = (UINT8 *) &(DefaultValueData->Value);
+        for (; Width > 0; Width--) {
+          StringPtr += UnicodeValueToString (StringPtr, PREFIX_ZERO | RADIX_HEX, TmpBuffer[Width - 1], 2);
+        }
+      }
+    }
+  }
+
+  HiiToLower (*DefaultAltCfgResp);
+
+  return EFI_SUCCESS;
 }
 
@@ -1897 +3059 @@
   IFR_BLOCK_DATA               *RequestBlockArray;
   IFR_BLOCK_DATA               *BlockData;
-  IFR_BLOCK_DATA               *NextBlockData;
   IFR_DEFAULT_DATA             *DefaultValueData;
   IFR_DEFAULT_DATA             *DefaultId;
@@ -1903 +3064 @@
   IFR_VARSTORAGE_DATA          *VarStorageData;
   EFI_STRING                   DefaultAltCfgResp;
-  EFI_STRING                   FullConfigRequest;
   EFI_STRING                   ConfigHdr;
-  EFI_STRING                   GuidStr;
-  EFI_STRING                   NameStr;
-  EFI_STRING                   PathStr;
   EFI_STRING                   StringPtr;
   EFI_STRING                   Progress;
-  UINTN                        Length;
-  UINT8                        *TmpBuffer;
-  UINT16                       Offset;
-  UINT16                       Width;
-  LIST_ENTRY                   *Link;
-  LIST_ENTRY                   *LinkData;
-  LIST_ENTRY                   *LinkDefault;
-  BOOLEAN                      DataExist;
 
   if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
@@ -1930 +3079 @@
   VarStorageData    = NULL;
   DefaultAltCfgResp = NULL;
-  FullConfigRequest = NULL;
   ConfigHdr         = NULL;
-  GuidStr           = NULL;
-  NameStr           = NULL;
-  PathStr           = NULL;
   HiiFormPackage    = NULL;
   PackageSize       = 0;
-  DataExist         = FALSE;
   Progress          = *Request;
 
   Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
   if (EFI_ERROR (Status)) {
-    return Status;
+    goto Done;
   }
 
@@ -1978 +3122 @@
       StringPtr ++;
     }
-    //
-    // Check the following string &OFFSET=
-    //
-    if (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) != 0) {
-      Progress = StringPtr;
-      Status   = EFI_INVALID_PARAMETER;
+
+    if (*StringPtr == L'\0') {
+      //
+      // No request block is found.
+      //
+      StringPtr = NULL;
+    }
+  }
+
+  //
+  // If StringPtr != NULL, get the request elements.
+  //
+  if (StringPtr != NULL) {
+    if (StrStr (StringPtr, L"&OFFSET=") != NULL) {
+      RequestBlockArray = GetBlockElement(StringPtr, &Progress);
+    } else {
+      RequestBlockArray = GetNameElement(StringPtr, &Progress);
+    }
+
+    if (RequestBlockArray == NULL) {
+      Status = EFI_INVALID_PARAMETER;
       goto Done;
-    } else if (*StringPtr == L'\0') {
-      //
-      // No request block is found.
-      //
-      StringPtr = NULL;
-    }
-  }
-  if (StringPtr != NULL) {
-    //
-    // Init RequestBlockArray
-    //
-    RequestBlockArray = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-    if (RequestBlockArray == NULL) {
-      Status = EFI_OUT_OF_RESOURCES;
-      goto Done;
-    }
-    InitializeListHead (&RequestBlockArray->Entry);
-
-    //
-    // Get the request Block array from the request string
-    // Offset and Width
-    //
-
-    //
-    // Parse each <RequestElement> if exists
-    // Only <BlockName> format is supported by this help function.
-    // <BlockName> ::= &'OFFSET='<Number>&'WIDTH='<Number>
-    //
-    while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {
-      //
-      // Skip the OFFSET string
-      //
-      Progress   = StringPtr;
-      StringPtr += StrLen (L"&OFFSET=");
-      //
-      // Get Offset
-      //
-      Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
-      if (EFI_ERROR (Status)) {
-        goto Done;
-      }
-      Offset = 0;
-      CopyMem (
-        &Offset,
-        TmpBuffer,
-        (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)
-        );
-      FreePool (TmpBuffer);
-  
-      StringPtr += Length;
-      if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {
-        Status = EFI_INVALID_PARAMETER;
-        goto Done;
-      }
-      StringPtr += StrLen (L"&WIDTH=");
-  
-      //
-      // Get Width
-      //
-      Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
-      if (EFI_ERROR (Status)) {
-        goto Done;
-      }
-      Width = 0;
-      CopyMem (
-        &Width,
-        TmpBuffer,
-        (((Length + 1) / 2) < sizeof (UINT16)) ? ((Length + 1) / 2) : sizeof (UINT16)
-        );
-      FreePool (TmpBuffer);
-
-      StringPtr += Length;
-      if (*StringPtr != 0 && *StringPtr != L'&') {
-        Status = EFI_INVALID_PARAMETER;
-        goto Done;
-      }
-      
-      //
-      // Set Block Data
-      //
-      BlockData = (IFR_BLOCK_DATA *) AllocateZeroPool (sizeof (IFR_BLOCK_DATA));
-      if (BlockData == NULL) {
-        Status = EFI_OUT_OF_RESOURCES;
-        goto Done;
-      }
-      BlockData->Offset = Offset;
-      BlockData->Width  = Width;
-      InsertBlockData (&RequestBlockArray->Entry, &BlockData);
-      
-      //
-      // Skip &VALUE string if &VALUE does exists.
-      //
-      if (StrnCmp (StringPtr, L"&VALUE=", StrLen (L"&VALUE=")) == 0) {
-        StringPtr += StrLen (L"&VALUE=");
-
-        //
-        // Get Value
-        //
-        Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
-        if (EFI_ERROR (Status)) {
-          Status = EFI_INVALID_PARAMETER;
-          goto Done;
-        }
-
-        StringPtr += Length;
-        if (*StringPtr != 0 && *StringPtr != L'&') {
-          Status = EFI_INVALID_PARAMETER;
-          goto Done;
-        }
-      }
-      //
-      // If '\0', parsing is finished. 
-      //
-      if (*StringPtr == 0) {
-        break;
-      }
-    }
-    
-    //
-    // Merge the requested block data.
-    //
-    Link = RequestBlockArray->Entry.ForwardLink;
-    while ((Link != &RequestBlockArray->Entry) && (Link->ForwardLink != &RequestBlockArray->Entry)) {
-      BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
-      NextBlockData = BASE_CR (Link->ForwardLink, IFR_BLOCK_DATA, Entry);
-      if ((NextBlockData->Offset >= BlockData->Offset) && (NextBlockData->Offset <= (BlockData->Offset + BlockData->Width))) {
-        if ((NextBlockData->Offset + NextBlockData->Width) > (BlockData->Offset + BlockData->Width)) {
-          BlockData->Width = (UINT16) (NextBlockData->Offset + NextBlockData->Width - BlockData->Offset);
-        }
-        RemoveEntryList (Link->ForwardLink);
-        FreePool (NextBlockData);
-        continue;
-      }
-      Link = Link->ForwardLink;      
-    }
-  }
-  
-  //
-  // 2. Parse FormPackage to get BlockArray and DefaultId Array for the request BlockArray.
-  //
+    }
+  }
 
   //
@@ -2148 +3169 @@
 
   //
+  // 2. Parse FormPackage to get BlockArray and DefaultId Array for the request BlockArray.
+  //
+
+  //
   // Parse the opcode in form pacakge to get the default setting.
   //
-  Status = ParseIfrData (HiiFormPackage, (UINT32) PackageSize, *Request, RequestBlockArray, VarStorageData, DefaultIdArray);
+  Status = ParseIfrData (DataBaseRecord->Handle,
+                         HiiFormPackage,
+                         (UINT32) PackageSize,
+                         *Request,
+                         RequestBlockArray,
+                         VarStorageData,
+                         DefaultIdArray);
   if (EFI_ERROR (Status)) {
     goto Done;
   }
-  
+
   //
   // No requested varstore in IFR data and directly return
   //
-  if (VarStorageData->Size == 0) {
+  if (VarStorageData->Type == 0 && VarStorageData->Name == NULL) {
     Status = EFI_SUCCESS;
     goto Done;
@@ -2166 +3197 @@
   // 3. Construct Request Element (Block Name) for 2.1 and 2.2 case.
   //
-
-  //
-  // Construct <ConfigHdr> : "GUID=...&NAME=...&PATH=..." by VarStorageData Guid, Name and DriverHandle
-  //
-  GenerateSubStr (L"GUID=", sizeof (EFI_GUID), (VOID *) &VarStorageData->Guid, 1, &GuidStr);
-  GenerateSubStr (L"NAME=", StrLen (VarStorageData->Name) * sizeof (CHAR16), (VOID *) VarStorageData->Name, 2, &NameStr);
-  GenerateSubStr (
-    L"PATH=",
-    GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DevicePath),
-    (VOID *) DevicePath,
-    1,
-    &PathStr
-    );
-  Length = StrLen (GuidStr);
-  Length = Length + StrLen (NameStr);
-  Length = Length + StrLen (PathStr) + 1;
-  ConfigHdr = AllocateZeroPool (Length * sizeof (CHAR16));
-  if (ConfigHdr == NULL) {
-    Status = EFI_OUT_OF_RESOURCES;
-    goto Done;    
-  }
-  StrCpy (ConfigHdr, GuidStr);
-  StrCat (ConfigHdr, NameStr);
-  StrCat (ConfigHdr, PathStr);
-
-  //
-  // Remove the last character L'&'
-  //
-  *(ConfigHdr + StrLen (ConfigHdr) - 1) = L'\0';
+  Status = GenerateHdr (VarStorageData, DevicePath, &ConfigHdr);
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
 
   if (RequestBlockArray == NULL) {
-    //
-    // Append VarStorageData BlockEntry into *Request string
-    // Now support only one varstore in a form package.
-    //
-
-    //
-    // Go through all VarStorageData Entry and get BlockEntry for each one for the multiple varstore in a single form package
-    // Then construct them all to return MultiRequest string : ConfigHdr BlockConfig
-    //
-
-    //
-    // Compute the length of the entire request starting with <ConfigHdr> and a 
-    // Null-terminator
-    //
-    DataExist = FALSE;
-    Length    = StrLen (ConfigHdr) + 1;
-
-    for (Link = VarStorageData->BlockEntry.ForwardLink; Link != &VarStorageData->BlockEntry; Link = Link->ForwardLink) {
-      //
-      // Add <BlockName> length for each Offset/Width pair
-      //
-      // <BlockName> ::= &OFFSET=1234&WIDTH=1234
-      //                 |  8   | 4 |   7  | 4 |
-      //
-      DataExist = TRUE;
-      Length = Length + (8 + 4 + 7 + 4);
-    }
-    
-    //
-    // No any request block data is found. The request string can't be constructed.
-    //
-    if (!DataExist) {
-      Status = EFI_SUCCESS;
+    if (!GenerateConfigRequest(ConfigHdr, VarStorageData, &Status, Request)) {
       goto Done;
     }
-
-    //
-    // Allocate buffer for the entire <ConfigRequest>
-    //
-    FullConfigRequest = AllocateZeroPool (Length * sizeof (CHAR16));
-    if (FullConfigRequest == NULL) {
-      Status = EFI_OUT_OF_RESOURCES;
-      goto Done;
-    }
-    StringPtr = FullConfigRequest;
-  
-    //
-    // Start with <ConfigHdr>
-    //
-    StrCpy (StringPtr, ConfigHdr);
-    StringPtr += StrLen (StringPtr);
-
-    //
-    // Loop through all the Offset/Width pairs and append them to ConfigRequest
-    //
-    for (Link = VarStorageData->BlockEntry.ForwardLink; Link != &VarStorageData->BlockEntry; Link = Link->ForwardLink) {
-      BlockData = BASE_CR (Link, IFR_BLOCK_DATA, Entry);
-      //
-      // Append &OFFSET=XXXX&WIDTH=YYYY\0
-      //
-      UnicodeSPrint (
-        StringPtr, 
-        (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16), 
-        L"&OFFSET=%04X&WIDTH=%04X", 
-        BlockData->Offset, 
-        BlockData->Width
-      );
-      StringPtr += StrLen (StringPtr);
-    }
-    //
-    // Set to the got full request string.
-    //
-    HiiToLower (FullConfigRequest);
-    if (*Request != NULL) {
-      FreePool (*Request);
-    }
-    *Request = FullConfigRequest;
-  }
-  
+  }
+
   //
   // 4. Construct Default Value string in AltResp according to request element.
@@ -2281 +3213 @@
   // Then construct them all to : ConfigHdr AltConfigHdr ConfigBody AltConfigHdr ConfigBody
   //
-  DataExist = FALSE;
-  //
-  // Add length for <ConfigHdr> + '\0'
-  //
-  Length = StrLen (ConfigHdr) + 1;
-  
-  for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {
-    DefaultId = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
-    //
-    // Add length for "&<ConfigHdr>&ALTCFG=XXXX"
-    //                |1| StrLen (ConfigHdr) | 8 | 4 |
-    //
-    Length += (1 + StrLen (ConfigHdr) + 8 + 4);
-    
-    for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {
-      BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);
-      for (LinkDefault = BlockData->DefaultValueEntry.ForwardLink; LinkDefault != &BlockData->DefaultValueEntry; LinkDefault = LinkDefault->ForwardLink) {
-        DefaultValueData = BASE_CR (LinkDefault, IFR_DEFAULT_DATA, Entry);
-        if (DefaultValueData->DefaultId == DefaultId->DefaultId) {
-          //
-          // Add length for "&OFFSET=XXXX&WIDTH=YYYY&VALUE=zzzzzzzzzzzz"
-          //                |    8  | 4 |   7  | 4 |   7  | Width * 2 |
-          //
-          Length += (8 + 4 + 7 + 4 + 7 + BlockData->Width * 2);
-          DataExist = TRUE;
-        }
-      }
-    }
-  }
-  
-  //
-  // No default value is found. The default string doesn't exist.
-  //
-  if (!DataExist) {
-    Status = EFI_SUCCESS;
+  Status = GenerateAltConfigResp (ConfigHdr, VarStorageData, DefaultIdArray, &DefaultAltCfgResp);
+  if (EFI_ERROR (Status)) {
     goto Done;
   }
-
-  //
-  // Allocate buffer for the entire <DefaultAltCfgResp>
-  //
-  DefaultAltCfgResp = AllocateZeroPool (Length * sizeof (CHAR16));
-  if (DefaultAltCfgResp == NULL) {
-    Status = EFI_OUT_OF_RESOURCES;
-    goto Done;
-  }
-  StringPtr = DefaultAltCfgResp;
-
-  //
-  // Start with <ConfigHdr>
-  //
-  StrCpy (StringPtr, ConfigHdr);
-  StringPtr += StrLen (StringPtr);
-
-  for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {
-    DefaultId = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
-    //
-    // Add <AltConfigHdr> of the form "&<ConfigHdr>&ALTCFG=XXXX\0"
-    //                                |1| StrLen (ConfigHdr) | 8 | 4 |
-    //
-    UnicodeSPrint (
-      StringPtr, 
-      (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 
-      L"&%s&ALTCFG=%04X", 
-      ConfigHdr, 
-      DefaultId->DefaultId
-      );
-    StringPtr += StrLen (StringPtr);
-    
-    for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {
-      BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);
-      for (LinkDefault = BlockData->DefaultValueEntry.ForwardLink; LinkDefault != &BlockData->DefaultValueEntry; LinkDefault = LinkDefault->ForwardLink) {
-        DefaultValueData = BASE_CR (LinkDefault, IFR_DEFAULT_DATA, Entry);
-        if (DefaultValueData->DefaultId == DefaultId->DefaultId) {
-          //
-          // Add <BlockConfig>
-          // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>
-          //
-          UnicodeSPrint (
-            StringPtr, 
-            (8 + 4 + 7 + 4 + 7 + 1) * sizeof (CHAR16),
-            L"&OFFSET=%04X&WIDTH=%04X&VALUE=", 
-            BlockData->Offset, 
-            BlockData->Width
-            );
-          StringPtr += StrLen (StringPtr);
-
-          //
-          // Convert Value to a hex string in "%x" format
-          // NOTE: This is in the opposite byte that GUID and PATH use
-          //
-          Width     = BlockData->Width;
-          TmpBuffer = (UINT8 *) &(DefaultValueData->Value);
-          for (; Width > 0; Width--) {
-            StringPtr += UnicodeValueToString (StringPtr, PREFIX_ZERO | RADIX_HEX, TmpBuffer[Width - 1], 2);
-          }
-        }
-      }
-    }
-  }
-  HiiToLower (DefaultAltCfgResp);
 
   //
@@ -2401 +3236 @@
       BlockData = BASE_CR (RequestBlockArray->Entry.ForwardLink, IFR_BLOCK_DATA, Entry);
       RemoveEntryList (&BlockData->Entry);
+      if (BlockData->Name != NULL) {
+        FreePool (BlockData->Name);
+      }
       FreePool (BlockData);
     }
@@ -2406 +3244 @@
     FreePool (RequestBlockArray);
   }
-  
+
   if (VarStorageData != NULL) {
     //
@@ -2414 +3252 @@
       BlockData = BASE_CR (VarStorageData->BlockEntry.ForwardLink, IFR_BLOCK_DATA, Entry);
       RemoveEntryList (&BlockData->Entry);
+      if (BlockData->Name != NULL) {
+        FreePool (BlockData->Name);
+      }
       //
       // Free default value link array
@@ -2438 +3279 @@
     FreePool (DefaultIdArray);
   }
-  
+
   //
   // Free the allocated string 
   //
-  if (GuidStr != NULL) {
-    FreePool (GuidStr);
-  }
-  if (NameStr != NULL) {
-    FreePool (NameStr);
-  }
-  if (PathStr != NULL) {
-    FreePool (PathStr);
-  }
   if (ConfigHdr != NULL) {
     FreePool (ConfigHdr);
@@ -2466 +3298 @@
       *PointerProgress = NULL;
     } else if (EFI_ERROR (Status)) {
-      *PointerProgress = Progress;
+      *PointerProgress = *Request;
     } else {
       *PointerProgress = *Request + StrLen (*Request);
@@ -2515 +3347 @@
   UINTN      BufferSize;
 
-  Status       = EFI_SUCCESS;
-  BufferSize   = 0;
-  VarStore     = NULL;
-  VarStoreName = NULL;
+  Status          = EFI_SUCCESS;
+  BufferSize      = 0;
+  VarStore        = NULL;
+  VarStoreName    = NULL;
+  *AccessProgress = Request;
   
   VarStoreName = AllocateZeroPool (AsciiStrSize ((CHAR8 *)EfiVarStoreInfo->Name) * sizeof (CHAR16));
@@ -2635 +3468 @@
 
   return Status;
+}
+
+/**
+  Validate the config request elements.
+
+  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format, 
+                                        without configHdr field.
+
+  @retval     CHAR16 *    THE first Name/value pair not correct.
+  @retval     NULL        Success parse the name/value pair
+**/
+CHAR16 *
+OffsetWidthValidate (
+  CHAR16          *ConfigElements
+  )
+{
+  CHAR16    *StringPtr;
+  CHAR16    *RetVal;
+
+  StringPtr = ConfigElements;
+
+  while (1) {
+    RetVal    = StringPtr;
+    if (StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) != 0) {
+      return RetVal;
+    }
+
+    while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {
+      StringPtr++;
+    }
+    if (*StringPtr == L'\0') {
+      return RetVal;
+    }
+
+    StringPtr += StrLen (L"&WIDTH=");
+    while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) != 0) {
+      StringPtr ++;
+    }
+
+    if (*StringPtr == L'\0') {
+      return NULL;
+    }
+  }
+}
+
+/**
+  Validate the config request elements.
+
+  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format, 
+                                        without configHdr field.
+
+  @retval     CHAR16 *    THE first Name/value pair not correct.
+  @retval     NULL        Success parse the name/value pair
+
+**/
+CHAR16 *
+NameValueValidate (
+  CHAR16          *ConfigElements
+  )
+{
+  CHAR16    *StringPtr;
+  CHAR16    *RetVal;
+
+  StringPtr = ConfigElements;
+
+  while (1) {
+    RetVal = StringPtr;
+    if (*StringPtr != L'&') {
+      return RetVal;
+    }
+    StringPtr += 1;
+
+    StringPtr = StrStr (StringPtr, L"&");
+    
+    if (StringPtr == NULL) {
+      return NULL;
+    }
+  }
+}
+
+/**
+  Validate the config request string.
+
+  @param  ConfigRequest                A null-terminated Unicode string in <ConfigRequest> format.
+
+  @retval     CHAR16 *    THE first element not correct.
+  @retval     NULL        Success parse the name/value pair
+
+**/
+CHAR16 *
+ConfigRequestValidate (
+  CHAR16          *ConfigRequest
+  )
+{
+  BOOLEAN            HasNameField;
+  CHAR16             *StringPtr;
+
+  HasNameField = TRUE;
+  StringPtr    = ConfigRequest;
+
+  //
+  // Check <ConfigHdr>
+  //
+  if (StrnCmp (StringPtr, L"GUID=", StrLen (L"GUID=")) != 0) {
+    return ConfigRequest;
+  }
+  StringPtr += StrLen (L"GUID=");
+  while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&NAME=", StrLen (L"&NAME=")) != 0) {
+    StringPtr++;
+  }
+  if (*StringPtr == L'\0') {
+    return ConfigRequest;
+  }
+  StringPtr += StrLen (L"&NAME=");
+  if (*StringPtr == L'&') {
+    HasNameField = FALSE;
+  }
+  while (*StringPtr != L'\0' && StrnCmp (StringPtr, L"&PATH=", StrLen (L"&PATH=")) != 0) {
+    StringPtr++;
+  }
+  if (*StringPtr == L'\0') {
+    return ConfigRequest;
+  }
+  StringPtr += StrLen (L"&PATH=");
+  while (*StringPtr != L'\0' && *StringPtr != L'&') {
+    StringPtr ++;
+  }
+
+  if (*StringPtr == L'\0') {
+    return NULL;
+  }
+
+  if (HasNameField) {
+    //
+    // Should be Buffer varstore, config request should be "OFFSET/Width" pairs.
+    //
+    return OffsetWidthValidate(StringPtr);
+  } else {
+    //
+    // Should be Name/Value varstore, config request should be "&name1&name2..." pairs.
+    //
+    return NameValueValidate(StringPtr);
+  }
 }
 
@@ -2672 +3648 @@
   @retval EFI_INVALID_PARAMETER  Illegal syntax. Progress set to most recent &
                                  before the error or the beginning of the string.
-  @retval EFI_INVALID_PARAMETER  Unknown name. Progress points to the & before the
-                                 name in question.
+  @retval EFI_INVALID_PARAMETER  The ExtractConfig function of the underlying HII
+                                 Configuration Access Protocol returned 
+                                 EFI_INVALID_PARAMETER. Progress set to most recent
+                                 & before the error or the beginning of the string.
 
 **/
@@ -2705 +3683 @@
   BOOLEAN                             IfrDataParsedFlag;
   BOOLEAN                             IsEfiVarStore;
-  EFI_IFR_VARSTORE_EFI                *EfiVarStoreInfo; 
+  EFI_IFR_VARSTORE_EFI                *EfiVarStoreInfo;
+  EFI_STRING                          ErrorPtr;
+  UINTN                               DevicePathSize;
 
   if (This == NULL || Progress == NULL || Results == NULL) {
@@ -2791 +3771 @@
       if ((DevicePathPkg = Database->PackageList->DevicePathPkg) != NULL) {
         CurrentDevicePath = DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER);
-        if (CompareMem (
-              DevicePath,
-              CurrentDevicePath,
-              GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) CurrentDevicePath)
-              ) == 0) {
+        DevicePathSize    = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) CurrentDevicePath);
+        if ((CompareMem (DevicePath,CurrentDevicePath,DevicePathSize) == 0) && IsThisPackageList(Database, ConfigRequest)) {
           DriverHandle = Database->DriverHandle;
           HiiHandle    = Database->Handle;
@@ -2823 +3800 @@
       }
     }
-    
-    //
-    // Check whether ConfigRequest contains request string OFFSET/WIDTH
+
+    //
+    // Validate ConfigRequest String.
+    //
+    ErrorPtr = ConfigRequestValidate(ConfigRequest);
+    if (ErrorPtr != NULL) {
+      *Progress = StrStr (StringPtr, ErrorPtr);
+      Status = EFI_INVALID_PARAMETER;
+      goto Done;
+    }
+
+    //
+    // Check whether ConfigRequest contains request string.
     //
     IfrDataParsedFlag = FALSE;
-    if ((HiiHandle != NULL) && (StrStr (ConfigRequest, L"&OFFSET=") == NULL)) {
+    if ((HiiHandle != NULL) && !GetElementsFromRequest(ConfigRequest)) {
       //
       // Get the full request string from IFR when HiiPackage is registered to HiiHandle 
@@ -2839 +3826 @@
         // Map it to the progress on <MultiConfigRequest> then return it.
         //
+        ASSERT (AccessProgress != NULL);
         *Progress = StrStr (StringPtr, AccessProgress);
         goto Done;
@@ -2845 +3833 @@
       // Not any request block is found.
       //
-      if (StrStr (ConfigRequest, L"&OFFSET=") == NULL) {
+      if (!GetElementsFromRequest(ConfigRequest)) {
         AccessResults = AllocateCopyPool (StrSize (ConfigRequest), ConfigRequest);
         goto NextConfigString;
@@ -2864 +3852 @@
       //
       Status = GetConfigRespFromEfiVarStore(This, EfiVarStoreInfo, ConfigRequest, &AccessResults, &AccessProgress);
-      FreePool (EfiVarStoreInfo);    
+      FreePool (EfiVarStoreInfo);
     } else {
       //
@@ -2916 +3904 @@
     }
     
-NextConfigString:   
+NextConfigString:
     if (!FirstElement) {
       Status = AppendToMultiString (Results, L"&");
@@ -2979 +3967 @@
   @param  Results                Null-terminated Unicode string in
                                  <MultiConfigAltResp> format which has all values
-                                 filled in for the names in the Request string.
-                                 String to be allocated by the  called function.
-                                 De-allocation is up to the caller.
+                                 filled in for the entirety of the current HII 
+                                 database. String to be allocated by the  called 
+                                 function. De-allocation is up to the caller.
 
   @retval EFI_SUCCESS            The Results string is filled with the values
@@ -3127 +4115 @@
           *StringPtr = 0;
         }
-        if (StrStr (AccessResults, L"&OFFSET=") != NULL) {
+        if (GetElementsFromRequest (AccessResults)) {
           Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &AccessResults, &DefaultResults, NULL);
           ASSERT_EFI_ERROR (Status);
@@ -3218 +4206 @@
   EFI_IFR_VARSTORE_EFI                *EfiVarStoreInfo;
   BOOLEAN                             IsEfiVarstore;
+  UINTN                               DevicePathSize;
 
   if (This == NULL || Progress == NULL) {
@@ -3289 +4278 @@
       if ((DevicePathPkg = Database->PackageList->DevicePathPkg) != NULL) {
         CurrentDevicePath = DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER);
-        if (CompareMem (
-              DevicePath,
-              CurrentDevicePath,
-              GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) CurrentDevicePath)
-              ) == 0) {
+        DevicePathSize    = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) CurrentDevicePath);
+        if ((CompareMem (DevicePath,CurrentDevicePath,DevicePathSize) == 0) && IsThisPackageList(Database, ConfigResp)) {
           DriverHandle = Database->DriverHandle;
           break;
@@ -3356 +4342 @@
     }
     if (EFI_ERROR (Status)) {
+      ASSERT (AccessProgress != NULL);
       //
       // AccessProgress indicates the parsing progress on <ConfigResp>.
@@ -3448 +4435 @@
   CHAR16                              TemChar;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || Progress == NULL || Config == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -3497 +4486 @@
   if (*StringPtr == 0) {
     *Progress = StringPtr;
-    Status = EFI_SUCCESS;
 
     AppendToMultiString(Config, ConfigRequest);
     HiiToLower (*Config);
 
-    goto Exit;
+    return EFI_SUCCESS;
   }
   //
@@ -3534 +4522 @@
     Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
     if (EFI_ERROR (Status)) {
-      *Progress = ConfigRequest;
+      *Progress = TmpPtr - 1;
       goto Exit;
     }
@@ -3547 +4535 @@
     StringPtr += Length;
     if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {
-      *Progress = StringPtr - Length - StrLen (L"OFFSET=") - 1;
+      *Progress = TmpPtr - 1;
       Status = EFI_INVALID_PARAMETER;
       goto Exit;
@@ -3558 +4546 @@
     Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
     if (EFI_ERROR (Status)) {
-      *Progress = ConfigRequest;
+      *Progress =  TmpPtr - 1;
       goto Exit;
     }
@@ -3571 +4559 @@
     StringPtr += Length;
     if (*StringPtr != 0 && *StringPtr != L'&') {
-      *Progress = StringPtr - Length - StrLen (L"&WIDTH=");
+      *Progress =  TmpPtr - 1;
       Status = EFI_INVALID_PARAMETER;
       goto Exit;
@@ -3694 +4682 @@
   @param  BlockSize              The length of the Block in units of UINT8.  On
                                  input, this is the size of the Block. On output,
-                                 if successful, contains the index of the  last
-                                 modified byte in the Block.
+                                 if successful, contains the largest index of the
+                                 modified byte in the Block, or the required buffer
+                                 size if the Block is not large enough.
   @param  Progress               On return, points to an element of the ConfigResp
                                  string filled in with the offset of the most
@@ -3715 +4704 @@
                                  Progress points at the '&' preceding the first
                                  non-<BlockName>.
-  @retval EFI_DEVICE_ERROR       Block not large enough. Progress undefined.
+  @retval EFI_BUFFER_TOO_SMALL   Block not large enough. Progress undefined. 
+                                 BlockSize is updated with the required buffer size.
   @retval EFI_NOT_FOUND          Target for the specified routing data was not found.
                                  Progress points to the "G" in "GUID" of the errant
@@ -3733 +4723 @@
   HII_DATABASE_PRIVATE_DATA           *Private;
   EFI_STRING                          StringPtr;
+  EFI_STRING                          TmpPtr;
   UINTN                               Length;
   EFI_STATUS                          Status;
@@ -3742 +4733 @@
   UINTN                               MaxBlockSize;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || BlockSize == NULL || Progress == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -3784 +4777 @@
     goto Exit;
   }
-  //
-  // Skip '&'
-  //
-  StringPtr++;
 
   //
   // Parse each <ConfigElement> if exists
-  // Only <BlockConfig> format is supported by this help function.
+  // Only '&'<BlockConfig> format is supported by this help function.
   // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE='<Number>
   //
-  while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {
-    StringPtr += StrLen (L"OFFSET=");
+  while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {
+    TmpPtr     = StringPtr;
+    StringPtr += StrLen (L"&OFFSET=");
     //
     // Get Offset
@@ -3801 +4791 @@
     Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
     if (EFI_ERROR (Status)) {
-      *Progress = ConfigResp;
+      *Progress = TmpPtr;
       goto Exit;
     }
@@ -3814 +4804 @@
     StringPtr += Length;
     if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {
-      *Progress = StringPtr - Length - StrLen (L"OFFSET=") - 1;
+      *Progress = TmpPtr;
       Status = EFI_INVALID_PARAMETER;
       goto Exit;
@@ -3825 +4815 @@
     Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
     if (EFI_ERROR (Status)) {
-      *Progress = ConfigResp;
+      *Progress = TmpPtr;
       goto Exit;
     }
@@ -3838 +4828 @@
     StringPtr += Length;
     if (StrnCmp (StringPtr, L"&VALUE=", StrLen (L"&VALUE=")) != 0) {
-      *Progress = StringPtr - Length - StrLen (L"&WIDTH=");
+      *Progress = TmpPtr;
       Status = EFI_INVALID_PARAMETER;
       goto Exit;
@@ -3849 +4839 @@
     Status = GetValueOfNumber (StringPtr, &Value, &Length);
     if (EFI_ERROR (Status)) {
-      *Progress = ConfigResp;
+      *Progress = TmpPtr;
       goto Exit;
     }
@@ -3855 +4845 @@
     StringPtr += Length;
     if (*StringPtr != 0 && *StringPtr != L'&') {
-      *Progress = StringPtr - Length - 7;
+      *Progress = TmpPtr;
       Status = EFI_INVALID_PARAMETER;
       goto Exit;
@@ -3874 +4864 @@
 
     //
-    // If '\0', parsing is finished. Otherwise skip '&' to continue
+    // If '\0', parsing is finished.
     //
     if (*StringPtr == 0) {
       break;
     }
-
-    StringPtr++;
   }
   
   //
-  // The input string is ConfigAltResp format.
-  //
-  if ((*StringPtr != 0) && (StrnCmp (StringPtr, L"&GUID=", StrLen (L"&GUID=")) != 0)) {
-    *Progress = StringPtr - 1;
+  // The input string is not ConfigResp format, return error.
+  //
+  if (*StringPtr != 0) {
+    *Progress = StringPtr;
     Status = EFI_INVALID_PARAMETER;
     goto Exit;
@@ -3898 +4886 @@
     *BlockSize = MaxBlockSize;
     if (Block != NULL) {
-      return EFI_DEVICE_ERROR;
+      return EFI_BUFFER_TOO_SMALL;
     }
   }

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c

@@ -2 +2 @@
 Implementation for EFI_HII_DATABASE_PROTOCOL.
 
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -2418 +2418 @@
   // Initialize Variables
   //
-  StringPkgIsAdd = FALSE;
-  FontPackage = NULL;
+  StringPkgIsAdd        = FALSE;
+  FontPackage           = NULL;
+  StringPackage         = NULL;
+  GuidPackage           = NULL;
+  FormPackage           = NULL;
+  ImagePackage          = NULL;
+  SimpleFontPackage     = NULL;
+  KeyboardLayoutPackage = NULL;
 
   //
@@ -2506 +2512 @@
         return Status;
       }
+      ASSERT (StringPackage != NULL);
       Status = InvokeRegisteredFunction (
                  Private,
@@ -3101 +3108 @@
 
   @retval EFI_SUCCESS            The matching handles are outputed successfully.
-                                               HandleBufferLength is updated with the actual length.
+                                 HandleBufferLength is updated with the actual length.
   @retval EFI_BUFFER_TO_SMALL    The HandleBufferLength parameter indicates that
                                  Handle is too small to support the number of
@@ -3107 +3114 @@
                                  value that will  enable the data to fit.
   @retval EFI_NOT_FOUND          No matching handle could not be found in database.
-  @retval EFI_INVALID_PARAMETER  Handle or HandleBufferLength was NULL.
-  
+  @retval EFI_INVALID_PARAMETER  HandleBufferLength was NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by HandleBufferLength was not
+                                 zero and Handle was NULL.
   @retval EFI_INVALID_PARAMETER  PackageType is not a EFI_HII_PACKAGE_TYPE_GUID but
-                                                     PackageGuid is not NULL, PackageType is a EFI_HII_
-                                                     PACKAGE_TYPE_GUID but PackageGuid is NULL.
+                                 PackageGuid is not NULL, PackageType is a EFI_HII_
+                                 PACKAGE_TYPE_GUID but PackageGuid is NULL.
 
 **/
@@ -3264 +3272 @@
   @retval EFI_NOT_FOUND          The specifiecd Handle could not be found in the
                                  current database.
-  @retval EFI_INVALID_PARAMETER  Handle or Buffer or BufferSize was NULL.
+  @retval EFI_INVALID_PARAMETER  BufferSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by BufferSize was not zero 
+                                 and Buffer was NULL.
 
 **/
@@ -3526 +3536 @@
                                  updated with a value that will enable the data to
                                  fit.
-  @retval EFI_INVALID_PARAMETER  The KeyGuidBuffer or KeyGuidBufferLength was NULL.
+  @retval EFI_INVALID_PARAMETER  The KeyGuidBufferLength is NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by KeyGuidBufferLength is not
+                                 zero and KeyGuidBuffer is NULL.
   @retval EFI_NOT_FOUND          There was no keyboard layout.
 

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c

@@ -3 +3 @@
 
 
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -758 +758 @@
 
     case EFI_HII_GIBT_EXT1:
-      BlockPtr += *(BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8));
+      BlockPtr += *(UINT8*)((UINTN)BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8));
       break;
     case EFI_HII_GIBT_EXT2:
       CopyMem (
         &Length16,
-        BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8)),
         sizeof (UINT16)
         );
@@ -771 +771 @@
       CopyMem (
         &Length32,
-        BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockPtr + sizeof (EFI_HII_GLYPH_BLOCK) + sizeof (UINT8)),
         sizeof (UINT32)
         );
@@ -794 +794 @@
       if (CharCurrent == CharValue) {
         return WriteOutputParam (
-                 BlockPtr + sizeof (EFI_HII_GIBT_GLYPH_BLOCK) - sizeof (UINT8),
+                 (UINT8*)((UINTN)BlockPtr + sizeof (EFI_HII_GIBT_GLYPH_BLOCK) - sizeof (UINT8)),
                  BufferLen,
                  &LocalCell,
@@ -1041 +1041 @@
   }
 
+  SystemDefault = NULL;
+  DefaultLen    = 0;
+
   Status = GetSystemFont (Private, &SystemDefault, &DefaultLen);
   ASSERT_EFI_ERROR (Status);
+  ASSERT ((SystemDefault != NULL) && (DefaultLen != 0));
 
   //
@@ -1688 +1692 @@
 
   if (SysFontFlag) {
+    ASSERT (SystemDefault != NULL);
     FontInfo   = NULL;
     Height     = SystemDefault->FontInfo.FontSize;
@@ -2369 +2374 @@
     Language = "";
   }
-  CurrentLanguage = GetEfiGlobalVariable (L"PlatformLang");
+  GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLanguage, NULL);
   BestLanguage = GetBestLanguage (
                    SupportedLanguages,
@@ -2581 +2586 @@
     Background = StringInfoOut->BackgroundColor;
   } else {
+    ASSERT (SystemDefault != NULL);
     Foreground = SystemDefault->ForegroundColor;
     Background = SystemDefault->BackgroundColor;
@@ -2680 +2686 @@
                                   returned font handle or points to NULL if there
                                   are no more matching fonts.
-  @param  StringInfoIn            Upon entry, points to the font to return
-                                  information about. 
-                                  If NULL, then the information about the system default 
-                                  font will be returned.
-  @param  StringInfoOut           Upon return, contains the matching font's
-                                  information.  If NULL, then no information is
-                                  returned. It's caller's responsibility to free
-                                  this buffer.
+  @param  StringInfoIn            Upon entry, points to the font to return information
+                                  about. If NULL, then the information about the system
+                                  default font will be returned.
+  @param  StringInfoOut           Upon return, contains the matching font's information.
+                                  If NULL, then no information is returned. This buffer
+                                  is allocated with a call to the Boot Service AllocatePool().
+                                  It is the caller's responsibility to call the Boot 
+                                  Service FreePool() when the caller no longer requires
+                                  the contents of StringInfoOut.
   @param  String                  Points to the string which will be tested to
                                   determine  if all characters are available. If
@@ -2723 +2730 @@
   }
 
+  StringInfoOutLen = 0;
   FontInfo        = NULL;
   SystemDefault   = NULL;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h

@@ -66 +66 @@
   EFI_GUID            Guid;
   CHAR16              *Name;
-  EFI_VARSTORE_ID     VarStoreId;
   UINT16              Size;
+  UINT8               Type;
   LIST_ENTRY          BlockEntry;        // Link to its Block array
 } IFR_VARSTORAGE_DATA;
@@ -79 +79 @@
   UINT8               Scope;
   LIST_ENTRY          DefaultValueEntry; // Link to its default value array
+  CHAR16              *Name;
 } IFR_BLOCK_DATA;
 
@@ -103 +104 @@
 // Storage types
 //
-#define EFI_HII_VARSTORE_BUFFER            0
-#define EFI_HII_VARSTORE_NAME_VALUE        1
-#define EFI_HII_VARSTORE_EFI_VARIABLE      2
+#define EFI_HII_VARSTORE_BUFFER              0
+#define EFI_HII_VARSTORE_NAME_VALUE          1
+#define EFI_HII_VARSTORE_EFI_VARIABLE        2
+#define EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER 3
 
 #define HII_FORMSET_STORAGE_SIGNATURE           SIGNATURE_32 ('H', 'S', 'T', 'G')
@@ -723 +725 @@
                                   returned font handle or points to NULL if there
                                   are no more matching fonts.
-  @param  StringInfoIn            Upon entry, points to the font to return
-                                  information about. If NULL, then the information about the system default 
-                                  font will be returned.
-  @param  StringInfoOut           Upon return, contains the matching font's
-                                  information.  If NULL, then no information is
-                                  returned. It's caller's responsibility to free
-                                  this buffer.
+  @param  StringInfoIn            Upon entry, points to the font to return information
+                                  about. If NULL, then the information about the system
+                                  default font will be returned.
+  @param  StringInfoOut           Upon return, contains the matching font's information.
+                                  If NULL, then no information is returned. This buffer
+                                  is allocated with a call to the Boot Service AllocatePool().
+                                  It is the caller's responsibility to call the Boot 
+                                  Service FreePool() when the caller no longer requires
+                                  the contents of StringInfoOut.
   @param  String                  Points to the string which will be tested to
                                   determine  if all characters are available. If
@@ -737 +741 @@
   @retval EFI_NOT_FOUND           No matching font was found.
   @retval EFI_INVALID_PARAMETER   StringInfoIn is NULL.
-  @retval EFI_INVALID_PARAMETER  StringInfoIn->FontInfoMask is an invalid combination.
+  @retval EFI_INVALID_PARAMETER   StringInfoIn->FontInfoMask is an invalid combination.
   @retval EFI_OUT_OF_RESOURCES    There were insufficient resources to complete the
                                   request.
@@ -1002 +1006 @@
   @retval EFI_NOT_FOUND           The string specified by StringId is not
                                   available.
-  @retval EFI_NOT_FOUND           The string specified by StringId is available but
-                                                not in the specified language.
-                                                The specified PackageList is not in the database.
-  @retval EFI_INVALID_LANGUAGE   - The string specified by StringId is available but
+                                  The specified PackageList is not in the database.
+  @retval EFI_INVALID_LANGUAGE    The string specified by StringId is available but
+                                  not in the specified language.
   @retval EFI_BUFFER_TOO_SMALL    The buffer specified by StringSize is too small
                                   to  hold the string.
-  @retval EFI_INVALID_PARAMETER   The String or Language or StringSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The Language or StringSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by StringSize was not zero
+                                  and String was NULL.
   @retval EFI_OUT_OF_RESOURCES    There were insufficient resources to complete the
                                    request.
@@ -1074 +1079 @@
 
   @retval EFI_SUCCESS             The languages were returned successfully.
-  @retval EFI_INVALID_PARAMETER   The Languages or LanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The LanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by LanguagesSize is not zero and Languages is NULL.
   @retval EFI_BUFFER_TOO_SMALL    The LanguagesSize is too small to hold the list
                                   of  supported languages. LanguageSize is updated
@@ -1115 +1121 @@
 
   @retval EFI_SUCCESS             Secondary languages were correctly returned.
-  @retval EFI_INVALID_PARAMETER   PrimaryLanguage or SecondaryLanguages or
-                                  SecondaryLanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER   PrimaryLanguage or SecondaryLanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by SecondaryLanguagesSize is not
+                                  zero and SecondaryLanguages is NULL.
   @retval EFI_BUFFER_TOO_SMALL    The buffer specified by SecondaryLanguagesSize is
                                   too small to hold the returned information.
@@ -1123 +1130 @@
   @retval EFI_INVALID_LANGUAGE    The language specified by PrimaryLanguage is not
                                   present in the specified package list.
-  @retval EFI_NOT_FOUND          The specified PackageList is not in the Database.                                
+  @retval EFI_NOT_FOUND           The specified PackageList is not in the Database.
 
 **/
@@ -1242 +1249 @@
 
   @retval EFI_SUCCESS             The matching handles are outputed successfully.
-                                                HandleBufferLength is updated with the actual length.
+                                  HandleBufferLength is updated with the actual length.
   @retval EFI_BUFFER_TO_SMALL     The HandleBufferLength parameter indicates that
                                   Handle is too small to support the number of
@@ -1249 +1256 @@
   @retval EFI_NOT_FOUND           No matching handle could not be found in
                                   database.
-  @retval EFI_INVALID_PARAMETER   Handle or HandleBufferLength was NULL.
-  @retval EFI_INVALID_PARAMETER  PackageType is not a EFI_HII_PACKAGE_TYPE_GUID but
-                         PackageGuid is not NULL, PackageType is a EFI_HII_
-                         PACKAGE_TYPE_GUID but PackageGuid is NULL.
-  
+  @retval EFI_INVALID_PARAMETER   HandleBufferLength was NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by HandleBufferLength was not
+                                  zero and Handle was NULL.
+  @retval EFI_INVALID_PARAMETER   PackageType is not a EFI_HII_PACKAGE_TYPE_GUID but
+                                  PackageGuid is not NULL, PackageType is a EFI_HII_
+                                  PACKAGE_TYPE_GUID but PackageGuid is NULL.
 
 **/
@@ -1291 +1299 @@
   @retval EFI_NOT_FOUND           The specifiecd Handle could not be found in the
                                   current database.
-  @retval EFI_INVALID_PARAMETER   Handle or Buffer or BufferSize was NULL.
+  @retval EFI_INVALID_PARAMETER   BufferSize was NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by BufferSize was not zero 
+                                  and Buffer was NULL.
 
 **/
@@ -1391 +1401 @@
                                   updated with a value that will enable the data to
                                   fit.
-  @retval EFI_INVALID_PARAMETER   The KeyGuidBuffer or KeyGuidBufferLength was
-                                  NULL.
+  @retval EFI_INVALID_PARAMETER   The KeyGuidBufferLength is NULL.
+  @retval EFI_INVALID_PARAMETER   The value referenced by KeyGuidBufferLength is not
+                                  zero and KeyGuidBuffer is NULL.
   @retval EFI_NOT_FOUND           There was no keyboard layout.
 
@@ -1547 +1558 @@
   @param  Results                 Null-terminated Unicode string in
                                   <MultiConfigAltResp> format which has all values
-                                  filled in for the names in the Request string.
-                                  String to be allocated by the  called function.
-                                  De-allocation is up to the caller.
+                                  filled in for the entirety of the current HII 
+                                  database. String to be allocated by the  called 
+                                  function. De-allocation is up to the caller.
 
   @retval EFI_SUCCESS             The Results string is filled with the values
@@ -1672 +1683 @@
   @param  BlockSize               The length of the Block in units of UINT8.  On
                                   input, this is the size of the Block. On output,
-                                  if successful, contains the index of the  last
-                                  modified byte in the Block.
+                                  if successful, contains the largest index of the
+                                  modified byte in the Block, or the required buffer
+                                  size if the Block is not large enough.
   @param  Progress                On return, points to an element of the ConfigResp
                                    string filled in with the offset of the most
@@ -1698 +1710 @@
                                   Progress points at the '&' preceding the first
                                   non-<BlockName>.
+  @retval EFI_BUFFER_TOO_SMALL    Block not large enough. Progress undefined. 
+                                  BlockSize is updated with the required buffer size.
 
 **/

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

@@ -1 +1 @@
 ## @file
-# The DXE driver produces HII protocols defined in UEFI HII 2.1 specificatin.
+# The DXE driver produces HII protocols defined in UEFI specification.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# This driver produces all required HII serivces that includes HiiDataBase, HiiString,
+# HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
+#
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials       
@@ -18 +21 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = HiiDatabase
+  MODULE_UNI_FILE                = HiiDatabase.uni
   FILE_GUID                      = 348C4D62-BFBD-4882-9ECE-C80BB1C4783B
   MODULE_TYPE                    = DXE_DRIVER
@@ -59 +63 @@
   gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES
   gEfiHiiStringProtocolGuid                                             ## PRODUCES
-  gEfiHiiImageProtocolGuid |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol                  ## PRODUCES
+  gEfiHiiImageProtocolGuid |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol  ## SOMETIMES_PRODUCES
   gEfiHiiConfigRoutingProtocolGuid                                      ## PRODUCES
   gEfiHiiDatabaseProtocolGuid                                           ## PRODUCES
   gEfiHiiFontProtocolGuid                                               ## PRODUCES
-  gEfiHiiConfigAccessProtocolGuid                                       ## CONSUMES
+  gEfiHiiConfigAccessProtocolGuid                                       ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol   ## CONSUMES
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## CONSUMES
 
 [Guids]  
-  gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## Variable:"PlatformLang"
-  ##
+  #
   # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
-  ##
-  gEfiHiiKeyBoardLayoutGuid  ## SOMETIME_CONSUMES  ## Event
+  #
+  ## CONSUMES  ## Event
+  ## PRODUCES  ## Event
+  gEfiHiiKeyBoardLayoutGuid
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  HiiDatabaseExtra.uni

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c

@@ -3 +3 @@
 
 
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -80 +80 @@
     switch (((EFI_HII_IMAGE_BLOCK *) ImageBlock)->BlockType) {
     case EFI_HII_IIBT_EXT1:
-      Length8 = *(ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));
+      Length8 = *(UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));
       ImageBlock += Length8;
-      ImageIdCurrent++;
       break;
     case EFI_HII_IIBT_EXT2:
       CopyMem (
         &Length16,
-        ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8)),
         sizeof (UINT16)
         );
       ImageBlock += Length16;
-      ImageIdCurrent++;
       break;
     case EFI_HII_IIBT_EXT4:
       CopyMem (
         &Length32,
-        ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8)),
         sizeof (UINT32)
         );
       ImageBlock += Length32;
-      ImageIdCurrent++;
       break;
 
@@ -883 +880 @@
     //
     return EFI_UNSUPPORTED;
-    break;
 
   case EFI_HII_IIBT_IMAGE_1BIT_TRANS:
@@ -925 +921 @@
       Output1bitPixel (
         Image,
-        (UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK) - sizeof (UINT8)),
+        (UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK) - sizeof (UINT8)),
         (EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
         );
@@ -931 +927 @@
       Output4bitPixel (
         Image,
-        (UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK) - sizeof (UINT8)),
+        (UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK) - sizeof (UINT8)),
         (EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
         );
@@ -937 +933 @@
       Output8bitPixel (
         Image,
-        (UINT8 *) (ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK) - sizeof (UINT8)),
+        (UINT8 *) ((UINTN)ImageBlock + sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK) - sizeof (UINT8)),
         (EFI_HII_IMAGE_PALETTE_INFO *) PaletteInfo
         );
@@ -943 +939 @@
 
     return EFI_SUCCESS;
-    break;
 
   case EFI_HII_IIBT_IMAGE_24BIT_TRANS:
@@ -977 +972 @@
       );
     return EFI_SUCCESS;
-    break;
 
   default:
     return EFI_NOT_FOUND;
-    break;
   }
 }
@@ -1088 +1081 @@
     //
     return EFI_UNSUPPORTED;
-    break;
 
   case EFI_HII_IIBT_IMAGE_1BIT:
@@ -1121 +1113 @@
   default:
     return EFI_NOT_FOUND;
-    break;
   }
 
@@ -1247 +1238 @@
   }
 
+  FontInfo = NULL;
   ImageIn = (EFI_IMAGE_INPUT *) Image;
 
@@ -1393 +1385 @@
       return Status;
     }
+    ASSERT (FontInfo != NULL);
     for (Index = 0; Index < Width * Height; Index++) {
       BltBuffer[Index] = FontInfo->BackgroundColor;

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/String.c

@@ -3 +3 @@
 
 
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -336 +336 @@
     case EFI_HII_SIBT_STRINGS_SCSU:
       CopyMem (&StringCount, BlockHdr + sizeof (EFI_HII_STRING_BLOCK), sizeof (UINT16));
-      StringTextPtr = BlockHdr + sizeof (EFI_HII_SIBT_STRINGS_SCSU_BLOCK) - sizeof (UINT8);
+      StringTextPtr = (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_SIBT_STRINGS_SCSU_BLOCK) - sizeof (UINT8));
       BlockSize += StringTextPtr - BlockHdr;
 
@@ -356 +356 @@
       CopyMem (
         &StringCount,
-        BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8)),
         sizeof (UINT16)
         );
-      StringTextPtr = BlockHdr + sizeof (EFI_HII_SIBT_STRINGS_SCSU_FONT_BLOCK) - sizeof (UINT8);
+      StringTextPtr = (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_SIBT_STRINGS_SCSU_FONT_BLOCK) - sizeof (UINT8));
       BlockSize += StringTextPtr - BlockHdr;
 
@@ -426 +426 @@
       CopyMem (
         &StringCount,
-        BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8)),
         sizeof (UINT16)
         );
@@ -466 +466 @@
 
     case EFI_HII_SIBT_SKIP1:
-      SkipCount = (UINT16) (*(BlockHdr + sizeof (EFI_HII_STRING_BLOCK)));
+      SkipCount = (UINT16) (*(UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_STRING_BLOCK)));
       CurrentStringId = (UINT16) (CurrentStringId + SkipCount);
       BlockSize       +=  sizeof (EFI_HII_SIBT_SKIP1_BLOCK);
@@ -480 +480 @@
       CopyMem (
         &Length8,
-        BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8)),
         sizeof (UINT8)
         );
@@ -495 +495 @@
         BlockHdr += sizeof (EFI_HII_SIBT_EXT2_BLOCK);
         CopyMem (&FontId, BlockHdr, sizeof (UINT8));
-        BlockHdr += sizeof (UINT8);
+        BlockHdr ++;
         CopyMem (&FontSize, BlockHdr, sizeof (UINT16));
         BlockHdr += sizeof (UINT16);
@@ -536 +536 @@
       CopyMem (
         &Length32,
-        BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8),
+        (UINT8*)((UINTN)BlockHdr + sizeof (EFI_HII_STRING_BLOCK) + sizeof (UINT8)),
         sizeof (UINT32)
         );
@@ -900 +900 @@
 
   StartStringId = 0;
+  StringSize    = 0;
   ASSERT (Private != NULL && StringPackage != NULL && String != NULL);
   ASSERT (Private->Signature == HII_DATABASE_PRIVATE_DATA_SIGNATURE);
@@ -1080 +1081 @@
 
   *BlockPtr = LocalFont->FontId;
-  BlockPtr += sizeof (UINT8);
+  BlockPtr ++;
   CopyMem (BlockPtr, &GlobalFont->FontInfo->FontSize, sizeof (UINT16));
   BlockPtr += sizeof (UINT16);
@@ -1442 +1443 @@
       BlockPtr  += sizeof (EFI_HII_STRING_BLOCK);
       *BlockPtr = LocalFont->FontId;
-      BlockPtr  += sizeof (UINT8);
+      BlockPtr ++;
       CopyMem (BlockPtr, (EFI_STRING) String, StrSize ((EFI_STRING) String));
       BlockPtr += StrSize ((EFI_STRING) String);
@@ -1486 +1487 @@
 
       *BlockPtr = LocalFont->FontId;
-      BlockPtr += sizeof (UINT8);
+      BlockPtr ++;
       CopyMem (BlockPtr, &((EFI_FONT_INFO *) StringFontInfo)->FontSize, sizeof (UINT16));
       BlockPtr += sizeof (UINT16);
@@ -1503 +1504 @@
       BlockPtr  += sizeof (EFI_HII_STRING_BLOCK);
       *BlockPtr = LocalFont->FontId;
-      BlockPtr  += sizeof (UINT8);
+      BlockPtr  ++;
       CopyMem (BlockPtr, (EFI_STRING) String, StrSize ((EFI_STRING) String));
       BlockPtr += StrSize ((EFI_STRING) String);
@@ -1590 +1591 @@
   @retval EFI_BUFFER_TOO_SMALL   The buffer specified by StringSize is too small to
                                   hold the string.
-  @retval EFI_INVALID_PARAMETER  The String or Language or StringSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The Language or StringSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by StringSize was not zero and String was NULL.
   @retval EFI_OUT_OF_RESOURCES   There were insufficient resources to complete the
                                  request.
@@ -1775 +1777 @@
 
   @retval EFI_SUCCESS            The languages were returned successfully.
-  @retval EFI_INVALID_PARAMETER  The Languages or LanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The LanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by LanguagesSize is not zero and Languages is NULL.
   @retval EFI_BUFFER_TOO_SMALL   The LanguagesSize is too small to hold the list of
                                   supported languages. LanguageSize is updated to
@@ -1799 +1802 @@
   UINTN                               ResultSize;
 
-  if (This == NULL || Languages == NULL || LanguagesSize == NULL || PackageList == NULL) {
+  if (This == NULL || LanguagesSize == NULL || PackageList == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  if (*LanguagesSize != 0 && Languages == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -1871 +1877 @@
 
   @retval EFI_SUCCESS            Secondary languages were correctly returned.
-  @retval EFI_INVALID_PARAMETER  PrimaryLanguage or SecondaryLanguages or
-                                 SecondaryLanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER  PrimaryLanguage or SecondaryLanguagesSize was NULL.
+  @retval EFI_INVALID_PARAMETER  The value referenced by SecondaryLanguagesSize is not
+                                 zero and SecondaryLanguages is NULL.
   @retval EFI_BUFFER_TOO_SMALL   The buffer specified by SecondaryLanguagesSize is
                                  too small to hold the returned information.
@@ -1879 +1886 @@
   @retval EFI_INVALID_LANGUAGE   The language specified by PrimaryLanguage is not
                                  present in the specified package list.
-  @retval EFI_NOT_FOUND          The specified PackageList is not in the Database.                                
+  @retval EFI_NOT_FOUND          The specified PackageList is not in the Database.
 
 **/
@@ -1901 +1908 @@
   UINTN                               ResultSize;
 
-  if (This == NULL || PackageList == NULL || PrimaryLanguage == NULL) {
+  if (This == NULL || PackageList == NULL || PrimaryLanguage == NULL || SecondaryLanguagesSize == NULL) {
     return EFI_INVALID_PARAMETER;
   }
-  if (SecondaryLanguages == NULL || SecondaryLanguagesSize == NULL) {
+  if (SecondaryLanguages == NULL && *SecondaryLanguagesSize != 0) {
     return EFI_INVALID_PARAMETER;
   }