Update for NetworkPkg.
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. Signed-off-by: ydong10 Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12867 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -85,18 +85,19 @@ formset
|
||||
label ORDER_ENTRY_LABEL;
|
||||
label LABEL_END;
|
||||
|
||||
goto FORMID_MAIN_FORM,
|
||||
prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text
|
||||
help = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_SAVE_ORDER_CHANGES;
|
||||
|
||||
goto FORMID_MAIN_FORM,
|
||||
prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
|
||||
text
|
||||
help = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_IGNORE_ORDER_CHANGES;
|
||||
|
||||
endform;
|
||||
|
||||
form formid = FORMID_DELETE_FORM,
|
||||
@@ -105,18 +106,19 @@ formset
|
||||
label DELETE_ENTRY_LABEL;
|
||||
label LABEL_END;
|
||||
|
||||
goto FORMID_MAIN_FORM,
|
||||
prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text
|
||||
help = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_SAVE_AND_EXIT),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_SAVE_DELETE_ATTEMPT;
|
||||
|
||||
goto FORMID_MAIN_FORM,
|
||||
prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
|
||||
text
|
||||
help = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
text = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_IGNORE_DELETE_ATTEMPT;
|
||||
|
||||
endform;
|
||||
|
||||
form formid = FORMID_ATTEMPT_FORM,
|
||||
@@ -348,12 +350,13 @@ formset
|
||||
|
||||
subtitle text = STRING_TOKEN(STR_NULL);
|
||||
|
||||
goto FORMID_ATTEMPT_FORM,
|
||||
prompt = STRING_TOKEN (STR_SAVE_CHANGES),
|
||||
help = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_SAVE_ATTEMPT_CONFIG;
|
||||
|
||||
text
|
||||
help = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
|
||||
text = STRING_TOKEN (STR_SAVE_CHANGES),
|
||||
text = STRING_TOKEN (STR_SAVE_CHANGES),
|
||||
flags = INTERACTIVE,
|
||||
key = KEY_SAVE_ATTEMPT_CONFIG;
|
||||
|
||||
goto FORMID_MAIN_FORM,
|
||||
prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
|
||||
help = STRING_TOKEN (STR_RETURN_MAIN_FORM),
|
||||
|
Reference in New Issue
Block a user