1 files changed, 32 insertions, 2 deletions

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index d21a6cd..34b6d94 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -164,6 +164,8 @@ typedef struct {
   UINTN            Signature;

   LIST_ENTRY       Link;

 

+  LIST_ENTRY       SaveFailLink;

+

   UINT16           VarStoreId;

 

   BROWSER_STORAGE  *BrowserStorage;

@@ -174,6 +176,7 @@ typedef struct {
 } FORMSET_STORAGE;

 

 #define FORMSET_STORAGE_FROM_LINK(a)  CR (a, FORMSET_STORAGE, Link, FORMSET_STORAGE_SIGNATURE)

+#define FORMSET_STORAGE_FROM_SAVE_FAIL_LINK(a)  CR (a, FORMSET_STORAGE, SaveFailLink, FORMSET_STORAGE_SIGNATURE)

 

 typedef union {

   EFI_STRING_ID         VarName;

@@ -373,6 +376,8 @@ typedef struct {
   UINTN                 Signature;

   LIST_ENTRY            Link;

 

+  LIST_ENTRY            SaveFailLink;

+

   CHAR16                *ConfigRequest; // <ConfigRequest> = <ConfigHdr> + <RequestElement>

   UINTN                 ElementCount;   // Number of <RequestElement> in the <ConfigRequest>  

   UINTN                 SpareStrLen;

@@ -380,6 +385,7 @@ typedef struct {
   BROWSER_STORAGE       *Storage;

 } FORM_BROWSER_CONFIG_REQUEST;

 #define FORM_BROWSER_CONFIG_REQUEST_FROM_LINK(a)  CR (a, FORM_BROWSER_CONFIG_REQUEST, Link, FORM_BROWSER_CONFIG_REQUEST_SIGNATURE)

+#define FORM_BROWSER_CONFIG_REQUEST_FROM_SAVE_FAIL_LINK(a)  CR (a, FORM_BROWSER_CONFIG_REQUEST, SaveFailLink, FORM_BROWSER_CONFIG_REQUEST_SIGNATURE)

 

 #define FORM_BROWSER_FORM_SIGNATURE  SIGNATURE_32 ('F', 'F', 'R', 'M')

 #define STANDARD_MAP_FORM_TYPE 0x01

@@ -397,6 +403,7 @@ typedef struct {
   BOOLEAN              ModalForm;            // Whether this is a modal form.

   BOOLEAN              Locked;               // Whether this form is locked.

 

+  LIST_ENTRY           FormViewListHead;     // List of type FORMID_INFO is Browser View Form History List.

   LIST_ENTRY           ExpressionListHead;   // List of Expressions (FORM_EXPRESSION)

   LIST_ENTRY           StatementListHead;    // List of Statements and Questions (FORM_BROWSER_STATEMENT)

   LIST_ENTRY           ConfigRequestHead;    // List of configreques for all storage.

@@ -422,6 +429,8 @@ typedef struct {
 typedef struct {

   UINTN                           Signature;

   LIST_ENTRY                      Link;

+  LIST_ENTRY                      SaveFailLink;

+

   EFI_HII_HANDLE                  HiiHandle;      // unique id for formset.

   EFI_HANDLE                      DriverHandle;

   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;

@@ -442,15 +451,20 @@ typedef struct {
 

   FORM_BROWSER_STATEMENT          *StatementBuffer;     // Buffer for all Statements and Questions

   EXPRESSION_OPCODE               *ExpressionBuffer;    // Buffer for all Expression OpCode

+  FORM_BROWSER_FORM               *SaveFailForm;        // The form which failed to save.

+  FORM_BROWSER_STATEMENT          *SaveFailStatement;   // The Statement which failed to save.

 

   LIST_ENTRY                      StatementListOSF;     // Statement list out side of the form.

   LIST_ENTRY                      StorageListHead;      // Storage list (FORMSET_STORAGE)

+  LIST_ENTRY                      SaveFailStorageListHead; // Storage list for the save fail storage.

   LIST_ENTRY                      DefaultStoreListHead; // DefaultStore list (FORMSET_DEFAULTSTORE)

   LIST_ENTRY                      FormListHead;         // Form list (FORM_BROWSER_FORM)

   LIST_ENTRY                      ExpressionListHead;   // List of Expressions (FORM_EXPRESSION)

 } FORM_BROWSER_FORMSET;

 #define FORM_BROWSER_FORMSET_FROM_LINK(a)  CR (a, FORM_BROWSER_FORMSET, Link, FORM_BROWSER_FORMSET_SIGNATURE)

 

+#define FORM_BROWSER_FORMSET_FROM_SAVE_FAIL_LINK(a)  CR (a, FORM_BROWSER_FORMSET, SaveFailLink, FORM_BROWSER_FORMSET_SIGNATURE)

+

 typedef struct {

   LIST_ENTRY   Link;

   EFI_EVENT    RefreshEvent;

@@ -534,9 +548,10 @@ typedef enum {
 // Get/set question value from/to.

 //

 typedef enum {

-  GetSetValueWithEditBuffer,       // Get/Set question value from/to editbuffer in the storage.

+  GetSetValueWithEditBuffer = 0,   // Get/Set question value from/to editbuffer in the storage.

   GetSetValueWithBuffer,           // Get/Set question value from/to buffer in the storage.

   GetSetValueWithHiiDriver,        // Get/Set question value from/to hii driver.

+  GetSetValueWithBothBuffer,       // Compare the editbuffer with buffer for this question, not use the question value.

   GetSetValueWithMax               // Invalid value.

 } GET_SET_QUESTION_VALUE_WITH;

 

@@ -1524,6 +1539,19 @@ UiFindParentMenu (
   );

 

 /**

+  Copy current Menu list to the new menu list.

+  

+  @param  NewMenuListHead        New create Menu list.

+  @param  CurrentMenuListHead    Current Menu list.

+

+**/

+VOID

+UiCopyMenuList (

+  OUT LIST_ENTRY   *NewMenuListHead,

+  IN  LIST_ENTRY   *CurrentMenuListHead

+  );

+

+/**

   Search an Option of a Question by its value.

 

   @param  Question               The Question

@@ -1713,13 +1741,15 @@ ValueChangedValidation (
   Pop up the error info.

 

   @param      BrowserStatus    The input browser status.

+  @param      HiiHandle        The HiiHandle for this error opcode.

   @param      OpCode           The opcode use to get the erro info and timeout value.

   @param      ErrorString      Error string used by BROWSER_NO_SUBMIT_IF.

 

 **/

-VOID

+UINT32

 PopupErrorMessage (

   IN UINT32                BrowserStatus,

+  IN EFI_HII_HANDLE        HiiHandle,

   IN EFI_IFR_OP_HEADER     *OpCode, OPTIONAL

   IN CHAR16                *ErrorString

   );