diff options
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c | 8 | ||||
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c index 3efda6703a..a96ca84272 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c @@ -343,11 +343,11 @@ CallFormCallBack ( }
*Data = AllocateZeroPool (*DataSize);
- if (Data == NULL) {
+ if (*Data == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- FwFormCallBack->NvRead (
+ Status = FwFormCallBack->NvRead (
FwFormCallBack,
BufferStorage->Name,
&BufferStorage->Guid,
@@ -403,7 +403,7 @@ GetUefiVariable ( }
*Data = AllocateZeroPool (*DataSize);
- if (Data == NULL) {
+ if (*Data == NULL) {
return EFI_OUT_OF_RESOURCES;
}
@@ -611,7 +611,7 @@ ThunkRouteConfig ( if (EFI_ERROR (Status)) {
goto Done;
}
-
+
if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {
if (ConfigAccess->FormCallbackProtocol == NULL ||
ConfigAccess->FormCallbackProtocol->NvWrite == NULL) {
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c index f05bf0c3fa..9e4679cb9e 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c @@ -665,19 +665,7 @@ GetFormsetDefaultVarstoreId ( if (FormSet->DefaultVarStoreId == 0) {
DEBUG ((EFI_D_INFO, "FormSet %g: No Varstore Found\n", &FormSet->Guid));
- } else {
- // The name of default VARSTORE with a Explicit declaration statement will be updated to L"Setup" to make sure
- // the Framework HII Setup module will run correctly. Framework HII Setup module always assumed that default
- // VARSTORE to have L"Setup" as name, Formset GUID as GUID.
-
- DEBUG ((EFI_D_INFO, "FormSet %g: Default Varstore ID (0x%x) N(%s) G(%g)\n", &FormSet->Guid, FormSet->DefaultVarStoreId, DefaultStorage->Name, &DefaultStorage->Guid));
-
- if (StrCmp (DefaultStorage->Name, FrameworkReservedVarstoreName) != 0) {
- DEBUG ((EFI_D_INFO, " : Name is updated from %s to %s.\n", DefaultStorage->Name, FrameworkReservedVarstoreName));
- FormSet->OriginalDefaultVarStoreName = DefaultStorage->Name;
- DefaultStorage->Name = AllocateCopyPool (StrSize (FrameworkReservedVarstoreName), FrameworkReservedVarstoreName);
- }
- }
+ }
return;
}
|