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

Refine the fix for the bug that cause assert when do the reconnect in the callback function. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15914 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2014-08-27 03:29:01 +00:00 committed by ydong10
parent d1984abcb9
commit 275ea01efd
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
View File

@ -1985,17 +1985,6 @@ ProcessCallBackFunction (
TypeValue,
&ActionRequest
);
//
// IFR is updated, force to reparse the IFR binary
//
if (mHiiPackageListUpdated) {
if (BackUpBuffer != NULL) {
FreePool (BackUpBuffer);
}
return EFI_SUCCESS;
}
if (!EFI_ERROR (Status)) {
//
// Need to sync the value between Statement->HiiValue->Value and Statement->BufferValue
@ -2412,15 +2401,6 @@ SetupBrowser (
((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) &&
(Statement->Operand != EFI_IFR_PASSWORD_OP)) {
Status = ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);
//
// IFR is updated during callback of EFI_BROWSER_ACTION_CHANGING, force to reparse the IFR binary
//
if (mHiiPackageListUpdated) {
Selection->Action = UI_ACTION_REFRESH_FORMSET;
mHiiPackageListUpdated = FALSE;
break;
}
if (Statement->Operand == EFI_IFR_REF_OP) {
//
// Process dynamic update ref opcode.
@ -2448,14 +2428,6 @@ SetupBrowser (
if (!EFI_ERROR (Status) && Statement->Operand != EFI_IFR_REF_OP) {
ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGED, FALSE);
//
// IFR is updated during callback of EFI_BROWSER_ACTION_CHANGED, force to reparse the IFR binary
//
if (mHiiPackageListUpdated) {
Selection->Action = UI_ACTION_REFRESH_FORMSET;
mHiiPackageListUpdated = FALSE;
break;
}
}
} else {
//

5
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -2449,7 +2449,10 @@ ValidateFormSet (
ASSERT (FormSet != NULL);
Find = ValidateHiiHandle(FormSet->HiiHandle);
if (!Find) {
//
// Should not remove the formset which is being used.
//
if (!Find && (FormSet != gCurrentSelection->FormSet)) {
CleanBrowserStorage(FormSet);
RemoveEntryList (&FormSet->Link);
DestroyFormSet (FormSet);