diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-05 01:19:01 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-05 01:19:01 +0000 |
| commit | fed39e580e04db2ffc7683042e9645e12d346371 (patch) | |
| tree | 759992970f6110bcca2da2aa2158f42807f08710 /EdkCompatibilityPkg | |
| parent | fe7fd5780644efb7c076f26d1bb3166f93bfbd4a (diff) | |
| download | edk2-fed39e580e04db2ffc7683042e9645e12d346371.zip edk2-fed39e580e04db2ffc7683042e9645e12d346371.tar.gz edk2-fed39e580e04db2ffc7683042e9645e12d346371.tar.bz2 | |
1) Fix a bug in ASSERT condition.
2) Quit the browser when formset displayed is EFI_FRONT_PAGE_SUBCLASS or EFI_SINGLE_USE_SUBCLASS to comply with the Framework Browser behavior.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5826 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg')
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c | 5 | ||||
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c index b1f3651..0955d7f 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c @@ -997,6 +997,11 @@ ThunkCallback ( //
if (*ActionRequest == EFI_BROWSER_ACTION_REQUEST_NONE && mHiiPackageListUpdated) {
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ } else {
+ if (ConfigAccess->ThunkContext->FormSetSubClass == EFI_FRONT_PAGE_SUBCLASS ||
+ ConfigAccess->ThunkContext->FormSetSubClass == EFI_SINGLE_USE_SUBCLASS) {
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
+ }
}
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c index 522b05c..14affde 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c @@ -61,6 +61,6 @@ FreeHiiHandle ( Num = (UINT16) Handle;
- ASSERT ((mHandle [Num / 8] & (~(1 << (Num % 8)))) != 0);
+ ASSERT ((mHandle [Num / 8] & (1 << (Num % 8))) != 0);
mHandle [Num / 8] &= (~(1 << (Num % 8)));
}
|