tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the auto conversion for the first varstore name to "Setup". 

And fix a bug that return status is not set.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8949 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2009-07-15 06:57:39 +00:00
parent 6bfa178cca
commit e0e51f622a
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
View File

@ -343,11 +343,11 @@ CallFormCallBack (
} }
*Data = AllocateZeroPool (*DataSize); *Data = AllocateZeroPool (*DataSize);
if (Data == NULL) { if (*Data == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
FwFormCallBack->NvRead ( Status = FwFormCallBack->NvRead (
FwFormCallBack, FwFormCallBack,
BufferStorage->Name, BufferStorage->Name,
&BufferStorage->Guid, &BufferStorage->Guid,
@ -403,7 +403,7 @@ GetUefiVariable (
} }
*Data = AllocateZeroPool (*DataSize); *Data = AllocateZeroPool (*DataSize);
if (Data == NULL) { if (*Data == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
@ -611,7 +611,7 @@ ThunkRouteConfig (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto Done;
} }
if (ConfigAccess->ThunkContext->NvMapOverride == NULL) { if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {
if (ConfigAccess->FormCallbackProtocol == NULL || if (ConfigAccess->FormCallbackProtocol == NULL ||
ConfigAccess->FormCallbackProtocol->NvWrite == NULL) { ConfigAccess->FormCallbackProtocol->NvWrite == NULL) {

14
EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
View File

@ -665,19 +665,7 @@ GetFormsetDefaultVarstoreId (
if (FormSet->DefaultVarStoreId == 0) { if (FormSet->DefaultVarStoreId == 0) {
DEBUG ((EFI_D_INFO, "FormSet %g: No Varstore Found\n", &FormSet->Guid)); 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; return;
} }