Add exit action when Config_Access_Protocol.CallBack function returns Submit or Reset...

Also update the impact drivers to keep the old behaviors.

Signed-off-by: ydong10
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12365 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9f795b9d8461e50b2a9ad77fc055f5e566ab0578..0a1f7eee37d8a2852abd2d9ce71fbd91dcf80c13 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -889,7 +889,7 @@ IScsiFormCallback (
             BufferSize,\r
             &Private->Current->AuthConfigData\r
             );\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY\r
       break;\r
 \r
     default:\r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index c3886dffaca5343c346548e79bfabe50153e3b18..5a578a421e91687270a5a0a319104903ed0e5de9 100644 (file)
Binary files a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni and b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni differ

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 8abe77f4bb028985c4b93882af0a261824b403b1..6d544f53214d22f3c1552ad8f42225881efd9e25 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -273,7 +273,7 @@ VlanCallback (
       //\r
       // Clear UI data\r
       //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       Configuration->VlanId = 0;\r
       Configuration->Priority = 0;\r
       break;\r
@@ -301,7 +301,7 @@ VlanCallback (
         gBS->ConnectController (PrivateData->ControllerHandle, NULL, NULL, TRUE);\r
       }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       ZeroMem (Configuration->VlanList, MAX_VLAN_NUMBER);\r
       break;\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index bff79570db2da21fb6ffd237fe1ce24b8dc0f90d..2fab5b79c956cd18f5bef5673e5212045f0717ef 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1244,10 +1244,12 @@ ProcessCallBackFunction (
       switch (ActionRequest) {\r
       case EFI_BROWSER_ACTION_REQUEST_RESET:\r
         gResetRequired = TRUE;\r
+        Selection->Action = UI_ACTION_EXIT;\r
         break;\r
 \r
       case EFI_BROWSER_ACTION_REQUEST_SUBMIT:\r
         SubmitFormIsRequired = TRUE;\r
+        Selection->Action = UI_ACTION_EXIT;\r
         break;\r
 \r
       case EFI_BROWSER_ACTION_REQUEST_EXIT:\r