Revision: 16716
http://sourceforge.net/p/edk2/code/16716
Author: vanjeff
Date: 2015-02-03 13:34:52 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
Restore question value for question without storage after CHANGING callback
return error.
(Sync patch r16592 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.d...@intel.com>
Reviewed-by: Liming Gao <liming....@intel.com>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/16592
Modified Paths:
--------------
branches/UDK2014.SP1/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
Modified:
branches/UDK2014.SP1/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
2015-02-03 12:33:10 UTC (rev 16715)
+++ branches/UDK2014.SP1/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
2015-02-03 13:34:52 UTC (rev 16716)
@@ -1,7 +1,7 @@
/** @file
Utility functions for UI presentation.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -2048,8 +2048,15 @@
// According the spec, return fail from call back of "changing" and
// "retrieve", should restore the question's value.
//
- if ((Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED)
||
- Action == EFI_BROWSER_ACTION_RETRIEVE) {
+ if (Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED) {
+ if (Statement->Storage != NULL) {
+ GetQuestionValue(FormSet, Form, Statement,
GetSetValueWithEditBuffer);
+ } else if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) {
+ ProcessCallBackFunction (Selection, FormSet, Form, Question,
EFI_BROWSER_ACTION_RETRIEVE, FALSE);
+ }
+ }
+
+ if (Action == EFI_BROWSER_ACTION_RETRIEVE) {
GetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);
}
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
