From 3a4e7a3e73a40eecbb0a977a0e7421ff5743c353 Mon Sep 17 00:00:00 2001 From: ydong10 Date: Thu, 15 Dec 2011 02:54:49 +0000 Subject: Per UEFI spec, on CallBack action EFI_BROWSER_ACTION_CHANGING, the return value of ActionRequest will be ignored, but on CallBack action EFI_BROWSER_ACTION_CHANGED, the return value of ActionRequest will be used. But, EDKII browser still processes the got ActionRequest. And, all HII drivers in EDKII project also returns their expected ActionRequest value on action EFI_BROWSER_ACTION_CHANGING. Now update the browser to follow the spec, and update all core Hii drivers to keep old working modal. Update for MdeModulePkg. Signed-off-by: ydong10 Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12865 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr | 15 ++++++++------- MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'MdeModulePkg/Universal/Network/Ip4ConfigDxe') diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr index 5b5685db42..c5d74b06df 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr @@ -78,13 +78,14 @@ formset endif; subtitle text = STRING_TOKEN(STR_NULL); - - goto FORMID_DEVICE_FORM, - prompt = STRING_TOKEN (STR_SAVE_CHANGES), - help = STRING_TOKEN (STR_SAVE_CHANGES), - flags = INTERACTIVE, - key = KEY_SAVE_CHANGES; - + + text + help = STRING_TOKEN(STR_SAVE_CHANGES), + text = STRING_TOKEN(STR_SAVE_CHANGES), + text = STRING_TOKEN(STR_SAVE_CHANGES), + flags = INTERACTIVE, + key = KEY_SAVE_CHANGES; + endform; endformset; diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c index 59e5127b44..58c4c1a02c 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c @@ -689,7 +689,7 @@ Ip4FormCallback ( EFI_STATUS Status; EFI_INPUT_KEY Key; - if (Action == EFI_BROWSER_ACTION_CHANGING) { + if (Action == EFI_BROWSER_ACTION_CHANGED) { Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This); IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA)); -- cgit v1.2.3