diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-08-13 06:09:22 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-08-13 06:09:22 +0000 |
| commit | c3e02ca5731a17055ac0738398843fd6b271e567 (patch) | |
| tree | ceb9abc27126cf8d08f2bfe94e0bd0dc2c71db19 /IntelFrameworkModulePkg | |
| parent | 62271ed6b89fd193b1429ca5a93bb93e1fd9a577 (diff) | |
| download | edk2-c3e02ca5731a17055ac0738398843fd6b271e567.zip edk2-c3e02ca5731a17055ac0738398843fd6b271e567.tar.gz edk2-c3e02ca5731a17055ac0738398843fd6b271e567.tar.bz2 | |
Fix a bug that when user can't presses F9 to restore the NV Map data into default values.
Setup Browser implementation has a bug to only restore the NV Map data for the first varstore ID.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3622 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c index 127b550..dd56cfb 100644 --- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c +++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c @@ -1441,6 +1441,7 @@ Returns: MENU_REFRESH_ENTRY *OldMenuRefreshEntry;
UI_SCREEN_OPERATION ScreenOperation;
EFI_VARIABLE_DEFINITION *VariableDefinition;
+ EFI_VARIABLE_DEFINITION *UiDefaultVarDef; // Only used in CfUiDefault State
EFI_FORM_CALLBACK_PROTOCOL *FormCallback;
EFI_HII_VARIABLE_PACK_LIST *NvMapListHead;
EFI_HII_VARIABLE_PACK_LIST *NvMapListNode;
@@ -2977,34 +2978,40 @@ Returns: NvMapListNode = NvMapListHead;
while (NULL != NvMapListNode) {
- if (FileFormTags->VariableDefinitions->VariableId == NvMapListNode->VariablePack->VariableId) {
- NvMap = (VOID *) ((CHAR8 *) NvMapListNode->VariablePack + sizeof (EFI_HII_VARIABLE_PACK) + NvMapListNode->VariablePack->VariableNameLength);
- NvMapSize = NvMapListNode->VariablePack->Header.Length - sizeof (EFI_HII_VARIABLE_PACK) - NvMapListNode->VariablePack->VariableNameLength;
- break;
+
+ for (UiDefaultVarDef = FileFormTags->VariableDefinitions;
+ UiDefaultVarDef != NULL;
+ UiDefaultVarDef = UiDefaultVarDef->Next ) {
+
+ if (UiDefaultVarDef->VariableId == NvMapListNode->VariablePack->VariableId) {
+ NvMap = (VOID *) ((CHAR8 *) NvMapListNode->VariablePack + sizeof (EFI_HII_VARIABLE_PACK) + NvMapListNode->VariablePack->VariableNameLength);
+ NvMapSize = NvMapListNode->VariablePack->Header.Length - sizeof (EFI_HII_VARIABLE_PACK) - NvMapListNode->VariablePack->VariableNameLength;
+ //
+ // Free the buffer that was allocated.
+ //
+ FreePool (UiDefaultVarDef->NvRamMap);
+ FreePool (UiDefaultVarDef->FakeNvRamMap);
+
+ //
+ // Allocate, copy the NvRamMap.
+ //
+ UiDefaultVarDef->VariableFakeSize = (UINT16) (UiDefaultVarDef->VariableFakeSize - UiDefaultVarDef->VariableSize);
+ UiDefaultVarDef->VariableSize = (UINT16) NvMapSize;
+ UiDefaultVarDef->VariableFakeSize = (UINT16) (UiDefaultVarDef->VariableFakeSize + UiDefaultVarDef->VariableSize);
+
+ UiDefaultVarDef->NvRamMap = AllocateZeroPool (FileFormTags->VariableDefinitions->VariableSize);
+ ASSERT (UiDefaultVarDef->NvRamMap != NULL);
+
+ UiDefaultVarDef->FakeNvRamMap = AllocateZeroPool (NvMapSize + UiDefaultVarDef->VariableFakeSize);
+ ASSERT (UiDefaultVarDef->FakeNvRamMap != NULL);
+
+ CopyMem (UiDefaultVarDef->NvRamMap, NvMap, NvMapSize);
+ break;
}
+ }
NvMapListNode = NvMapListNode->NextVariablePack;
}
- //
- // Free the buffer that was allocated.
- //
- FreePool (FileFormTags->VariableDefinitions->NvRamMap);
- FreePool (FileFormTags->VariableDefinitions->FakeNvRamMap);
-
- //
- // Allocate, copy the NvRamMap.
- //
- FileFormTags->VariableDefinitions->VariableFakeSize = (UINT16) (FileFormTags->VariableDefinitions->VariableFakeSize - FileFormTags->VariableDefinitions->VariableSize);
- FileFormTags->VariableDefinitions->VariableSize = (UINT16) NvMapSize;
- FileFormTags->VariableDefinitions->VariableFakeSize = (UINT16) (FileFormTags->VariableDefinitions->VariableFakeSize + FileFormTags->VariableDefinitions->VariableSize);
-
- FileFormTags->VariableDefinitions->NvRamMap = AllocateZeroPool (FileFormTags->VariableDefinitions->VariableSize);
- ASSERT (FileFormTags->VariableDefinitions->NvRamMap != NULL);
-
- FileFormTags->VariableDefinitions->FakeNvRamMap = AllocateZeroPool (NvMapSize + FileFormTags->VariableDefinitions->VariableFakeSize);
- ASSERT (FileFormTags->VariableDefinitions->FakeNvRamMap != NULL);
-
- CopyMem (FileFormTags->VariableDefinitions->NvRamMap, NvMap, NvMapSize);
FreePool (NvMapListHead);
}
|