Change RegisterProtocolNotify for dependent protocols to [Depex] expression

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / Utility.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index e74830de56b124c5bce82df42a6d62009d8d7955..3edb806447c959a6b0a708cfd776848f89296253 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -622,12 +622,10 @@ GetFormsetDefaultVarstoreId (
 {\r
   LIST_ENTRY             *StorageList;\r
   FORMSET_STORAGE        *Storage;\r
-  FORMSET_STORAGE        *DefaultStorage;\r
 \r
   //\r
   // VarStoreId 0 is invalid in UEFI IFR.\r
   //\r
-  DefaultStorage= NULL;\r
   FormSet->DefaultVarStoreId = 0;\r
   StorageList = GetFirstNode (&FormSet->StorageListHead);\r
 \r
@@ -641,7 +639,6 @@ GetFormsetDefaultVarstoreId (
       // 1) If VarStore ID of FRAMEWORK_RESERVED_VARSTORE_ID (0x01) is found, Var Store ID is used.\r
       //\r
       FormSet->DefaultVarStoreId = FRAMEWORK_RESERVED_VARSTORE_ID;\r
-      DefaultStorage = Storage;\r
       break;\r
     }\r
 \r
@@ -658,28 +655,13 @@ GetFormsetDefaultVarstoreId (
     if (!IsNull (&FormSet->StorageListHead, StorageList)) {\r
       Storage = FORMSET_STORAGE_FROM_LINK (StorageList);\r
       FormSet->DefaultVarStoreId = Storage->VarStoreId;\r
-      DefaultStorage = Storage;\r
     }\r
     \r
   }\r
 \r
-  DEBUG_CODE_BEGIN ();\r
   if (FormSet->DefaultVarStoreId == 0) {\r
     DEBUG ((EFI_D_INFO, "FormSet %g: No Varstore Found\n", &FormSet->Guid));\r
-  } else {\r
-    //    The name of default VARSTORE with a Explicit declaration statement will be updated to L"Setup" to make sure\r
-    //    the Framework HII Setup module will run correctly. Framework HII Setup module always assumed that default\r
-    //    VARSTORE to have L"Setup" as name, Formset GUID as GUID. \r
-\r
-    DEBUG ((EFI_D_INFO, "FormSet %g: Default Varstore ID (0x%x) N(%s) G(%g)\n", &FormSet->Guid, FormSet->DefaultVarStoreId, DefaultStorage->Name, &DefaultStorage->Guid));\r
-\r
-    if (StrCmp (DefaultStorage->Name, FrameworkReservedVarstoreName) != 0) {\r
-      DEBUG ((EFI_D_INFO, "          : Name is updated from %s to %s.\n", DefaultStorage->Name, FrameworkReservedVarstoreName));\r
-      FormSet->OriginalDefaultVarStoreName = DefaultStorage->Name;\r
-      DefaultStorage->Name = AllocateCopyPool (StrSize (FrameworkReservedVarstoreName), FrameworkReservedVarstoreName);\r
-    }\r
-  }\r
-  DEBUG_CODE_END ();\r
+  } \r
   \r
   return;\r
 }\r
@@ -894,7 +876,10 @@ ParseFormSet (
 \r
   CopyGuid (&FormSetGuid, &gZeroGuid);\r
   Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet);\r
-  ASSERT_EFI_ERROR (Status);\r
+  if (EFI_ERROR (Status)) {\r
+    FreePool (FormSet);\r
+    return NULL;\r
+  }\r
 \r
   return FormSet;\r
 }\r