From 6307a8b6dc054339db3b3d9733f2ce1a248b483c Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Mon, 30 Dec 2013 06:07:29 +0000 Subject: [PATCH] Rollback the change 15021. Signed-off-by: Eric Dong git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15030 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Library/CustomizedDisplayLib.h | 2 +- .../Library/CustomizedDisplayLib/CustomizedDisplayLib.c | 8 ++++---- MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c | 6 +++--- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 2 -- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h index bb4b2f4e8d..31e1091e88 100644 --- a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h +++ b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h @@ -116,7 +116,7 @@ CreateDialog ( /** Confirm how to handle the changed data. - @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values. + @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values. **/ UINTN EFIAPI diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c index 5b5f37d175..92f3a43a77 100644 --- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c +++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c @@ -543,7 +543,7 @@ CreateDialog ( /** Confirm how to handle the changed data. - @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values. + @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values. **/ UINTN EFIAPI @@ -573,11 +573,11 @@ ConfirmDataChange ( ); if (Key.ScanCode == SCAN_ESC) { - return BROWSER_NO_CHANGES; + return BROWSER_ACTION_NONE; } else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) { - return BROWSER_SAVE_CHANGES; + return BROWSER_ACTION_SUBMIT; } else { - return BROWSER_DISCARD_CHANGES; + return BROWSER_ACTION_DISCARD; } } diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c index 788a63f4e4..f8b1d5067e 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c @@ -1263,15 +1263,15 @@ ProcessChangedData ( RetValue = TRUE; switch (mFormDisplay->ConfirmDataChange()) { - case BROWSER_DISCARD_CHANGES: + case BROWSER_ACTION_DISCARD: DiscardForm (Selection->FormSet, Selection->Form, Scope); break; - case BROWSER_SAVE_CHANGES: + case BROWSER_ACTION_SUBMIT: SubmitForm (Selection->FormSet, Selection->Form, Scope); break; - case BROWSER_NO_CHANGES: + case BROWSER_ACTION_NONE: RetValue = FALSE; break; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index 3671c0ed1c..c7c7f9ae43 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -5062,8 +5062,6 @@ SaveReminder ( } else if (DataSavedAction == BROWSER_DISCARD_CHANGES) { DiscardForm (NULL, NULL, SystemLevel); break; - } else if (DataSavedAction == BROWSER_NO_CHANGES) { - break; } } while (1); -- 2.39.2