Save the type of OneOf question.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 98582e8c43e290caebd124d072375b232bf89454..638d8352863cb02d9a56596cc11c82a1aade645e 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -328,6 +328,13 @@ CreateQuestionIdMap (
   ONE_OF_OPTION_MAP_ENTRY       *OneOfOptionMapEntry;\r
   EFI_IFR_GUID_CLASS            *Class;\r
   EFI_IFR_GUID_SUBCLASS         *SubClass;\r
+  UINT8                         OneOfType;\r
+  EFI_IFR_ONE_OF                *OneOfOpcode;\r
+\r
+  //\r
+  // Set to a invalid value.\r
+  //\r
+  OneOfType = (UINT8) -1;\r
   \r
 \r
   Status = HiiLibExportPackageLists (ThunkContext->UefiHiiHandle, &List, &Size);\r
@@ -402,6 +409,11 @@ CreateQuestionIdMap (
             InsertTailList (QuestionIdMapEntryListHead, &IdMapEntry->Link);\r
           }\r
 \r
+          if (OpCode->OpCode == EFI_IFR_ONE_OF_OP) {\r
+            OneOfOpcode = (EFI_IFR_ONE_OF *) OpCode;\r
+            OneOfType   = OneOfOpcode->Flags & EFI_IFR_NUMERIC_SIZE;\r
+          }\r
+\r
           break;\r
        \r
         case EFI_IFR_GUID_OP:\r
@@ -415,7 +427,12 @@ CreateQuestionIdMap (
 \r
                 OneOfOptionMap->Signature = ONE_OF_OPTION_MAP_SIGNATURE;\r
                 OneOfOptionMap->QuestionId = OptionMap->QuestionId;\r
-                OneOfOptionMap->ValueType = EFI_IFR_TYPE_NUM_SIZE_8;\r
+\r
+                //\r
+                // Make sure OneOfType is initialized.\r
+                //\r
+                ASSERT (OneOfType != (UINT8) -1);\r
+                OneOfOptionMap->ValueType = OneOfType;\r
                 InitializeListHead (&OneOfOptionMap->OneOfOptionMapEntryListHead);\r
                 OneOfOptinMapEntryListHead = &OneOfOptionMap->OneOfOptionMapEntryListHead;\r
                 InsertTailList (&ThunkContext->OneOfOptionMapListHead, &OneOfOptionMap->Link);\r