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

MdeModulePkg/BMMUI: Show "Change Boot/Driver order" page correctly 

When user enter the "Change Boot Order" page, the BootOptionOrder in
BmmFakeNvData may maintain some uncommitted data which are not saved
in "BootOrder" Variable and BootOptionMenu. So we should not always get
the BootOptionOrder through the function GetBootOrder, it will
result in incorrect UI behaviors. When the BootOptionOrder has not been
saved, we should use the BootOptionOrder in current BmmFakeNvData.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Dandan Bi 2016-10-17 14:32:51 +08:00 committed by Star Zeng
parent 7880f73a8e
commit 2c30541a19
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
View File

@ -585,14 +585,30 @@ UpdateOrderPage (
switch (UpdatePageId) {
case FORM_BOOT_CHG_ID:
GetBootOrder (CallbackData);
//
// If the BootOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,
// means all Boot Options has been save in BootOptionMenu, we can get the date from the menu.
// else means browser maintains some uncommitted date which are not saved in BootOptionMenu,
// so we should not get the data from BootOptionMenu to show it.
//
if (CompareMem (CallbackData->BmmFakeNvData.BootOptionOrder, CallbackData->BmmOldFakeNVData.BootOptionOrder, sizeof (CallbackData->BmmFakeNvData.BootOptionOrder)) == 0) {
GetBootOrder (CallbackData);
}
OptionOrder = CallbackData->BmmFakeNvData.BootOptionOrder;
QuestionId = BOOT_OPTION_ORDER_QUESTION_ID;
VarOffset = BOOT_OPTION_ORDER_VAR_OFFSET;
break;
case FORM_DRV_CHG_ID:
GetDriverOrder (CallbackData);
//
// If the DriverOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,
// means all Driver Options has been save in DriverOptionMenu, we can get the DriverOptionOrder from the menu.
// else means browser maintains some uncommitted date which are not saved in DriverOptionMenu,
// so we should not get the data from DriverOptionMenu to show it.
//
if (CompareMem (CallbackData->BmmFakeNvData.DriverOptionOrder, CallbackData->BmmOldFakeNVData.DriverOptionOrder, sizeof (CallbackData->BmmFakeNvData.DriverOptionOrder)) == 0) {
GetDriverOrder (CallbackData);
}
OptionOrder = CallbackData->BmmFakeNvData.DriverOptionOrder;
QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;
VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;