1) Add in code to sync Browser Data with the NvMapOverride that may be updated by Framework Callback.

2) Convert lang code to RFC3066 format in Framework HII's GetSring and NewString 
3) Make sure the default ThunkExtractConfig is able to save the data even if it is not present initially.
4) Enable Framework HII's HiiGetGlyph and HiiGlyphToBlt.

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

1 files changed, 14 insertions, 11 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
index 8776385375..cf43572ab7 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
@@ -351,7 +351,9 @@ F2UCreateOneOfOpCode (
 

   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;

   UOpcode.Question.Header.Help = FwOpcode->Help;

- 

+  UOpcode.Question.VarStoreId  = VarStoreId;

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

+  

   //

   // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode

   //

@@ -386,18 +388,18 @@ F2UCreateOneOfOpCode (
         }

 

         InsertTailList (&ThunkContext->OneOfOptionMapListHead, &OneOfOptionMap->Link);

-      } else {      

-        OneOfOptionMapEntry = AllocateZeroPool (sizeof (ONE_OF_OPTION_MAP_ENTRY));

-        ASSERT (OneOfOptionMapEntry != NULL);

+      }

+      

+      OneOfOptionMapEntry = AllocateZeroPool (sizeof (ONE_OF_OPTION_MAP_ENTRY));

+      ASSERT (OneOfOptionMapEntry != NULL);

 

-        OneOfOptionMapEntry->FwKey = FwOneOfOp->Key;

-        OneOfOptionMapEntry->Signature = ONE_OF_OPTION_MAP_ENTRY_SIGNATURE;

-        

-        CopyMem (&OneOfOptionMapEntry->Value, &FwOneOfOp->Value, FwOpcode->Width);

+      OneOfOptionMapEntry->FwKey = FwOneOfOp->Key;

+      OneOfOptionMapEntry->Signature = ONE_OF_OPTION_MAP_ENTRY_SIGNATURE;

+      

+      CopyMem (&OneOfOptionMapEntry->Value, &FwOneOfOp->Value, FwOpcode->Width);

 

-        ASSERT (OneOfOptionMap != NULL);

-        InsertTailList (&OneOfOptionMap->OneOfOptionMapEntryListHead, &OneOfOptionMapEntry->Link);

-      }

+      ASSERT (OneOfOptionMap != NULL);

+      InsertTailList (&OneOfOptionMap->OneOfOptionMapEntryListHead, &OneOfOptionMapEntry->Link);

     }

 

     if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) {

@@ -499,6 +501,7 @@ F2UCreateOrderedListOpCode (
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;

   UOpcode.Question.Header.Help = FwOpcode->Help;

   UOpcode.Question.VarStoreId  = VarStoreId;

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

 

   UOpcode.MaxContainers = FwOpcode->MaxEntries;