1) Keep the original Varstore Name when replacing it with L"Setup" to allow Framework...

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index 738020aafe61d6c268ad9441ae79086a777cce5b..6be0496c61240a25e2517c20ce0d095ef43e1694 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -150,13 +150,20 @@ GetStorageFromConfigString (
 {\r
   LIST_ENTRY             *StorageList;\r
   FORMSET_STORAGE        *Storage;\r
+  CHAR16                 *Name;\r
 \r
   StorageList = GetFirstNode (&FormSet->StorageListHead);\r
 \r
   while (!IsNull (&FormSet->StorageListHead, StorageList)) {\r
     Storage = FORMSET_STORAGE_FROM_LINK (StorageList);\r
 \r
-    if (IsConfigHdrMatch (ConfigString, &Storage->Guid, Storage->Name)) {\r
+    if ((Storage->VarStoreId == FormSet->DefaultVarStoreId) && (FormSet->OriginalDefaultVarStoreName != NULL)) {\r
+      Name = FormSet->OriginalDefaultVarStoreName;\r
+    } else {\r
+      Name = Storage->Name;\r
+    }\r
+    \r
+    if (IsConfigHdrMatch (ConfigString, &Storage->Guid, Name)) {\r
       return Storage;\r
     }\r
 \r