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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index b1f365124083a6a52ab3517666c7deb572649bc3..0955d7faff532063a4b6b2a29753db67d419cbcf 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -997,6 +997,11 @@ ThunkCallback (
   //\r
   if (*ActionRequest == EFI_BROWSER_ACTION_REQUEST_NONE && mHiiPackageListUpdated) {\r
     *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+  } else {\r
+    if (ConfigAccess->ThunkContext->FormSetSubClass == EFI_FRONT_PAGE_SUBCLASS ||\r
+        ConfigAccess->ThunkContext->FormSetSubClass == EFI_SINGLE_USE_SUBCLASS) {\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+    }\r
   }\r
 \r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
index 522b05c6751e13ad8e2d9432d0ade96634775a77..14affde83d88a29196c91c02bb3bdc04c39a9940 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
@@ -61,6 +61,6 @@ FreeHiiHandle (
 \r
   Num = (UINT16) Handle;\r
 \r
-  ASSERT ((mHandle [Num / 8] & (~(1 << (Num % 8)))) != 0);\r
+  ASSERT ((mHandle [Num / 8] & (1 << (Num % 8))) != 0);\r
   mHandle [Num / 8] &= (~(1 << (Num % 8)));\r
 }\r