1) Add in support to get only VarStoreId = 1 from Multiple VarStores.

2) Remove ThunkIfrSupportLib.h
3) Update some comments.
4) Add GetAttributesOfFirstFormSet to scan form package to read formset title, class info.
5) Clean up function related to package registration code.
6) Clean up RemovePackNotify

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

13 files changed, 132 insertions, 154 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index d6165b3dec..b5f4bf4bc0 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -398,6 +398,31 @@ GetUefiVariable (
   return Status;

 }

 

+BUFFER_STORAGE_ENTRY *

+GetBufferStorageEntry (

+  IN      CONFIG_ACCESS_PRIVATE       *ConfigAccess,

+  IN      UINT16                      VarStoreId

+  )

+{

+  LIST_ENTRY                                  *Link;

+  BUFFER_STORAGE_ENTRY                        *BufferStorage;

+

+  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);

+

+  while (!IsNull (&ConfigAccess->BufferStorageListHead, Link)) {

+    BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);

+

+    if (BufferStorage->VarStoreId == VarStoreId) {

+      return BufferStorage;

+    }

+

+    Link = GetNextNode (&ConfigAccess->BufferStorageListHead, Link);

+  }

+

+  return NULL;

+}

+

+

 /**

 

   This function implement the EFI_HII_CONFIG_ACCESS_PROTOCOL.ExtractConfig

@@ -432,7 +457,6 @@ ThunkExtractConfig (
 {

   EFI_STATUS                                  Status;

   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;

-  LIST_ENTRY                                  *Link;

   BUFFER_STORAGE_ENTRY                        *BufferStorage;

   VOID                                        *Data;

   UINTN                                       DataSize;

@@ -443,13 +467,7 @@ ThunkExtractConfig (
   //

   // For now, only one var varstore is supported so that we don't need to parse the Configuration string.

   //

-  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);

-  if (Link == NULL) {

-    ASSERT (FALSE);

-    return EFI_INVALID_PARAMETER;

-  }

-  

-  BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);

+  BufferStorage = GetBufferStorageEntry (ConfigAccess, (UINT16) RESERVED_VARSTORE_ID);

 

   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {

     if (ConfigAccess->FormCallbackProtocol == NULL ||

@@ -519,7 +537,6 @@ ThunkRouteConfig (
 {

   EFI_STATUS                                  Status;

   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;

-  LIST_ENTRY                                  *Link;

   BUFFER_STORAGE_ENTRY                        *BufferStorage;

   UINT8                                       *Data;

   UINTN                                       DataSize;

@@ -534,13 +551,8 @@ ThunkRouteConfig (
   //

   // For now, only one var varstore is supported so that we don't need to parse the Configuration string.

   //

-  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);

-  if (Link == NULL) {

-    ASSERT (FALSE);

-    return EFI_INVALID_PARAMETER;

-  }

+  BufferStorage = GetBufferStorageEntry (ConfigAccess, (UINT16) RESERVED_VARSTORE_ID);

 

-  BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);

   DataSize2     = BufferStorage->Size;

   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {

     DataAllocated = TRUE;

@@ -901,17 +913,10 @@ ThunkCallback (
   //

   if (EFI_ERROR (Status)) {

     if (Packet != NULL) {

-      //

-      // BUGBUG: need to restore the changing question to default value

-      //

-

       do {

         IfrLibCreatePopUp (1, &Key, Packet->String);

-

       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);

-      

     }

-

     //

     // Error Code in Status is discarded.

     //

@@ -943,7 +948,7 @@ ThunkCallback (
                            NotifyHandle

                            );

   //

-  // UEFI SetupBrowser handles scenario differently with Framework SetupBrowser when call back function 

+  // UEFI SetupBrowser behaves differently with Framework SetupBrowser when call back function 

   // update any forms in HII database. UEFI SetupBrowser will re-parse the displaying form package and load

   // the values from variable storages. Framework SetupBrowser will only re-parse the displaying form packages.

   // To make sure customer's previous changes is saved and the changing question behaves as expected, we

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
index 34a89b1b08..49c82b91df 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
@@ -1,5 +1,4 @@
 /**@file

-

   This file contains the Glyph related function.

 

 Copyright (c) 2006 - 2008, Intel Corporation

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index 45ccfdb171..3679f6dfb4 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -38,8 +38,7 @@ FW_HII_FORMSET_TEMPLATE FormSetTemplate = {
       FRAMEWORK_EFI_IFR_FORM_SET_OP,

       sizeof (FRAMEWORK_EFI_IFR_FORM_SET)

     },

-    //Guid

-    {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}},

+    {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}, //Guid

     0,

     0,

     0,

@@ -116,11 +115,11 @@ HiiExportDatabase (
 EFI_STATUS

 EFIAPI

 HiiGetForms (

-  IN     EFI_HII_PROTOCOL   *This,

-  IN     FRAMEWORK_EFI_HII_HANDLE      Handle,

-  IN     EFI_FORM_ID        FormId,

-  IN OUT UINTN              *BufferLengthTemp,

-  OUT    UINT8              *Buffer

+  IN     EFI_HII_PROTOCOL             *This,

+  IN     FRAMEWORK_EFI_HII_HANDLE     Handle,

+  IN     EFI_FORM_ID                  FormId,

+  IN OUT UINTN                        *BufferLengthTemp,

+  OUT    UINT8                        *Buffer

   )

 {

   HII_THUNK_PRIVATE_DATA                *Private;

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index 3fc839ae89..b53beb1ed4 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -45,7 +45,10 @@ HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
   },

 

   {

-    NULL, NULL                  //HiiHandleLinkList

+    ///

+    /// HiiHandleLinkList

+    ///

+    NULL, NULL                  

   },

 };

 

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index 55d1859faf..e165d74855 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -1,7 +1,7 @@
 /**@file

 

   This file contains global defines and prototype definitions

-  for the HII database.

+  for the Framework HII to Uefi HII Thunk Module.

   

 Copyright (c) 2006 - 2008, Intel Corporation

 All rights reserved. This program and the accompanying materials

@@ -51,6 +51,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include <MdeModuleHii.h>

 

+

+//

+// VARSTORE ID of 0 for Buffer Storage Type Storage is reserved in UEFI IFR form. But VARSTORE ID

+// 0 in Framework IFR is the default VarStore ID for storage without explicit declaration. So we have

+// to reseved 0x0001 in UEFI VARSTORE ID to represetn default storage id in Framework IFR.

+// Framework VFR has to be ported or pre-processed to change the default VARSTORE to a VARSTORE

+// with ID equal to 0x0001.

+//

+#define RESERVED_VARSTORE_ID 0x0001

+

+

 #pragma pack (push, 1)

 typedef struct {

   UINT32                  BinaryLength;

@@ -79,11 +90,11 @@ typedef struct {
 #define ONE_OF_OPTION_MAP_ENTRY_FROM_LINK(Record) CR(Record, ONE_OF_OPTION_MAP_ENTRY, Link, ONE_OF_OPTION_MAP_ENTRY_SIGNATURE)

 #define ONE_OF_OPTION_MAP_ENTRY_SIGNATURE            EFI_SIGNATURE_32 ('O', 'O', 'M', 'E')

 typedef struct {

-  UINT32          Signature;

-  LIST_ENTRY      Link;

+  UINT32              Signature;

+  LIST_ENTRY          Link;

 

-  UINT16             FwKey;

-  EFI_IFR_TYPE_VALUE Value;

+  UINT16              FwKey;

+  EFI_IFR_TYPE_VALUE  Value;

   

 } ONE_OF_OPTION_MAP_ENTRY;

 

@@ -92,14 +103,14 @@ typedef struct {
 #define ONE_OF_OPTION_MAP_FROM_LINK(Record) CR(Record, ONE_OF_OPTION_MAP, Link, ONE_OF_OPTION_MAP_SIGNATURE)

 #define ONE_OF_OPTION_MAP_SIGNATURE            EFI_SIGNATURE_32 ('O', 'O', 'O', 'M')

 typedef struct {

-  UINT32          Signature;

-  LIST_ENTRY      Link;       

+  UINT32            Signature;

+  LIST_ENTRY        Link;       

 

-  UINT8           ValueType; //EFI_IFR_TYPE_NUM_* 

+  UINT8             ValueType; //EFI_IFR_TYPE_NUM_* 

 

-  EFI_QUESTION_ID     QuestionId;

+  EFI_QUESTION_ID   QuestionId;

 

-  LIST_ENTRY      OneOfOptionMapEntryListHead; //ONE_OF_OPTION_MAP_ENTRY

+  LIST_ENTRY        OneOfOptionMapEntryListHead; //ONE_OF_OPTION_MAP_ENTRY

 } ONE_OF_OPTION_MAP;

 

 

@@ -220,34 +231,19 @@ extern HII_THUNK_PRIVATE_DATA                     *mHiiThunkPrivateData;
 extern BOOLEAN                                    mInFrameworkUpdatePakcage;

 

 

-//

-// Prototypes

-//

-

-//

-// Public Interface Prototypes

-//

-EFI_STATUS

-EFIAPI

-InitializeHiiDatabase (

-  IN EFI_HANDLE             ImageHandle,

-  IN EFI_SYSTEM_TABLE       *SystemTable

-  )

-;

-

 EFI_STATUS

 EFIAPI

 HiiNewPack (

-  IN  EFI_HII_PROTOCOL      *This,

-  IN  EFI_HII_PACKAGES      *PackageList,

-  OUT FRAMEWORK_EFI_HII_HANDLE         *Handle

+  IN  EFI_HII_PROTOCOL              *This,

+  IN  EFI_HII_PACKAGES              *PackageList,

+  OUT FRAMEWORK_EFI_HII_HANDLE      *Handle

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiRemovePack (

-  IN EFI_HII_PROTOCOL    *This,

+  IN EFI_HII_PROTOCOL               *This,

   IN FRAMEWORK_EFI_HII_HANDLE       Handle

   )

 ;

@@ -255,31 +251,31 @@ HiiRemovePack (
 EFI_STATUS

 EFIAPI

 HiiFindHandles (

-  IN     EFI_HII_PROTOCOL    *This,

-  IN OUT UINT16              *HandleBufferLength,

-  OUT    FRAMEWORK_EFI_HII_HANDLE       *Handle

+  IN     EFI_HII_PROTOCOL           *This,

+  IN OUT UINT16                     *HandleBufferLength,

+  OUT    FRAMEWORK_EFI_HII_HANDLE   *Handle

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiExportDatabase (

-  IN     EFI_HII_PROTOCOL *This,

-  IN     FRAMEWORK_EFI_HII_HANDLE    Handle,

-  IN OUT UINTN            *BufferSize,

-  OUT    VOID             *Buffer

+  IN     EFI_HII_PROTOCOL           *This,

+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,

+  IN OUT UINTN                      *BufferSize,

+  OUT    VOID                       *Buffer

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetGlyph (

-  IN     EFI_HII_PROTOCOL    *This,

-  IN     CHAR16              *Source,

-  IN OUT UINT16              *Index,

-  OUT    UINT8               **GlyphBuffer,

-  OUT    UINT16              *BitWidth,

-  IN OUT UINT32              *InternalStatus

+  IN     EFI_HII_PROTOCOL           *This,

+  IN     CHAR16                     *Source,

+  IN OUT UINT16                     *Index,

+  OUT    UINT8                      **GlyphBuffer,

+  OUT    UINT16                     *BitWidth,

+  IN OUT UINT32                     *InternalStatus

   )

 ;

 

@@ -311,130 +307,122 @@ HiiNewString (
 EFI_STATUS

 EFIAPI

 HiiGetString (

-  IN     EFI_HII_PROTOCOL    *This,

-  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,

-  IN     STRING_REF          Token,

-  IN     BOOLEAN             Raw,

-  IN     CHAR16              *LanguageString,

-  IN OUT UINTN               *BufferLength,

-  OUT    EFI_STRING          StringBuffer

+  IN     EFI_HII_PROTOCOL           *This,

+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,

+  IN     STRING_REF                 Token,

+  IN     BOOLEAN                    Raw,

+  IN     CHAR16                     *LanguageString,

+  IN OUT UINTN                      *BufferLength,

+  OUT    EFI_STRING                 StringBuffer

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiResetStrings (

-  IN     EFI_HII_PROTOCOL    *This,

-  IN     FRAMEWORK_EFI_HII_HANDLE       Handle

+  IN     EFI_HII_PROTOCOL           *This,

+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiTestString (

-  IN     EFI_HII_PROTOCOL    *This,

-  IN     CHAR16              *StringToTest,

-  IN OUT UINT32              *FirstMissing,

-  OUT    UINT32              *GlyphBufferSize

+  IN     EFI_HII_PROTOCOL           *This,

+  IN     CHAR16                     *StringToTest,

+  IN OUT UINT32                     *FirstMissing,

+  OUT    UINT32                     *GlyphBufferSize

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetPrimaryLanguages (

-  IN  EFI_HII_PROTOCOL      *This,

-  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,

-  OUT EFI_STRING            *LanguageString

+  IN  EFI_HII_PROTOCOL              *This,

+  IN  FRAMEWORK_EFI_HII_HANDLE      Handle,

+  OUT EFI_STRING                    *LanguageString

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetSecondaryLanguages (

-  IN  EFI_HII_PROTOCOL      *This,

-  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,

-  IN  CHAR16                *PrimaryLanguage,

-  OUT EFI_STRING            *LanguageString

+  IN  EFI_HII_PROTOCOL                *This,

+  IN  FRAMEWORK_EFI_HII_HANDLE        Handle,

+  IN  CHAR16                          *PrimaryLanguage,

+  OUT EFI_STRING                      *LanguageString

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetLine (

-  IN     EFI_HII_PROTOCOL    *This,

+  IN     EFI_HII_PROTOCOL               *This,

   IN     FRAMEWORK_EFI_HII_HANDLE       Handle,

-  IN     STRING_REF          Token,

-  IN OUT UINT16              *Index,

-  IN     UINT16              LineWidth,

-  IN     CHAR16              *LanguageString,

-  IN OUT UINT16              *BufferLength,

-  OUT    EFI_STRING          StringBuffer

+  IN     STRING_REF                     Token,

+  IN OUT UINT16                         *Index,

+  IN     UINT16                         LineWidth,

+  IN     CHAR16                         *LanguageString,

+  IN OUT UINT16                         *BufferLength,

+  OUT    EFI_STRING                     StringBuffer

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetForms (

-  IN     EFI_HII_PROTOCOL    *This,

+  IN     EFI_HII_PROTOCOL               *This,

   IN     FRAMEWORK_EFI_HII_HANDLE       Handle,

-  IN     EFI_FORM_ID         FormId,

-  IN OUT UINTN               *BufferLength,

-  OUT    UINT8               *Buffer

+  IN     EFI_FORM_ID                    FormId,

+  IN OUT UINTN                          *BufferLength,

+  OUT    UINT8                          *Buffer

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetDefaultImage (

-  IN     EFI_HII_PROTOCOL           *This,

-  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,

-  IN     UINTN                      DefaultMask,

-  OUT    EFI_HII_VARIABLE_PACK_LIST **VariablePackList

+  IN     EFI_HII_PROTOCOL               *This,

+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,

+  IN     UINTN                          DefaultMask,

+  OUT    EFI_HII_VARIABLE_PACK_LIST     **VariablePackList

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiUpdateForm (

-  IN EFI_HII_PROTOCOL       *This,

-  IN FRAMEWORK_EFI_HII_HANDLE          Handle,

-  IN EFI_FORM_LABEL         Label,

-  IN BOOLEAN                AddData,

-  IN FRAMEWORK_EFI_HII_UPDATE_DATA    *Data

+  IN EFI_HII_PROTOCOL                   *This,

+  IN FRAMEWORK_EFI_HII_HANDLE           Handle,

+  IN EFI_FORM_LABEL                     Label,

+  IN BOOLEAN                            AddData,

+  IN FRAMEWORK_EFI_HII_UPDATE_DATA      *Data

   )

 ;

 

 EFI_STATUS

 EFIAPI

 HiiGetKeyboardLayout (

-  IN     EFI_HII_PROTOCOL    *This,

-  OUT    UINT16              *DescriptorCount,

-  OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR  *Descriptor

+  IN     EFI_HII_PROTOCOL               *This,

+  OUT    UINT16                         *DescriptorCount,

+  OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR   *Descriptor

   )

 ;

 

 EFI_STATUS

-HiiCompareLanguage (

-  IN  CHAR16                *LanguageStringLocation,

-  IN  CHAR16                *Language

-  )

-;

-

-

-

-EFI_STATUS

 EFIAPI 

 ThunkSendForm (

   IN  EFI_FORM_BROWSER_PROTOCOL       *This,

   IN  BOOLEAN                         UseDatabase,

   IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,

   IN  UINTN                           HandleCount,

-  IN  FRAMEWORK_EFI_IFR_PACKET                  *Packet, OPTIONAL

+  IN  FRAMEWORK_EFI_IFR_PACKET        *Packet, OPTIONAL

   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL

   IN  UINT8                           *NvMapOverride, OPTIONAL

-  IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR            *ScreenDimensions, OPTIONAL

+  IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL

   OUT BOOLEAN                         *ResetRequired OPTIONAL

-  );

+  )

+;

 

 EFI_STATUS

 EFIAPI 

@@ -446,7 +434,8 @@ ThunkCreatePopUp (
   OUT EFI_INPUT_KEY                   *KeyValue,

   IN  CHAR16                          *String,

   ...

-  );

+  )

+;

 

 EFI_STATUS

 EFIAPI

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
index 78eae0f1e0..522b05c675 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
@@ -1,5 +1,5 @@
 /**@file

-  Framework HII handle database allocation and deallocation functins.

+  This file is for functins related to assign and free Framework HII handle number.

   

 Copyright (c) 2008, Intel Corporation

 All rights reserved. This program and the accompanying materials

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
index 4697996223..78612795b5 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
@@ -1,6 +1,5 @@
 /**@file

-

-  This file contains utility functions by HII Thunk Modules.

+  This file is for functins related to assign and free Framework HII handle number.

   

 Copyright (c) 2006 - 2008, Intel Corporation

 All rights reserved. This program and the accompanying materials

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
index cf43572ab7..6359c8e680 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
@@ -717,7 +717,7 @@ typedef struct {
 

 EFI_STATUS

 F2UCreateNumericOpCode (

-  IN       HII_THUNK_CONTEXT               *ThunkContext,

+  IN       HII_THUNK_CONTEXT           *ThunkContext,

   IN       UINT16                      VarStoreId,

   IN CONST FRAMEWORK_EFI_IFR_NUMERIC   *FwOpcode,

   OUT      EFI_HII_UPDATE_DATA         *UefiData

@@ -755,10 +755,7 @@ F2UCreateNumericOpCode (
   UOpcode.Question.Header.Help = FwOpcode->Help;

 

   UOpcode.Question.QuestionId    = FwOpcode->Key;

-  //

-  // BUGBUG RESERVED_VARSTORE_ID should be passed in.

-  //

-  UOpcode.Question.VarStoreId    = RESERVED_VARSTORE_ID;

+  UOpcode.Question.VarStoreId    = VarStoreId;

   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;

 

   UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index 37d2f57931..a867689252 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -43,7 +43,7 @@ GetPackageCount (
   

   for (Index = 0; Index < Packages->NumberOfPackages; Index++) {

     //

-    // BugBug: The current UEFI HII build tool generate a binary in the format defined in: 

+    // The current UEFI HII build tool generate a binary in the format defined by 

     // TIANO_AUTOGEN_PACKAGES_HEADER. We assume that all packages generated in

     // this binary is with same package type. So the returned IfrPackageCount and StringPackageCount

     // may not be the exact number of valid package number in the binary generated 

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
index 750df86491..5e391127cf 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
@@ -37,7 +37,7 @@ ThunkSendForm (
 

   if (!UseDatabase) {

     //

-    // Packet, CallbackHandle.

+    // ThunkSendForm only support displays forms registered into the HII database.

     //

     return EFI_UNSUPPORTED;

   }

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
index 9a38060522..9e2df6fc62 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
@@ -132,10 +132,6 @@ Returns:
   BOOLEAN                                   Found;

   CHAR8                                     *Rfc3066AsciiLanguage;

 

-  //

-  // BugBug: Conver the language to 3066.

-  //

-

   LastStringId      = (EFI_STRING_ID) 0;

   StringId          = (EFI_STRING_ID) 0;

   Found             = FALSE;

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index 12dd3be0b1..23c784b0b9 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -26,6 +26,7 @@
 

 #include "UefiIfrParser.h"

 #include "UefiIfrDefault.h"

+#include "HiiDatabase.h"

 

 //

 // Extern Variables

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
index ec061730e8..9bb4063b60 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
@@ -15,16 +15,6 @@
 #ifndef _HII_THUNK_UEFI_IFR_DEFAULT_

 #define _HII_THUNK_UEFI_IFR_DEFAULT_

 

-//

-// VARSTORE ID of 0 for Buffer Storage Type Storage is reserved in UEFI IFR form. But VARSTORE ID

-// 0 in Framework IFR is the default VarStore ID for storage without explicit declaration. So we have

-// to reseved 0x0001 in UEFI VARSTORE ID to represetn default storage id in Framework IFR.

-// Framework VFR has to be ported or pre-processed to change the default VARSTORE to a VARSTORE

-// with ID equal to 0x0001.

-//

-#define RESERVED_VARSTORE_ID 0x0001

-#define RESERVED_QUESTION_ID 0xf000

-

 #define UEFI_IFR_BUFFER_STORAGE_NODE_FROM_LIST(a) CR(a, UEFI_IFR_BUFFER_STORAGE_NODE, List, UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE)

 #define UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE  EFI_SIGNATURE_32 ('I', 'b', 'S', 'n')

 typedef struct {