From cd3d9a851ba7fac1b761c02acedb310b65fc2604 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Sep 2011 06:13:52 +0000
Subject: [PATCH] Add exit action when Config_Access_Protocol.CallBack function
 returns Submit or Reset which is follow UEFI spec 2.3.1. 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
---
 .../Universal/Network/IScsiDxe/IScsiConfig.c  |   2 +-
 .../Ip4ConfigDxe/Ip4ConfigDxeStrings.uni      | Bin 2982 -> 3000 bytes
 .../Network/VlanConfigDxe/VlanConfigImpl.c    |   4 ++--
 .../Universal/SetupBrowserDxe/Presentation.c  |   2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9f795b9d84..0a1f7eee37 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -889,7 +889,7 @@ IScsiFormCallback (
             BufferSize,
             &Private->Current->AuthConfigData
             );
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY
       break;
 
     default:
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxeStrings.uni
index c3886dffaca5343c346548e79bfabe50153e3b18..5a578a421e91687270a5a0a319104903ed0e5de9 100644
GIT binary patch
delta 33
ocmZ1`zC(P24!58JLn1>SLkfcegDXP?LncGXWI=ZM$zI$s0Ed?cpa1{>

delta 15
WcmdlXzD#_B4)<gscDczh+%W(s?gW$o

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index 8abe77f4bb..6d544f5321 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -273,7 +273,7 @@ VlanCallback (
       //
       // Clear UI data
       //
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
       Configuration->VlanId = 0;
       Configuration->Priority = 0;
       break;
@@ -301,7 +301,7 @@ VlanCallback (
         gBS->ConnectController (PrivateData->ControllerHandle, NULL, NULL, TRUE);
       }
 
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
       ZeroMem (Configuration->VlanList, MAX_VLAN_NUMBER);
       break;
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index bff79570db..2fab5b79c9 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1244,10 +1244,12 @@ ProcessCallBackFunction (
       switch (ActionRequest) {
       case EFI_BROWSER_ACTION_REQUEST_RESET:
         gResetRequired = TRUE;
+        Selection->Action = UI_ACTION_EXIT;
         break;
 
       case EFI_BROWSER_ACTION_REQUEST_SUBMIT:
         SubmitFormIsRequired = TRUE;
+        Selection->Action = UI_ACTION_EXIT;
         break;
 
       case EFI_BROWSER_ACTION_REQUEST_EXIT:
-- 
2.39.2