1) Use 0xFFEE as the VarId the reason is as follows:

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiToUefiHiiThunk / UefiIfrDefault.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index fa01c3f7dc23c07923c2f61d58243242d9842f47..f33d63cfa4b2ba89c969a3e18a8bfecfc2afc912 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -502,6 +502,7 @@ GetBufferTypeDefaultIdAndStorageId (
   Node->Signature = UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE;\r
   Node->Name      = AllocateCopyPool (StrSize (Storage->Name), Storage->Name);\r
   Node->DefaultId = DefaultStore->DefaultId;\r
+  Node->StoreId   = Storage->VarStoreId;\r
   CopyGuid (&Node->Guid, &Storage->Guid);\r
   Node->Size      = Storage->Size;\r
   Node->Buffer    = AllocateZeroPool (Node->Size);\r
@@ -710,13 +711,14 @@ UefiDefaultsToFrameworkDefaults (
       //\r
       if (Node->StoreId == RESERVED_VARSTORE_ID) {\r
         Pack->VariableId = 0;\r
+      } else {\r
+        Pack->VariableId = Node->StoreId;\r
       }\r
       //\r
       // Initialize EFI_HII_VARIABLE_PACK\r
       //\r
       Pack->Header.Type   = 0;\r
       Pack->Header.Length = Size;\r
-      Pack->VariableId = Node->StoreId;\r
       Pack->VariableNameLength = StrSize (Node->Name);\r
       CopyMem (&Pack->VariableGuid, &Node->Guid, sizeof (EFI_GUID));\r
       \r
@@ -749,9 +751,7 @@ UefiDefaultsToFrameworkDefaults (
                                               a UEFI form set.\r
                                              \r
 \r
-  @retval   EFI_SUCCESS                       Successful.\r
-  @retval   EFI_INVALID_PARAMETER      The default mask is not FRAMEWORK_EFI_IFR_FLAG_DEFAULT or \r
-                                                           FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING.\r
+  @retval   VOID\r
 **/\r
 VOID\r
 FreeDefaultList (\r