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

MdeModulePkg SetupBrowserDxe: Save global variable values before nest function called. 

The SendForm function can be called nest in it. This function also uses some global variables. So we must save global variable values before it been called again.

Checked in the missing change for gBrowserFormSetList.

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@18681 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2015-10-27 07:37:56 +00:00 committed by ydong10
parent c00a0c8761
commit b6f6125526
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5541,8 +5541,9 @@ SaveBrowserContext (
VOID
)
{
BROWSER_CONTEXT *Context;
FORM_ENTRY_INFO *MenuList;
BROWSER_CONTEXT *Context;
FORM_ENTRY_INFO *MenuList;
FORM_BROWSER_FORMSET *FormSet;
gBrowserContextCount++;
if (gBrowserContextCount == 1) {
@ -5584,6 +5585,17 @@ SaveBrowserContext (
InsertTailList(&Context->FormHistoryList, &MenuList->Link);
}
//
// Save formset list.
//
InitializeListHead(&Context->FormSetList);
while (!IsListEmpty (&gBrowserFormSetList)) {
FormSet = FORM_BROWSER_FORMSET_FROM_LINK (gBrowserFormSetList.ForwardLink);
RemoveEntryList (&FormSet->Link);
InsertTailList(&Context->FormSetList, &FormSet->Link);
}
//
// Insert to FormBrowser context list
//
@ -5602,7 +5614,8 @@ RestoreBrowserContext (
{
LIST_ENTRY *Link;
BROWSER_CONTEXT *Context;
FORM_ENTRY_INFO *MenuList;
FORM_ENTRY_INFO *MenuList;
FORM_BROWSER_FORMSET *FormSet;
ASSERT (gBrowserContextCount != 0);
gBrowserContextCount--;
@ -5644,6 +5657,16 @@ RestoreBrowserContext (
InsertTailList(&mPrivateData.FormBrowserEx2.FormViewHistoryHead, &MenuList->Link);
}
//
// Restore the Formset data.
//
while (!IsListEmpty (&Context->FormSetList)) {
FormSet = FORM_BROWSER_FORMSET_FROM_LINK (Context->FormSetList.ForwardLink);
RemoveEntryList (&FormSet->Link);
InsertTailList(&gBrowserFormSetList, &FormSet->Link);
}
//
// Remove from FormBrowser context list
//

3
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
View File

@ -542,7 +542,8 @@ typedef struct {
EFI_QUESTION_ID CurFakeQestId;
BOOLEAN HiiPackageListUpdated;
BOOLEAN FinishRetrieveCall;
LIST_ENTRY FormHistoryList;
LIST_ENTRY FormHistoryList;
LIST_ENTRY FormSetList;
} BROWSER_CONTEXT;
#define BROWSER_CONTEXT_FROM_LINK(a) CR (a, BROWSER_CONTEXT, Link, BROWSER_CONTEXT_SIGNATURE)