X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FSetupBrowserDxe%2FSetup.c;h=ed904161b619dd538b8ce296c83764791da2f225;hb=0a6f8af50ddc87a47e3fa38d7449fcae26ab1f5d;hp=f4081679c633c123a910dd4c337687dd49ecb0b1;hpb=8ca6180f216a0ff558919643a512563f4478fe8d;p=mirror_edk2.git diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index f4081679c6..ed904161b6 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -1,7 +1,7 @@ /** @file Entry and initialization module for the browser. -Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
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 @@ -20,15 +20,25 @@ SETUP_DRIVER_PRIVATE_DATA mPrivateData = { { SendForm, BrowserCallback + }, + { + SetScope, + RegisterHotKey, + RegiserExitHandler, + SaveReminder } }; EFI_HII_DATABASE_PROTOCOL *mHiiDatabase; EFI_HII_STRING_PROTOCOL *mHiiString; EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting; +EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mPathFromText; UINTN gBrowserContextCount = 0; LIST_ENTRY gBrowserContextList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserContextList); +LIST_ENTRY gBrowserFormSetList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserFormSetList); +LIST_ENTRY gBrowserHotKeyList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserHotKeyList); +LIST_ENTRY gBrowserStorageList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserStorageList); BANNER_DATA *gBannerData; EFI_HII_HANDLE gFrontPageHandle; @@ -38,17 +48,21 @@ BOOLEAN gResetRequired; EFI_HII_HANDLE gHiiHandle; UINT16 gDirection; EFI_SCREEN_DESCRIPTOR gScreenDimensions; +BROWSER_SETTING_SCOPE gBrowserSettingScope = FormSetLevel; +BOOLEAN mBrowserScopeFirstSet = TRUE; +EXIT_HANDLER ExitHandlerFunction = NULL; +UINTN gFooterHeight; // // Browser Global Strings // -CHAR16 *gFunctionNineString; -CHAR16 *gFunctionTenString; +CHAR16 *gSaveFailed; +CHAR16 *gDiscardFailed; +CHAR16 *gDefaultFailed; CHAR16 *gEnterString; CHAR16 *gEnterCommitString; CHAR16 *gEnterEscapeString; CHAR16 *gEscapeString; -CHAR16 *gSaveFailed; CHAR16 *gMoveHighlight; CHAR16 *gMakeSelection; CHAR16 *gDecNumericInput; @@ -72,6 +86,7 @@ CHAR16 *gAdjustNumber; CHAR16 *gSaveChanges; CHAR16 *gOptionMismatch; CHAR16 *gFormSuppress; +CHAR16 *gProtocolNotFound; CHAR16 *mUnknownString = L"!"; @@ -84,7 +99,7 @@ EFI_GUID gSetupBrowserGuid = { 0xab368524, 0xb60c, 0x495b, {0xa0, 0x9, 0x12, 0xe8, 0x5b, 0x1a, 0xea, 0x32} }; -FORM_BROWSER_FORMSET *gOldFormSet; +FORM_BROWSER_FORMSET *gOldFormSet = NULL; FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = { // @@ -214,12 +229,33 @@ SendForm ( UI_MENU_SELECTION *Selection; UINTN Index; FORM_BROWSER_FORMSET *FormSet; + LIST_ENTRY *Link; + + // + // Calculate total number of Register HotKeys. + // + Index = 0; + Link = GetFirstNode (&gBrowserHotKeyList); + while (!IsNull (&gBrowserHotKeyList, Link)) { + Link = GetNextNode (&gBrowserHotKeyList, Link); + Index ++; + } + // + // Show three HotKeys help information on one ROW. + // + gFooterHeight = FOOTER_HEIGHT + (Index / 3); + + // + // Clean the history menu list. + // + InitializeListHead (&gMenuList); // // Save globals used by SendForm() // SaveBrowserContext (); + gResetRequired = FALSE; Status = EFI_SUCCESS; ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR)); @@ -254,7 +290,7 @@ SendForm ( SCROLL_ARROW_HEIGHT * 2 + FRONT_PAGE_HEADER_HEIGHT + - FOOTER_HEIGHT + + gFooterHeight + 1 ) ) { @@ -275,8 +311,6 @@ SendForm ( // InitializeBrowserStrings (); - gFunctionKeySetting = DEFAULT_FUNCTION_KEY_SETTING; - // // Ensure we are in Text mode // @@ -290,10 +324,10 @@ SendForm ( if (FormSetGuid != NULL) { CopyMem (&Selection->FormSetGuid, FormSetGuid, sizeof (EFI_GUID)); Selection->FormId = FormId; + } else { + CopyMem (&Selection->FormSetGuid, &gEfiHiiPlatformSetupFormsetGuid, sizeof (EFI_GUID)); } - gOldFormSet = NULL; - do { FormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET)); ASSERT (FormSet != NULL); @@ -301,13 +335,18 @@ SendForm ( // // Initialize internal data structures of FormSet // - Status = InitializeFormSet (Selection->Handle, &Selection->FormSetGuid, FormSet); + Status = InitializeFormSet (Selection->Handle, &Selection->FormSetGuid, FormSet, TRUE); if (EFI_ERROR (Status) || IsListEmpty (&FormSet->FormListHead)) { DestroyFormSet (FormSet); break; } Selection->FormSet = FormSet; + // + // Try to find pre FormSet in the maintain backup list. + // + gOldFormSet = GetFormSetFromHiiHandle (Selection->Handle); + // // Display this formset // @@ -324,7 +363,14 @@ SendForm ( } while (Selection->Action == UI_ACTION_REFRESH_FORMSET); if (gOldFormSet != NULL) { - DestroyFormSet (gOldFormSet); + // + // If no data is changed, don't need to save current FormSet into the maintain list. + // + if (!IsNvUpdateRequired (gOldFormSet)) { + CleanBrowserStorage(gOldFormSet); + RemoveEntryList (&gOldFormSet->Link); + DestroyFormSet (gOldFormSet); + } gOldFormSet = NULL; } @@ -339,6 +385,7 @@ SendForm ( } FreeBrowserStrings (); + UiFreeMenuList(&gMenuList); gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK)); gST->ConOut->ClearScreen (gST->ConOut); @@ -430,8 +477,9 @@ BrowserCallback ( Storage = FORMSET_STORAGE_FROM_LINK (Link); Link = GetNextNode (&FormSet->StorageListHead, Link); - if (CompareGuid (&Storage->Guid, (EFI_GUID *) VariableGuid)) { - if (Storage->Type == EFI_HII_VARSTORE_BUFFER) { + if (CompareGuid (&Storage->BrowserStorage->Guid, (EFI_GUID *) VariableGuid)) { + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER || + Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { // // Buffer storage require both GUID and Name // @@ -439,7 +487,7 @@ BrowserCallback ( return EFI_NOT_FOUND; } - if (StrCmp (Storage->Name, (CHAR16 *) VariableName) != 0) { + if (StrCmp (Storage->BrowserStorage->Name, (CHAR16 *) VariableName) != 0) { continue; } } @@ -469,7 +517,7 @@ BrowserCallback ( // // Generate // - Status = StorageToConfigResp (Storage, &ConfigResp, FALSE); + Status = StorageToConfigResp (Storage->BrowserStorage, &ConfigResp, Storage->ConfigRequest); if (EFI_ERROR (Status)) { return Status; } @@ -477,7 +525,7 @@ BrowserCallback ( // // Skip and '&' to point to // - StrPtr = ConfigResp + StrLen (Storage->ConfigHdr) + 1; + StrPtr = ConfigResp + StrLen (Storage->BrowserStorage->ConfigHdr) + 1; BufferSize = StrSize (StrPtr); if (*ResultsDataSize < BufferSize) { @@ -496,18 +544,18 @@ BrowserCallback ( // Prepare // TmpSize = StrLen (ResultsData); - BufferSize = (TmpSize + StrLen (Storage->ConfigHdr) + 2) * sizeof (CHAR16); + BufferSize = (TmpSize + StrLen (Storage->BrowserStorage->ConfigHdr) + 2) * sizeof (CHAR16); ConfigResp = AllocateZeroPool (BufferSize); ASSERT (ConfigResp != NULL); - StrCpy (ConfigResp, Storage->ConfigHdr); + StrCpy (ConfigResp, Storage->BrowserStorage->ConfigHdr); StrCat (ConfigResp, L"&"); StrCat (ConfigResp, ResultsData); // // Update Browser uncommited data // - Status = ConfigRespToStorage (Storage, ConfigResp); + Status = ConfigRespToStorage (Storage->BrowserStorage, ConfigResp); if (EFI_ERROR (Status)) { return Status; } @@ -516,7 +564,6 @@ BrowserCallback ( return EFI_SUCCESS; } - /** Initialize Setup Browser driver. @@ -535,6 +582,8 @@ InitializeSetup ( ) { EFI_STATUS Status; + EFI_INPUT_KEY DefaultHotKey; + EFI_STRING HelpString; // // Locate required Hii relative protocols @@ -560,6 +609,12 @@ InitializeSetup ( ); ASSERT_EFI_ERROR (Status); + Status = gBS->LocateProtocol ( + &gEfiDevicePathFromTextProtocolGuid, + NULL, + (VOID **) &mPathFromText + ); + // // Publish our HII data // @@ -576,6 +631,13 @@ InitializeSetup ( // gBannerData = AllocateZeroPool (sizeof (BANNER_DATA)); ASSERT (gBannerData != NULL); + + // + // Initialize generic help strings. + // + gSaveFailed = GetToken (STRING_TOKEN (SAVE_FAILED), gHiiHandle); + gDiscardFailed = GetToken (STRING_TOKEN (DISCARD_FAILED), gHiiHandle); + gDefaultFailed = GetToken (STRING_TOKEN (DEFAULT_FAILED), gHiiHandle); // // Install FormBrowser2 protocol @@ -589,6 +651,34 @@ InitializeSetup ( ); ASSERT_EFI_ERROR (Status); + // + // Install default HotKey F10 for Save + // + DefaultHotKey.UnicodeChar = CHAR_NULL; + HelpString = GetToken (STRING_TOKEN (FUNCTION_TEN_STRING), gHiiHandle); + DefaultHotKey.ScanCode = SCAN_F10; + RegisterHotKey (&DefaultHotKey, BROWSER_ACTION_SUBMIT, 0, HelpString); + FreePool (HelpString); + // + // Install default HotKey F9 for Reset To Defaults + // + DefaultHotKey.ScanCode = SCAN_F9; + HelpString = GetToken (STRING_TOKEN (FUNCTION_NINE_STRING), gHiiHandle); + RegisterHotKey (&DefaultHotKey, BROWSER_ACTION_DEFAULT, EFI_HII_DEFAULT_CLASS_STANDARD, HelpString); + FreePool (HelpString); + + // + // Install FormBrowserEx protocol + // + mPrivateData.Handle = NULL; + Status = gBS->InstallProtocolInterface ( + &mPrivateData.Handle, + &gEfiFormBrowserExProtocolGuid, + EFI_NATIVE_INTERFACE, + &mPrivateData.FormBrowserEx + ); + ASSERT_EFI_ERROR (Status); + return Status; } @@ -665,7 +755,7 @@ GetToken ( String = HiiGetString (HiiHandle, Token, NULL); if (String == NULL) { - String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString); + String = AllocateCopyPool (StrSize (mUnknownString), mUnknownString); ASSERT (String != NULL); } return (CHAR16 *) String; @@ -727,14 +817,19 @@ NewStringCat ( /** - Synchronize Storage's Edit copy to Shadow copy. + Synchronize or restore Storage's Edit copy and Shadow copy. - @param Storage The Storage to be synchronized. + @param Storage The Storage to be synchronized. + @param SyncOrRestore Sync the buffer to editbuffer or Restore the + editbuffer to buffer + if TRUE, copy the editbuffer to the buffer. + if FALSE, copy the buffer to the editbuffer. **/ VOID SynchronizeStorage ( - IN FORMSET_STORAGE *Storage + IN BROWSER_STORAGE *Storage, + IN BOOLEAN SyncOrRestore ) { LIST_ENTRY *Link; @@ -742,7 +837,12 @@ SynchronizeStorage ( switch (Storage->Type) { case EFI_HII_VARSTORE_BUFFER: - CopyMem (Storage->Buffer, Storage->EditBuffer, Storage->Size); + case EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER: + if (SyncOrRestore) { + CopyMem (Storage->Buffer, Storage->EditBuffer, Storage->Size); + } else { + CopyMem (Storage->EditBuffer, Storage->Buffer, Storage->Size); + } break; case EFI_HII_VARSTORE_NAME_VALUE: @@ -750,7 +850,11 @@ SynchronizeStorage ( while (!IsNull (&Storage->NameValueListHead, Link)) { Node = NAME_VALUE_NODE_FROM_LINK (Link); - NewStringCpy (&Node->Value, Node->EditValue); + if (SyncOrRestore) { + NewStringCpy (&Node->Value, Node->EditValue); + } else { + NewStringCpy (&Node->EditValue, Node->Value); + } Link = GetNextNode (&Storage->NameValueListHead, Link); } @@ -769,6 +873,7 @@ SynchronizeStorage ( @param Storage The NameValue Storage. @param Name The Name. @param Value The retured Value. + @param GetValueFrom Where to get source value, from EditValue or Value. @retval EFI_SUCCESS Value found for given Name. @retval EFI_NOT_FOUND No such Name found in NameValue storage. @@ -776,14 +881,19 @@ SynchronizeStorage ( **/ EFI_STATUS GetValueByName ( - IN FORMSET_STORAGE *Storage, - IN CHAR16 *Name, - IN OUT CHAR16 **Value + IN BROWSER_STORAGE *Storage, + IN CHAR16 *Name, + IN OUT CHAR16 **Value, + IN GET_SET_QUESTION_VALUE_WITH GetValueFrom ) { LIST_ENTRY *Link; NAME_VALUE_NODE *Node; + if (GetValueFrom != GetSetValueWithEditBuffer && GetValueFrom != GetSetValueWithBuffer) { + return EFI_INVALID_PARAMETER; + } + *Value = NULL; Link = GetFirstNode (&Storage->NameValueListHead); @@ -791,7 +901,11 @@ GetValueByName ( Node = NAME_VALUE_NODE_FROM_LINK (Link); if (StrCmp (Name, Node->Name) == 0) { - NewStringCpy (Value, Node->EditValue); + if (GetValueFrom == GetSetValueWithEditBuffer) { + NewStringCpy (Value, Node->EditValue); + } else { + NewStringCpy (Value, Node->Value); + } return EFI_SUCCESS; } @@ -808,7 +922,7 @@ GetValueByName ( @param Storage The NameValue Storage. @param Name The Name. @param Value The Value to set. - @param Edit Whether update editValue or Value. + @param SetValueTo Whether update editValue or Value. @retval EFI_SUCCESS Value found for given Name. @retval EFI_NOT_FOUND No such Name found in NameValue storage. @@ -816,22 +930,26 @@ GetValueByName ( **/ EFI_STATUS SetValueByName ( - IN FORMSET_STORAGE *Storage, + IN BROWSER_STORAGE *Storage, IN CHAR16 *Name, IN CHAR16 *Value, - IN BOOLEAN Edit + IN GET_SET_QUESTION_VALUE_WITH SetValueTo ) { LIST_ENTRY *Link; NAME_VALUE_NODE *Node; CHAR16 *Buffer; + if (SetValueTo != GetSetValueWithEditBuffer && SetValueTo != GetSetValueWithBuffer) { + return EFI_INVALID_PARAMETER; + } + Link = GetFirstNode (&Storage->NameValueListHead); while (!IsNull (&Storage->NameValueListHead, Link)) { Node = NAME_VALUE_NODE_FROM_LINK (Link); if (StrCmp (Name, Node->Name) == 0) { - if (Edit) { + if (SetValueTo == GetSetValueWithEditBuffer) { Buffer = Node->EditValue; } else { Buffer = Node->Value; @@ -841,7 +959,7 @@ SetValueByName ( } Buffer = AllocateCopyPool (StrSize (Value), Value); ASSERT (Buffer != NULL); - if (Edit) { + if (SetValueTo == GetSetValueWithEditBuffer) { Node->EditValue = Buffer; } else { Node->Value = Buffer; @@ -859,9 +977,9 @@ SetValueByName ( /** Convert setting of Buffer Storage or NameValue Storage to . - @param Buffer The Storage to be conveted. + @param Storage The Storage to be conveted. @param ConfigResp The returned . - @param SingleForm Whether update data for single form or formset level. + @param ConfigRequest The ConfigRequest string. @retval EFI_SUCCESS Convert success. @retval EFI_INVALID_PARAMETER Incorrect storage type. @@ -869,31 +987,21 @@ SetValueByName ( **/ EFI_STATUS StorageToConfigResp ( - IN VOID *Buffer, + IN BROWSER_STORAGE *Storage, IN CHAR16 **ConfigResp, - IN BOOLEAN SingleForm + IN CHAR16 *ConfigRequest ) { - EFI_STATUS Status; - EFI_STRING Progress; + EFI_STATUS Status; + EFI_STRING Progress; LIST_ENTRY *Link; NAME_VALUE_NODE *Node; - CHAR16 *ConfigRequest; - FORMSET_STORAGE *Storage; - FORM_BROWSER_CONFIG_REQUEST *ConfigInfo; Status = EFI_SUCCESS; - if (SingleForm) { - ConfigInfo = (FORM_BROWSER_CONFIG_REQUEST *) Buffer; - Storage = ConfigInfo->Storage; - ConfigRequest = ConfigInfo->ConfigRequest; - } else { - Storage = (FORMSET_STORAGE *) Buffer; - ConfigRequest = Storage->ConfigRequest; - } switch (Storage->Type) { case EFI_HII_VARSTORE_BUFFER: + case EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER: Status = mHiiConfigRouting->BlockToConfig ( mHiiConfigRouting, ConfigRequest, @@ -944,7 +1052,7 @@ StorageToConfigResp ( **/ EFI_STATUS ConfigRespToStorage ( - IN FORMSET_STORAGE *Storage, + IN BROWSER_STORAGE *Storage, IN CHAR16 *ConfigResp ) { @@ -959,6 +1067,7 @@ ConfigRespToStorage ( switch (Storage->Type) { case EFI_HII_VARSTORE_BUFFER: + case EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER: BufferSize = Storage->Size; Status = mHiiConfigRouting->ConfigToBlock ( mHiiConfigRouting, @@ -996,7 +1105,7 @@ ConfigRespToStorage ( if (StrPtr != NULL) { *StrPtr = 0; } - SetValueByName (Storage, Name, Value, TRUE); + SetValueByName (Storage, Name, Value, GetSetValueWithEditBuffer); } break; @@ -1016,8 +1125,7 @@ ConfigRespToStorage ( @param FormSet FormSet data structure. @param Form Form data structure. @param Question Question to be initialized. - @param Cached TRUE: get from Edit copy FALSE: get from original - Storage + @param GetValueFrom Where to get value, may from editbuffer, buffer or hii driver. @retval EFI_SUCCESS The function completed successfully. @@ -1027,7 +1135,7 @@ GetQuestionValue ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, IN OUT FORM_BROWSER_STATEMENT *Question, - IN BOOLEAN Cached + IN GET_SET_QUESTION_VALUE_WITH GetValueFrom ) { EFI_STATUS Status; @@ -1036,7 +1144,7 @@ GetQuestionValue ( UINT8 *Dst; UINTN StorageWidth; EFI_TIME EfiTime; - FORMSET_STORAGE *Storage; + BROWSER_STORAGE *Storage; EFI_IFR_TYPE_VALUE *QuestionValue; CHAR16 *ConfigRequest; CHAR16 *Progress; @@ -1050,8 +1158,15 @@ GetQuestionValue ( BOOLEAN IsString; CHAR16 TemStr[5]; UINT8 DigitUint8; + UINT8 *TemBuffer; Status = EFI_SUCCESS; + Value = NULL; + Result = NULL; + + if (GetValueFrom >= GetSetValueWithMax) { + return EFI_INVALID_PARAMETER; + } // // Statement don't have storage, skip them @@ -1066,7 +1181,19 @@ GetQuestionValue ( if (Question->ValueExpression != NULL) { Status = EvaluateExpression (FormSet, Form, Question->ValueExpression); if (!EFI_ERROR (Status)) { - CopyMem (&Question->HiiValue, &Question->ValueExpression->Result, sizeof (EFI_HII_VALUE)); + if (Question->ValueExpression->Result.Type == EFI_IFR_TYPE_BUFFER) { + ASSERT (Question->HiiValue.Type == EFI_IFR_TYPE_BUFFER && Question->HiiValue.Buffer != NULL); + if (Question->StorageWidth > Question->ValueExpression->Result.BufferLen) { + CopyMem (Question->HiiValue.Buffer, Question->ValueExpression->Result.Buffer, Question->ValueExpression->Result.BufferLen); + Question->HiiValue.BufferLen = Question->ValueExpression->Result.BufferLen; + } else { + CopyMem (Question->HiiValue.Buffer, Question->ValueExpression->Result.Buffer, Question->StorageWidth); + Question->HiiValue.BufferLen = Question->StorageWidth; + } + FreePool (Question->ValueExpression->Result.Buffer); + } + Question->HiiValue.Type = Question->ValueExpression->Result.Type; + CopyMem (&Question->HiiValue.Value, &Question->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE)); } return Status; } @@ -1076,11 +1203,24 @@ GetQuestionValue ( // if (Question->ReadExpression != NULL && Form->FormType == STANDARD_MAP_FORM_TYPE) { Status = EvaluateExpression (FormSet, Form, Question->ReadExpression); - if (!EFI_ERROR (Status) && (Question->ReadExpression->Result.Type < EFI_IFR_TYPE_OTHER)) { + if (!EFI_ERROR (Status) && + ((Question->ReadExpression->Result.Type < EFI_IFR_TYPE_OTHER) || (Question->ReadExpression->Result.Type == EFI_IFR_TYPE_BUFFER))) { // // Only update question value to the valid result. // - CopyMem (&Question->HiiValue, &Question->ReadExpression->Result, sizeof (EFI_HII_VALUE)); + if (Question->ReadExpression->Result.Type == EFI_IFR_TYPE_BUFFER) { + ASSERT (Question->HiiValue.Type == EFI_IFR_TYPE_BUFFER && Question->HiiValue.Buffer != NULL); + if (Question->StorageWidth > Question->ReadExpression->Result.BufferLen) { + CopyMem (Question->HiiValue.Buffer, Question->ReadExpression->Result.Buffer, Question->ReadExpression->Result.BufferLen); + Question->HiiValue.BufferLen = Question->ReadExpression->Result.BufferLen; + } else { + CopyMem (Question->HiiValue.Buffer, Question->ReadExpression->Result.Buffer, Question->StorageWidth); + Question->HiiValue.BufferLen = Question->StorageWidth; + } + FreePool (Question->ReadExpression->Result.Buffer); + } + Question->HiiValue.Type = Question->ReadExpression->Result.Type; + CopyMem (&Question->HiiValue.Value, &Question->ReadExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE)); return EFI_SUCCESS; } } @@ -1172,17 +1312,29 @@ GetQuestionValue ( Dst = (UINT8 *) &Question->HiiValue.Value; } - IsBufferStorage = (BOOLEAN) ((Storage->Type == EFI_HII_VARSTORE_BUFFER) ? TRUE : FALSE); + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || + Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + IsBufferStorage = TRUE; + } else { + IsBufferStorage = FALSE; + } IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ? TRUE : FALSE); - if (Cached) { + if (GetValueFrom == GetSetValueWithEditBuffer || GetValueFrom == GetSetValueWithBuffer ) { if (IsBufferStorage) { - // - // Copy from storage Edit buffer - // - CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, StorageWidth); + if (GetValueFrom == GetSetValueWithEditBuffer) { + // + // Copy from storage Edit buffer + // + CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, StorageWidth); + } else { + // + // Copy from storage Edit buffer + // + CopyMem (Dst, Storage->Buffer + Question->VarStoreInfo.VarOffset, StorageWidth); + } } else { Value = NULL; - Status = GetValueByName (Storage, Question->VariableName, &Value); + Status = GetValueByName (Storage, Question->VariableName, &Value, GetValueFrom); if (EFI_ERROR (Status)) { return Status; } @@ -1230,115 +1382,147 @@ GetQuestionValue ( FreePool (Value); } } else { - // - // Request current settings from Configuration Driver - // - if (FormSet->ConfigAccess == NULL) { - return EFI_NOT_FOUND; - } - - // - // ::= + || - // + "&" + - // - if (IsBufferStorage) { - Length = StrLen (Storage->ConfigHdr); - Length += StrLen (Question->BlockName); - } else { - Length = StrLen (Storage->ConfigHdr); - Length += StrLen (Question->VariableName) + 1; - } - ConfigRequest = AllocateZeroPool ((Length + 1) * sizeof (CHAR16)); - ASSERT (ConfigRequest != NULL); - - StrCpy (ConfigRequest, Storage->ConfigHdr); - if (IsBufferStorage) { - StrCat (ConfigRequest, Question->BlockName); - } else { - StrCat (ConfigRequest, L"&"); - StrCat (ConfigRequest, Question->VariableName); - } - - Status = FormSet->ConfigAccess->ExtractConfig ( - FormSet->ConfigAccess, - ConfigRequest, - &Progress, - &Result - ); - if (EFI_ERROR (Status)) { - return Status; - } + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + // + // Request current settings from Configuration Driver + // + if (FormSet->ConfigAccess == NULL) { + return EFI_NOT_FOUND; + } - // - // Skip - // - Value = Result + Length; - if (IsBufferStorage) { // - // Skip "&VALUE" + // ::= + || + // + "&" + // - Value = Value + 6; - } - if (*Value != '=') { - FreePool (Result); - return EFI_NOT_FOUND; - } - // - // Skip '=', point to value - // - Value = Value + 1; + if (IsBufferStorage) { + Length = StrLen (Storage->ConfigHdr); + Length += StrLen (Question->BlockName); + } else { + Length = StrLen (Storage->ConfigHdr); + Length += StrLen (Question->VariableName) + 1; + } + ConfigRequest = AllocateZeroPool ((Length + 1) * sizeof (CHAR16)); + ASSERT (ConfigRequest != NULL); - // - // Suppress if any - // - StringPtr = Value; - while (*StringPtr != L'\0' && *StringPtr != L'&') { - StringPtr++; - } - *StringPtr = L'\0'; + StrCpy (ConfigRequest, Storage->ConfigHdr); + if (IsBufferStorage) { + StrCat (ConfigRequest, Question->BlockName); + } else { + StrCat (ConfigRequest, L"&"); + StrCat (ConfigRequest, Question->VariableName); + } + + Status = FormSet->ConfigAccess->ExtractConfig ( + FormSet->ConfigAccess, + ConfigRequest, + &Progress, + &Result + ); + FreePool (ConfigRequest); + if (EFI_ERROR (Status)) { + return Status; + } - LengthStr = StrLen (Value); - Status = EFI_SUCCESS; - if (!IsBufferStorage && IsString) { // - // Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD" - // Add string tail char L'\0' into Length + // Skip // - Length = StorageWidth + sizeof (CHAR16); - if (Length < ((LengthStr / 4 + 1) * 2)) { - Status = EFI_BUFFER_TOO_SMALL; - } else { - StringPtr = (CHAR16 *) Dst; - ZeroMem (TemStr, sizeof (TemStr)); - for (Index = 0; Index < LengthStr; Index += 4) { - StrnCpy (TemStr, Value + Index, 4); - StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr); + if (IsBufferStorage) { + Value = StrStr (Result, L"&VALUE"); + if (Value == NULL) { + FreePool (Result); + return EFI_NOT_FOUND; } // - // Add tailing L'\0' character + // Skip "&VALUE" // - StringPtr[Index/4] = L'\0'; + Value = Value + 6; + } else { + Value = Result + Length; } - } else { - if (StorageWidth < ((LengthStr + 1) / 2)) { - Status = EFI_BUFFER_TOO_SMALL; + if (*Value != '=') { + FreePool (Result); + return EFI_NOT_FOUND; + } + // + // Skip '=', point to value + // + Value = Value + 1; + + // + // Suppress if any + // + StringPtr = Value; + while (*StringPtr != L'\0' && *StringPtr != L'&') { + StringPtr++; + } + *StringPtr = L'\0'; + + LengthStr = StrLen (Value); + Status = EFI_SUCCESS; + if (!IsBufferStorage && IsString) { + // + // Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD" + // Add string tail char L'\0' into Length + // + Length = StorageWidth + sizeof (CHAR16); + if (Length < ((LengthStr / 4 + 1) * 2)) { + Status = EFI_BUFFER_TOO_SMALL; + } else { + StringPtr = (CHAR16 *) Dst; + ZeroMem (TemStr, sizeof (TemStr)); + for (Index = 0; Index < LengthStr; Index += 4) { + StrnCpy (TemStr, Value + Index, 4); + StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr); + } + // + // Add tailing L'\0' character + // + StringPtr[Index/4] = L'\0'; + } } else { - ZeroMem (TemStr, sizeof (TemStr)); - for (Index = 0; Index < LengthStr; Index ++) { - TemStr[0] = Value[LengthStr - Index - 1]; - DigitUint8 = (UINT8) StrHexToUint64 (TemStr); - if ((Index & 1) == 0) { - Dst [Index/2] = DigitUint8; - } else { - Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]); + if (StorageWidth < ((LengthStr + 1) / 2)) { + Status = EFI_BUFFER_TOO_SMALL; + } else { + ZeroMem (TemStr, sizeof (TemStr)); + for (Index = 0; Index < LengthStr; Index ++) { + TemStr[0] = Value[LengthStr - Index - 1]; + DigitUint8 = (UINT8) StrHexToUint64 (TemStr); + if ((Index & 1) == 0) { + Dst [Index/2] = DigitUint8; + } else { + Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]); + } } } } - } - if (EFI_ERROR (Status)) { - FreePool (Result); - return Status; + if (EFI_ERROR (Status)) { + FreePool (Result); + return Status; + } + } else if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + TemBuffer = NULL; + TemBuffer = AllocateZeroPool (Storage->Size); + if (TemBuffer == NULL) { + Status = EFI_OUT_OF_RESOURCES; + return Status; + } + Length = Storage->Size; + Status = gRT->GetVariable ( + Storage->Name, + &Storage->Guid, + NULL, + &Length, + TemBuffer + ); + if (EFI_ERROR (Status)) { + FreePool (TemBuffer); + return Status; + } + + CopyMem (Dst, TemBuffer + Question->VarStoreInfo.VarOffset, StorageWidth); + + FreePool (TemBuffer); } // @@ -1347,10 +1531,12 @@ GetQuestionValue ( if (IsBufferStorage) { CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, Dst, StorageWidth); } else { - SetValueByName (Storage, Question->VariableName, Value, TRUE); + SetValueByName (Storage, Question->VariableName, Value, GetSetValueWithEditBuffer); } - FreePool (Result); + if (Result != NULL) { + FreePool (Result); + } } return Status; @@ -1363,8 +1549,7 @@ GetQuestionValue ( @param FormSet FormSet data structure. @param Form Form data structure. @param Question Pointer to the Question. - @param Cached TRUE: set to Edit copy FALSE: set to original - Storage + @param SetValueTo Update the question value to editbuffer , buffer or hii driver. @retval EFI_SUCCESS The function completed successfully. @@ -1374,7 +1559,7 @@ SetQuestionValue ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, IN OUT FORM_BROWSER_STATEMENT *Question, - IN BOOLEAN Cached + IN GET_SET_QUESTION_VALUE_WITH SetValueTo ) { EFI_STATUS Status; @@ -1384,7 +1569,7 @@ SetQuestionValue ( EFI_TIME EfiTime; UINTN BufferLen; UINTN StorageWidth; - FORMSET_STORAGE *Storage; + BROWSER_STORAGE *Storage; EFI_IFR_TYPE_VALUE *QuestionValue; CHAR16 *ConfigResp; CHAR16 *Progress; @@ -1399,6 +1584,10 @@ SetQuestionValue ( Status = EFI_SUCCESS; + if (SetValueTo >= GetSetValueWithMax) { + return EFI_INVALID_PARAMETER; + } + // // Statement don't have storage, skip them // @@ -1507,127 +1696,171 @@ SetQuestionValue ( Src = (UINT8 *) &Question->HiiValue.Value; } - IsBufferStorage = (BOOLEAN) ((Storage->Type == EFI_HII_VARSTORE_BUFFER) ? TRUE : FALSE); - IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ? TRUE : FALSE); - if (IsBufferStorage) { - // - // Copy to storage edit buffer - // - CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth); + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || + Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + IsBufferStorage = TRUE; } else { - if (IsString) { - // - // Allocate enough string buffer. - // - Value = NULL; - BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16); - Value = AllocateZeroPool (BufferLen); - ASSERT (Value != NULL); - // - // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044" - // - TemName = (CHAR16 *) Src; - TemString = Value; - for (; *TemName != L'\0'; TemName++) { - TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4); - } - } else { - BufferLen = StorageWidth * 2 + 1; - Value = AllocateZeroPool (BufferLen * sizeof (CHAR16)); - ASSERT (Value != NULL); - // - // Convert Buffer to Hex String - // - TemBuffer = Src + StorageWidth - 1; - TemString = Value; - for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) { - TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2); - } - } - - Status = SetValueByName (Storage, Question->VariableName, Value, TRUE); - FreePool (Value); + IsBufferStorage = FALSE; } + IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ? TRUE : FALSE); - if (!Cached) { - // - // ::= + + "&VALUE=" + "StorageWidth * 2" || - // + "&" + + "=" + "" - // + if (SetValueTo == GetSetValueWithEditBuffer || SetValueTo == GetSetValueWithBuffer) { if (IsBufferStorage) { - Length = StrLen (Question->BlockName) + 7; - } else { - Length = StrLen (Question->VariableName) + 2; - } - if (!IsBufferStorage && IsString) { - Length += (StrLen ((CHAR16 *) Src) * 4); + if (SetValueTo == GetSetValueWithEditBuffer) { + // + // Copy to storage edit buffer + // + CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth); + } else if (SetValueTo == GetSetValueWithBuffer) { + // + // Copy to storage edit buffer + // + CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth); + } } else { - Length += (StorageWidth * 2); - } - ConfigResp = AllocateZeroPool ((StrLen (Storage->ConfigHdr) + Length + 1) * sizeof (CHAR16)); - ASSERT (ConfigResp != NULL); + if (IsString) { + // + // Allocate enough string buffer. + // + Value = NULL; + BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16); + Value = AllocateZeroPool (BufferLen); + ASSERT (Value != NULL); + // + // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044" + // + TemName = (CHAR16 *) Src; + TemString = Value; + for (; *TemName != L'\0'; TemName++) { + TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4); + } + } else { + BufferLen = StorageWidth * 2 + 1; + Value = AllocateZeroPool (BufferLen * sizeof (CHAR16)); + ASSERT (Value != NULL); + // + // Convert Buffer to Hex String + // + TemBuffer = Src + StorageWidth - 1; + TemString = Value; + for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) { + TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2); + } + } - StrCpy (ConfigResp, Storage->ConfigHdr); - if (IsBufferStorage) { - StrCat (ConfigResp, Question->BlockName); - StrCat (ConfigResp, L"&VALUE="); - } else { - StrCat (ConfigResp, L"&"); - StrCat (ConfigResp, Question->VariableName); - StrCat (ConfigResp, L"="); + Status = SetValueByName (Storage, Question->VariableName, Value, SetValueTo); + FreePool (Value); } - - Value = ConfigResp + StrLen (ConfigResp); - - if (!IsBufferStorage && IsString) { + } else if (SetValueTo == GetSetValueWithHiiDriver) { + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { // - // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044" + // ::= + + "&VALUE=" + "StorageWidth * 2" || + // + "&" + + "=" + "" // - TemName = (CHAR16 *) Src; - TemString = Value; - for (; *TemName != L'\0'; TemName++) { - TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4); + if (IsBufferStorage) { + Length = StrLen (Question->BlockName) + 7; + } else { + Length = StrLen (Question->VariableName) + 2; } - } else { - // - // Convert Buffer to Hex String - // - TemBuffer = Src + StorageWidth - 1; - TemString = Value; - for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) { - TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2); + if (!IsBufferStorage && IsString) { + Length += (StrLen ((CHAR16 *) Src) * 4); + } else { + Length += (StorageWidth * 2); } - } + ConfigResp = AllocateZeroPool ((StrLen (Storage->ConfigHdr) + Length + 1) * sizeof (CHAR16)); + ASSERT (ConfigResp != NULL); - // - // Convert to lower char. - // - for (TemString = Value; *Value != L'\0'; Value++) { - if (*Value >= L'A' && *Value <= L'Z') { - *Value = (CHAR16) (*Value - L'A' + L'a'); + StrCpy (ConfigResp, Storage->ConfigHdr); + if (IsBufferStorage) { + StrCat (ConfigResp, Question->BlockName); + StrCat (ConfigResp, L"&VALUE="); + } else { + StrCat (ConfigResp, L"&"); + StrCat (ConfigResp, Question->VariableName); + StrCat (ConfigResp, L"="); } - } - // - // Submit Question Value to Configuration Driver - // - if (FormSet->ConfigAccess != NULL) { - Status = FormSet->ConfigAccess->RouteConfig ( - FormSet->ConfigAccess, - ConfigResp, - &Progress - ); - if (EFI_ERROR (Status)) { - FreePool (ConfigResp); + Value = ConfigResp + StrLen (ConfigResp); + + if (!IsBufferStorage && IsString) { + // + // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044" + // + TemName = (CHAR16 *) Src; + TemString = Value; + for (; *TemName != L'\0'; TemName++) { + TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4); + } + } else { + // + // Convert Buffer to Hex String + // + TemBuffer = Src + StorageWidth - 1; + TemString = Value; + for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) { + TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2); + } + } + + // + // Convert to lower char. + // + for (TemString = Value; *Value != L'\0'; Value++) { + if (*Value >= L'A' && *Value <= L'Z') { + *Value = (CHAR16) (*Value - L'A' + L'a'); + } + } + + // + // Submit Question Value to Configuration Driver + // + if (FormSet->ConfigAccess != NULL) { + Status = FormSet->ConfigAccess->RouteConfig ( + FormSet->ConfigAccess, + ConfigResp, + &Progress + ); + if (EFI_ERROR (Status)) { + FreePool (ConfigResp); + return Status; + } + } + FreePool (ConfigResp); + + } else if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + TemBuffer = NULL; + TemBuffer = AllocateZeroPool(Storage->Size); + if (TemBuffer == NULL) { + Status = EFI_OUT_OF_RESOURCES; return Status; } - } - FreePool (ConfigResp); + Length = Storage->Size; + Status = gRT->GetVariable ( + Storage->Name, + &Storage->Guid, + NULL, + &Length, + TemBuffer + ); + CopyMem (TemBuffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth); + + Status = gRT->SetVariable ( + Storage->Name, + &Storage->Guid, + Storage->Attributes, + Storage->Size, + TemBuffer + ); + FreePool (TemBuffer); + if (EFI_ERROR (Status)){ + return Status; + } + } // - // Synchronize shadow Buffer + // Sync storage, from editbuffer to buffer. // - SynchronizeStorage (Storage); + CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth); } return Status; @@ -1681,7 +1914,7 @@ ValidateQuestion ( return Status; } - if (Expression->Result.Value.b) { + if ((Expression->Result.Type == EFI_IFR_TYPE_BOOLEAN) && Expression->Result.Value.b) { // // Condition meet, show up error message // @@ -1750,58 +1983,24 @@ NoSubmitCheck ( return EFI_SUCCESS; } -/** - Restore Storage's Edit copy to Shadow copy. - - @param Storage The Storage to be synchronized. - -**/ -VOID -RestoreStorage ( - IN FORMSET_STORAGE *Storage - ) -{ - LIST_ENTRY *Link; - NAME_VALUE_NODE *Node; - - switch (Storage->Type) { - case EFI_HII_VARSTORE_BUFFER: - CopyMem (Storage->EditBuffer, Storage->Buffer, Storage->Size); - break; - - case EFI_HII_VARSTORE_NAME_VALUE: - Link = GetFirstNode (&Storage->NameValueListHead); - while (!IsNull (&Storage->NameValueListHead, Link)) { - Node = NAME_VALUE_NODE_FROM_LINK (Link); - - if (Node->EditValue != NULL) { - FreePool (Node->EditValue); - } - Node->EditValue = AllocateCopyPool (StrSize (Node->Value), Node->Value); - ASSERT (Node->EditValue != NULL); - Link = GetNextNode (&Storage->NameValueListHead, Link); - } - break; - - case EFI_HII_VARSTORE_EFI_VARIABLE: - default: - break; - } -} - /** Fill storage's edit copy with settings requested from Configuration Driver. @param FormSet FormSet data structure. @param ConfigInfo The config info related to this form. + @param SyncOrRestore Sync the buffer to editbuffer or Restore the + editbuffer to buffer + if TRUE, copy the editbuffer to the buffer. + if FALSE, copy the buffer to the editbuffer. @retval EFI_SUCCESS The function completed successfully. **/ EFI_STATUS -FormRestoreStorage ( +SynchronizeStorageForForm ( IN FORM_BROWSER_FORMSET *FormSet, - IN FORM_BROWSER_CONFIG_REQUEST *ConfigInfo + IN FORM_BROWSER_CONFIG_REQUEST *ConfigInfo, + IN BOOLEAN SyncOrRestore ) { EFI_STATUS Status; @@ -1810,10 +2009,12 @@ FormRestoreStorage ( UINTN BufferSize; LIST_ENTRY *Link; NAME_VALUE_NODE *Node; + UINT8 *Src; + UINT8 *Dst; Status = EFI_SUCCESS; Result = NULL; - if (FormSet->ConfigAccess == NULL) { + if (FormSet->ConfigAccess == NULL && ConfigInfo->Storage->Type != EFI_HII_VARSTORE_NAME_VALUE) { return EFI_NOT_FOUND; } @@ -1824,12 +2025,22 @@ FormRestoreStorage ( return EFI_SUCCESS; } - if (ConfigInfo->Storage->Type == EFI_HII_VARSTORE_BUFFER) { + if (ConfigInfo->Storage->Type == EFI_HII_VARSTORE_BUFFER || + (ConfigInfo->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) { BufferSize = ConfigInfo->Storage->Size; + + if (SyncOrRestore) { + Src = ConfigInfo->Storage->EditBuffer; + Dst = ConfigInfo->Storage->Buffer; + } else { + Src = ConfigInfo->Storage->Buffer; + Dst = ConfigInfo->Storage->EditBuffer; + } + Status = mHiiConfigRouting->BlockToConfig( mHiiConfigRouting, ConfigInfo->ConfigRequest, - ConfigInfo->Storage->Buffer, + Src, BufferSize, &Result, &Progress @@ -1841,28 +2052,24 @@ FormRestoreStorage ( Status = mHiiConfigRouting->ConfigToBlock ( mHiiConfigRouting, Result, - ConfigInfo->Storage->EditBuffer, + Dst, &BufferSize, &Progress ); if (Result != NULL) { FreePool (Result); } - - if (EFI_ERROR (Status)) { - return Status; - } } else if (ConfigInfo->Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { Link = GetFirstNode (&ConfigInfo->Storage->NameValueListHead); while (!IsNull (&ConfigInfo->Storage->NameValueListHead, Link)) { Node = NAME_VALUE_NODE_FROM_LINK (Link); if (StrStr (ConfigInfo->ConfigRequest, Node->Name) != NULL) { - if (Node->EditValue != NULL) { - FreePool (Node->EditValue); + if (SyncOrRestore) { + NewStringCpy (&Node->Value, Node->EditValue); + } else { + NewStringCpy (&Node->EditValue, Node->Value); } - Node->EditValue = AllocateCopyPool (StrSize (Node->Value), Node->Value); - ASSERT (Node->EditValue != NULL); } Link = GetNextNode (&ConfigInfo->Storage->NameValueListHead, Link); @@ -1872,123 +2079,184 @@ FormRestoreStorage ( return Status; } - /** - Discard data for form level or formset level. + When discard the question value, call the callback function with Changed type + to inform the hii driver. @param FormSet FormSet data structure. @param Form Form data structure. - @param SingleForm Only discard single form or formset. - - @retval EFI_SUCCESS The function completed successfully. **/ -EFI_STATUS -DiscardForm ( +VOID +SendDiscardInfoToDriver ( IN FORM_BROWSER_FORMSET *FormSet, - IN FORM_BROWSER_FORM *Form, - IN BOOLEAN SingleForm + IN FORM_BROWSER_FORM *Form ) { - LIST_ENTRY *Link; - FORMSET_STORAGE *Storage; - FORM_BROWSER_CONFIG_REQUEST *ConfigInfo; + LIST_ENTRY *Link; + FORM_BROWSER_STATEMENT *Question; + EFI_STATUS Status; + EFI_HII_VALUE HiiValue; + UINT8 *BufferValue; + BOOLEAN ValueChanged; + EFI_IFR_TYPE_VALUE *TypeValue; + EFI_BROWSER_ACTION_REQUEST ActionRequest; - if (SingleForm) { - if (Form->NvUpdateRequired) { - ConfigInfo = NULL; - Link = GetFirstNode (&Form->ConfigRequestHead); - while (!IsNull (&Form->ConfigRequestHead, Link)) { - ConfigInfo = FORM_BROWSER_CONFIG_REQUEST_FROM_LINK (Link); - Link = GetNextNode (&Form->ConfigRequestHead, Link); + ValueChanged = FALSE; + BufferValue = NULL; - if (ConfigInfo->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { - continue; - } + if(!Form->NvUpdateRequired) { + return; + } - // - // Skip if there is no RequestElement - // - if (ConfigInfo->ElementCount == 0) { - continue; - } + Link = GetFirstNode (&Form->StatementListHead); + while (!IsNull (&Form->StatementListHead, Link)) { + Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link); + Link = GetNextNode (&Form->StatementListHead, Link); - // - // Prepare - // - FormRestoreStorage(FormSet, ConfigInfo); - } + if (Question->Storage == NULL || Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { + continue; + } - Form->NvUpdateRequired = FALSE; + if (Question->Operand == EFI_IFR_PASSWORD_OP) { + continue; } - } else { - if (IsNvUpdateRequired(FormSet)) { - // - // Discard Buffer storage or Name/Value storage - // - Link = GetFirstNode (&FormSet->StorageListHead); - while (!IsNull (&FormSet->StorageListHead, Link)) { - Storage = FORMSET_STORAGE_FROM_LINK (Link); - Link = GetNextNode (&FormSet->StorageListHead, Link); - if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { - continue; - } + if (Question->BufferValue != NULL) { + BufferValue = AllocateZeroPool (Question->StorageWidth); + ASSERT (BufferValue != NULL); + CopyMem (BufferValue, Question->BufferValue, Question->StorageWidth); + } else { + HiiValue.Type = Question->HiiValue.Type; + CopyMem (&HiiValue.Value, &Question->HiiValue.Value, sizeof (EFI_IFR_TYPE_VALUE)); + } - // - // Skip if there is no RequestElement - // - if (Storage->ElementCount == 0) { - continue; - } + Status = GetQuestionValue (FormSet, Form, Question, GetSetValueWithBuffer); + if (EFI_ERROR (Status)) { + if (BufferValue != NULL) { + FreePool (BufferValue); + BufferValue = NULL; + } + continue; + } - RestoreStorage(Storage); + if (Question->BufferValue != NULL) { + if (CompareMem (BufferValue, Question->BufferValue, Question->StorageWidth)) { + ValueChanged = TRUE; + } + } else { + if (CompareMem (&HiiValue.Value, &Question->HiiValue.Value, sizeof (EFI_IFR_TYPE_VALUE))) { + ValueChanged = TRUE; } + } - UpdateNvInfoInForm(FormSet, FALSE); + if (BufferValue != NULL) { + FreePool (BufferValue); + BufferValue = NULL; } + + if (!ValueChanged) { + continue; + } + + ValueChanged = FALSE; + + if (Question->HiiValue.Type == EFI_IFR_TYPE_BUFFER) { + TypeValue = (EFI_IFR_TYPE_VALUE *) Question->BufferValue; + } else { + TypeValue = &Question->HiiValue.Value; + } + + ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE; + FormSet->ConfigAccess->Callback ( + FormSet->ConfigAccess, + EFI_BROWSER_ACTION_CHANGED, + Question->QuestionId, + Question->HiiValue.Type, + TypeValue, + &ActionRequest + ); } +} - return EFI_SUCCESS; +/** + Validate the FormSet. If the formset is not validate, remove it from the list. + + @param FormSet The input FormSet which need to validate. + + @retval TRUE The handle is validate. + @retval FALSE The handle is invalidate. + +**/ +BOOLEAN +ValidateFormSet ( + FORM_BROWSER_FORMSET *FormSet + ) +{ + EFI_HII_HANDLE *HiiHandles; + UINTN Index; + BOOLEAN Find; + + ASSERT (FormSet != NULL); + Find = FALSE; + // + // Get all the Hii handles + // + HiiHandles = HiiGetHiiHandles (NULL); + ASSERT (HiiHandles != NULL); + + // + // Search for formset of each class type + // + for (Index = 0; HiiHandles[Index] != NULL; Index++) { + if (HiiHandles[Index] == FormSet->HiiHandle) { + Find = TRUE; + break; + } + } + + if (!Find) { + CleanBrowserStorage(FormSet); + RemoveEntryList (&FormSet->Link); + DestroyFormSet (FormSet); + } + + FreePool (HiiHandles); + + return Find; } /** - Submit data for form level or formset level. + Discard data based on the input setting scope (Form, FormSet or System). @param FormSet FormSet data structure. @param Form Form data structure. - @param SingleForm whether submit for the single form or all form set. + @param SettingScope Setting Scope for Discard action. @retval EFI_SUCCESS The function completed successfully. + @retval EFI_UNSUPPORTED Unsupport SettingScope. **/ EFI_STATUS -SubmitForm ( +DiscardForm ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, - IN BOOLEAN SingleForm + IN BROWSER_SETTING_SCOPE SettingScope ) { - EFI_STATUS Status; - LIST_ENTRY *Link; - EFI_STRING ConfigResp; - EFI_STRING Progress; - FORMSET_STORAGE *Storage; + LIST_ENTRY *Link; + FORMSET_STORAGE *Storage; FORM_BROWSER_CONFIG_REQUEST *ConfigInfo; + FORM_BROWSER_FORMSET *LocalFormSet; // - // Validate the Form by NoSubmit check + // Check the supported setting level. // - if (SingleForm) { - Status = NoSubmitCheck (FormSet, Form); - } else { - Status = NoSubmitCheck (FormSet, NULL); - } - if (EFI_ERROR (Status)) { - return Status; + if (SettingScope >= MaxLevel) { + return EFI_UNSUPPORTED; } - if (SingleForm) { + if (SettingScope == FormLevel && Form->NvUpdateRequired) { ConfigInfo = NULL; Link = GetFirstNode (&Form->ConfigRequestHead); while (!IsNull (&Form->ConfigRequestHead, Link)) { @@ -2009,44 +2277,26 @@ SubmitForm ( // // Prepare // - Status = StorageToConfigResp (ConfigInfo, &ConfigResp, TRUE); - if (EFI_ERROR (Status)) { - return Status; - } - - // - // Send to Configuration Driver - // - if (FormSet->ConfigAccess != NULL) { - Status = FormSet->ConfigAccess->RouteConfig ( - FormSet->ConfigAccess, - ConfigResp, - &Progress - ); - if (EFI_ERROR (Status)) { - FreePool (ConfigResp); - return Status; - } - } - FreePool (ConfigResp); + SynchronizeStorageForForm(FormSet, ConfigInfo, FALSE); // - // Config success, update storage shadow Buffer + // Call callback with Changed type to inform the driver. // - SynchronizeStorage (ConfigInfo->Storage); + SendDiscardInfoToDriver (FormSet, Form); } Form->NvUpdateRequired = FALSE; - } else { + } else if (SettingScope == FormSetLevel && IsNvUpdateRequired(FormSet)) { + // - // Submit Buffer storage or Name/Value storage + // Discard Buffer storage or Name/Value storage // Link = GetFirstNode (&FormSet->StorageListHead); while (!IsNull (&FormSet->StorageListHead, Link)) { Storage = FORMSET_STORAGE_FROM_LINK (Link); Link = GetNextNode (&FormSet->StorageListHead, Link); - if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { continue; } @@ -2057,63 +2307,359 @@ SubmitForm ( continue; } - // - // Prepare - // - Status = StorageToConfigResp (Storage, &ConfigResp, FALSE); - if (EFI_ERROR (Status)) { - return Status; - } - - // - // Send to Configuration Driver - // - if (FormSet->ConfigAccess != NULL) { - Status = FormSet->ConfigAccess->RouteConfig ( - FormSet->ConfigAccess, - ConfigResp, - &Progress - ); - if (EFI_ERROR (Status)) { - FreePool (ConfigResp); - return Status; - } - } - FreePool (ConfigResp); + SynchronizeStorage(Storage->BrowserStorage, FALSE); + } + Link = GetFirstNode (&FormSet->FormListHead); + while (!IsNull (&FormSet->FormListHead, Link)) { + Form = FORM_BROWSER_FORM_FROM_LINK (Link); + Link = GetNextNode (&FormSet->FormListHead, Link); + // - // Config success, update storage shadow Buffer + // Call callback with Changed type to inform the driver. // - SynchronizeStorage (Storage); + SendDiscardInfoToDriver (FormSet, Form); } - UpdateNvInfoInForm(FormSet, FALSE); + UpdateNvInfoInForm (FormSet, FALSE); + } else if (SettingScope == SystemLevel) { + // + // System Level Discard. + // + + // + // Discard changed value for each FormSet in the maintain list. + // + Link = GetFirstNode (&gBrowserFormSetList); + while (!IsNull (&gBrowserFormSetList, Link)) { + LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); + Link = GetNextNode (&gBrowserFormSetList, Link); + if (!ValidateFormSet(LocalFormSet)) { + continue; + } + DiscardForm (LocalFormSet, NULL, FormSetLevel); + if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) { + // + // Remove maintain backup list after discard except for the current using FormSet. + // + CleanBrowserStorage(LocalFormSet); + RemoveEntryList (&LocalFormSet->Link); + DestroyFormSet (LocalFormSet); + } + } } - return EFI_SUCCESS; + return EFI_SUCCESS; } /** - Get Question default value from AltCfg string. + Submit data based on the input Setting level (Form, FormSet or System). - @param FormSet The form set. - @param Question The question. - @param DefaultId The default Id. + @param FormSet FormSet data structure. + @param Form Form data structure. + @param SettingScope Setting Scope for Submit action. - @retval EFI_SUCCESS Question is reset to default value. + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_UNSUPPORTED Unsupport SettingScope. **/ EFI_STATUS -GetDefaultValueFromAltCfg ( - IN FORM_BROWSER_FORMSET *FormSet, - IN OUT FORM_BROWSER_STATEMENT *Question, - IN UINT16 DefaultId - ) -{ +SubmitForm ( + IN FORM_BROWSER_FORMSET *FormSet, + IN FORM_BROWSER_FORM *Form, + IN BROWSER_SETTING_SCOPE SettingScope + ) +{ + EFI_STATUS Status; + LIST_ENTRY *Link; + EFI_STRING ConfigResp; + EFI_STRING Progress; + BROWSER_STORAGE *Storage; + FORMSET_STORAGE *FormSetStorage; + UINTN BufferSize; + UINT8 *TmpBuf; + FORM_BROWSER_FORMSET *LocalFormSet; + FORM_BROWSER_CONFIG_REQUEST *ConfigInfo; + + // + // Check the supported setting level. + // + if (SettingScope >= MaxLevel) { + return EFI_UNSUPPORTED; + } + + // + // Validate the Form by NoSubmit check + // + Status = EFI_SUCCESS; + if (SettingScope == FormLevel) { + Status = NoSubmitCheck (FormSet, Form); + } else if (SettingScope == FormSetLevel) { + Status = NoSubmitCheck (FormSet, NULL); + } + if (EFI_ERROR (Status)) { + return Status; + } + + if (SettingScope == FormLevel && Form->NvUpdateRequired) { + ConfigInfo = NULL; + Link = GetFirstNode (&Form->ConfigRequestHead); + while (!IsNull (&Form->ConfigRequestHead, Link)) { + ConfigInfo = FORM_BROWSER_CONFIG_REQUEST_FROM_LINK (Link); + Link = GetNextNode (&Form->ConfigRequestHead, Link); + + Storage = ConfigInfo->Storage; + if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { + continue; + } + + // + // Skip if there is no RequestElement + // + if (ConfigInfo->ElementCount == 0) { + continue; + } + + // + // 1. Prepare + // + Status = StorageToConfigResp (ConfigInfo->Storage, &ConfigResp, ConfigInfo->ConfigRequest); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // 2. Set value to hii driver or efi variable. + // + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || + Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + // + // Send to Configuration Driver + // + if (FormSet->ConfigAccess != NULL) { + Status = FormSet->ConfigAccess->RouteConfig ( + FormSet->ConfigAccess, + ConfigResp, + &Progress + ); + if (EFI_ERROR (Status)) { + FreePool (ConfigResp); + return Status; + } + } + } else if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + TmpBuf = NULL; + TmpBuf = AllocateZeroPool(Storage->Size); + if (TmpBuf == NULL) { + Status = EFI_OUT_OF_RESOURCES; + return Status; + } + + BufferSize = Storage->Size; + Status = gRT->GetVariable ( + Storage->Name, + &Storage->Guid, + NULL, + &BufferSize, + TmpBuf + ); + if (EFI_ERROR (Status)) { + FreePool (TmpBuf); + FreePool (ConfigResp); + return Status; + } + ASSERT (BufferSize == Storage->Size); + Status = mHiiConfigRouting->ConfigToBlock ( + mHiiConfigRouting, + ConfigResp, + TmpBuf, + &BufferSize, + &Progress + ); + if (EFI_ERROR (Status)) { + FreePool (TmpBuf); + FreePool (ConfigResp); + return Status; + } + + Status = gRT->SetVariable ( + Storage->Name, + &Storage->Guid, + Storage->Attributes, + Storage->Size, + TmpBuf + ); + FreePool (TmpBuf); + if (EFI_ERROR (Status)) { + FreePool (ConfigResp); + return Status; + } + } + FreePool (ConfigResp); + // + // 3. Config success, update storage shadow Buffer, only update the data belong to this form. + // + SynchronizeStorageForForm(FormSet, ConfigInfo, TRUE); + } + + // + // 4. Update the NV flag. + // + Form->NvUpdateRequired = FALSE; + } else if (SettingScope == FormSetLevel && IsNvUpdateRequired(FormSet)) { + // + // Submit Buffer storage or Name/Value storage + // + Link = GetFirstNode (&FormSet->StorageListHead); + while (!IsNull (&FormSet->StorageListHead, Link)) { + FormSetStorage = (FORMSET_STORAGE_FROM_LINK (Link)); + Storage = FormSetStorage->BrowserStorage; + Link = GetNextNode (&FormSet->StorageListHead, Link); + + if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { + continue; + } + + // + // Skip if there is no RequestElement + // + if (FormSetStorage->ElementCount == 0) { + continue; + } + + // + // 1. Prepare + // + Status = StorageToConfigResp (Storage, &ConfigResp, FormSetStorage->ConfigRequest); + if (EFI_ERROR (Status)) { + return Status; + } + + if (Storage->Type == EFI_HII_VARSTORE_BUFFER || + Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + + // + // 2. Send to Configuration Driver + // + if (FormSet->ConfigAccess != NULL) { + Status = FormSet->ConfigAccess->RouteConfig ( + FormSet->ConfigAccess, + ConfigResp, + &Progress + ); + if (EFI_ERROR (Status)) { + FreePool (ConfigResp); + return Status; + } + } + } else if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + // + // 1&2. Set the edit data to the variable. + // + TmpBuf = NULL; + TmpBuf = AllocateZeroPool (Storage->Size); + if (TmpBuf == NULL) { + Status = EFI_OUT_OF_RESOURCES; + return Status; + } + BufferSize = Storage->Size; + Status = gRT->GetVariable ( + Storage->Name, + &Storage->Guid, + NULL, + &BufferSize, + TmpBuf + ); + ASSERT (BufferSize == Storage->Size); + Status = mHiiConfigRouting->ConfigToBlock ( + mHiiConfigRouting, + ConfigResp, + TmpBuf, + &BufferSize, + &Progress + ); + if (EFI_ERROR (Status)) { + FreePool (TmpBuf); + FreePool (ConfigResp); + return Status; + } + + Status = gRT->SetVariable ( + Storage->Name, + &Storage->Guid, + Storage->Attributes, + Storage->Size, + TmpBuf + ); + if (EFI_ERROR (Status)) { + FreePool (TmpBuf); + FreePool (ConfigResp); + return Status; + } + FreePool (TmpBuf); + } + FreePool (ConfigResp); + // + // 3. Config success, update storage shadow Buffer + // + SynchronizeStorage (Storage, TRUE); + } + + // + // 4. Update the NV flag. + // + UpdateNvInfoInForm (FormSet, FALSE); + } else if (SettingScope == SystemLevel) { + // + // System Level Save. + // + + // + // Save changed value for each FormSet in the maintain list. + // + Link = GetFirstNode (&gBrowserFormSetList); + while (!IsNull (&gBrowserFormSetList, Link)) { + LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); + Link = GetNextNode (&gBrowserFormSetList, Link); + if (!ValidateFormSet(LocalFormSet)) { + continue; + } + SubmitForm (LocalFormSet, NULL, FormSetLevel); + if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) { + // + // Remove maintain backup list after save except for the current using FormSet. + // + CleanBrowserStorage(LocalFormSet); + RemoveEntryList (&LocalFormSet->Link); + DestroyFormSet (LocalFormSet); + } + } + } + + return EFI_SUCCESS; +} + +/** + Get Question default value from AltCfg string. + + @param FormSet The form set. + @param Question The question. + @param DefaultId The default Id. + + @retval EFI_SUCCESS Question is reset to default value. + +**/ +EFI_STATUS +GetDefaultValueFromAltCfg ( + IN FORM_BROWSER_FORMSET *FormSet, + IN OUT FORM_BROWSER_STATEMENT *Question, + IN UINT16 DefaultId + ) +{ BOOLEAN IsBufferStorage; BOOLEAN IsString; UINTN Length; - FORMSET_STORAGE *Storage; + BROWSER_STORAGE *Storage; CHAR16 *ConfigRequest; CHAR16 *Progress; CHAR16 *Result; @@ -2136,7 +2682,9 @@ GetDefaultValueFromAltCfg ( Value = NULL; Storage = Question->Storage; - if ((Storage == NULL) || (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) { + if ((Storage == NULL) || + (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) || + (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) { return Status; } @@ -2346,7 +2894,7 @@ GetQuestionDefault ( EFI_BROWSER_ACTION_REQUEST ActionRequest; INTN Action; - Status = EFI_SUCCESS; + Status = EFI_NOT_FOUND; StrValue = NULL; // @@ -2414,7 +2962,19 @@ GetQuestionDefault ( return Status; } - CopyMem (HiiValue, &Default->ValueExpression->Result, sizeof (EFI_HII_VALUE)); + if (Default->ValueExpression->Result.Type == EFI_IFR_TYPE_BUFFER) { + ASSERT (HiiValue->Type == EFI_IFR_TYPE_BUFFER && Question->BufferValue != NULL); + if (Question->StorageWidth > Default->ValueExpression->Result.BufferLen) { + CopyMem (Question->HiiValue.Buffer, Default->ValueExpression->Result.Buffer, Default->ValueExpression->Result.BufferLen); + Question->HiiValue.BufferLen = Default->ValueExpression->Result.BufferLen; + } else { + CopyMem (Question->HiiValue.Buffer, Default->ValueExpression->Result.Buffer, Question->StorageWidth); + Question->HiiValue.BufferLen = Question->StorageWidth; + } + FreePool (Default->ValueExpression->Result.Buffer); + } + HiiValue->Type = Default->ValueExpression->Result.Type; + CopyMem (&HiiValue->Value, &Default->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE)); } else { // // Default value is embedded in EFI_IFR_DEFAULT @@ -2427,7 +2987,11 @@ GetQuestionDefault ( if (StrValue == NULL) { return EFI_NOT_FOUND; } - Question->BufferValue = AllocateCopyPool (StrSize (StrValue), StrValue); + if (Question->StorageWidth > StrSize (StrValue)) { + CopyMem (Question->BufferValue, StrValue, StrSize (StrValue)); + } else { + CopyMem (Question->BufferValue, StrValue, Question->StorageWidth); + } } return EFI_SUCCESS; @@ -2448,6 +3012,12 @@ GetQuestionDefault ( Link = GetFirstNode (&Question->OptionListHead); while (!IsNull (&Question->OptionListHead, Link)) { Option = QUESTION_OPTION_FROM_LINK (Link); + Link = GetNextNode (&Question->OptionListHead, Link); + + if ((Option->SuppressExpression != NULL) && + EvaluateExpressionList(Option->SuppressExpression, FALSE, NULL, NULL) != ExpressFalse) { + continue; + } if (((DefaultId == EFI_HII_DEFAULT_CLASS_STANDARD) && ((Option->Flags & EFI_IFR_OPTION_DEFAULT) != 0)) || ((DefaultId == EFI_HII_DEFAULT_CLASS_MANUFACTURING) && ((Option->Flags & EFI_IFR_OPTION_DEFAULT_MFG) != 0)) @@ -2456,8 +3026,6 @@ GetQuestionDefault ( return EFI_SUCCESS; } - - Link = GetNextNode (&Question->OptionListHead, Link); } } } @@ -2485,6 +3053,7 @@ GetQuestionDefault ( // // For Questions without default // + Status = EFI_NOT_FOUND; switch (Question->Operand) { case EFI_IFR_NUMERIC_OP: // @@ -2492,6 +3061,7 @@ GetQuestionDefault ( // if ((HiiValue->Value.u64 < Question->Minimum) || (HiiValue->Value.u64 > Question->Maximum)) { HiiValue->Value.u64 = Question->Minimum; + Status = EFI_SUCCESS; } break; @@ -2501,9 +3071,18 @@ GetQuestionDefault ( // if (ValueToOption (Question, HiiValue) == NULL) { Link = GetFirstNode (&Question->OptionListHead); - if (!IsNull (&Question->OptionListHead, Link)) { + while (!IsNull (&Question->OptionListHead, Link)) { Option = QUESTION_OPTION_FROM_LINK (Link); + Link = GetNextNode (&Question->OptionListHead, Link); + + if ((Option->SuppressExpression != NULL) && + EvaluateExpressionList(Option->SuppressExpression, FALSE, NULL, NULL) != ExpressFalse) { + continue; + } + CopyMem (HiiValue, &Option->Value, sizeof (EFI_HII_VALUE)); + Status = EFI_SUCCESS; + break; } } break; @@ -2515,7 +3094,14 @@ GetQuestionDefault ( Index = 0; Link = GetFirstNode (&Question->OptionListHead); while (!IsNull (&Question->OptionListHead, Link)) { + Status = EFI_SUCCESS; Option = QUESTION_OPTION_FROM_LINK (Link); + Link = GetNextNode (&Question->OptionListHead, Link); + + if ((Option->SuppressExpression != NULL) && + EvaluateExpressionList(Option->SuppressExpression, FALSE, NULL, NULL) != ExpressFalse) { + continue; + } SetArrayData (Question->BufferValue, Question->ValueType, Index, Option->Value.Value.u64); @@ -2523,13 +3109,10 @@ GetQuestionDefault ( if (Index >= Question->MaxContainers) { break; } - - Link = GetNextNode (&Question->OptionListHead, Link); } break; default: - Status = EFI_NOT_FOUND; break; } @@ -2538,54 +3121,106 @@ GetQuestionDefault ( /** - Reset Questions in a Formset to their default value. + Reset Questions to their initial value or default value in a Form, Formset or System. + + GetDefaultValueScope parameter decides which questions will reset + to its default value. @param FormSet FormSet data structure. + @param Form Form data structure. @param DefaultId The Class of the default. + @param SettingScope Setting Scope for Default action. + @param GetDefaultValueScope Get default value scope. + @param Storage Get default value only for this storage. + @param RetrieveValueFirst Whether call the retrieve call back to + get the initial value before get default + value. @retval EFI_SUCCESS The function completed successfully. + @retval EFI_UNSUPPORTED Unsupport SettingScope. **/ EFI_STATUS -ExtractFormSetDefault ( +ExtractDefault ( IN FORM_BROWSER_FORMSET *FormSet, - IN UINT16 DefaultId + IN FORM_BROWSER_FORM *Form, + IN UINT16 DefaultId, + IN BROWSER_SETTING_SCOPE SettingScope, + IN BROWSER_GET_DEFAULT_VALUE GetDefaultValueScope, + IN BROWSER_STORAGE *Storage OPTIONAL, + IN BOOLEAN RetrieveValueFirst ) { EFI_STATUS Status; LIST_ENTRY *FormLink; - LIST_ENTRY *StatementLink; + LIST_ENTRY *Link; FORM_BROWSER_STATEMENT *Question; - FORM_BROWSER_FORM *Form; + FORM_BROWSER_FORMSET *BackUpFormSet; + FORM_BROWSER_FORMSET *LocalFormSet; + EFI_HII_HANDLE *HiiHandles; + UINTN Index; + EFI_GUID ZeroGuid; - FormLink = GetFirstNode (&FormSet->FormListHead); - while (!IsNull (&FormSet->FormListHead, FormLink)) { - Form = FORM_BROWSER_FORM_FROM_LINK (FormLink); - + Status = EFI_SUCCESS; + + // + // Check the supported setting level. + // + if (SettingScope >= MaxLevel || GetDefaultValueScope >= GetDefaultForMax) { + return EFI_UNSUPPORTED; + } + + if (GetDefaultValueScope == GetDefaultForStorage && Storage == NULL) { + return EFI_UNSUPPORTED; + } + + if (SettingScope == FormLevel) { // // Extract Form default // - StatementLink = GetFirstNode (&Form->StatementListHead); - while (!IsNull (&Form->StatementListHead, StatementLink)) { - Question = FORM_BROWSER_STATEMENT_FROM_LINK (StatementLink); - StatementLink = GetNextNode (&Form->StatementListHead, StatementLink); + Link = GetFirstNode (&Form->StatementListHead); + while (!IsNull (&Form->StatementListHead, Link)) { + Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link); + Link = GetNextNode (&Form->StatementListHead, Link); + + // + // If get default value only for this storage, check the storage first. + // + if ((GetDefaultValueScope == GetDefaultForStorage) && (Question->Storage != Storage)) { + continue; + } + + // + // If get default value only for no storage question, just skip the question which has storage. + // + if ((GetDefaultValueScope == GetDefaultForNoStorage) && (Question->Storage != NULL)) { + continue; + } // // If Question is disabled, don't reset it to default // - if (Question->DisableExpression != NULL) { - Status = EvaluateExpression (FormSet, Form, Question->DisableExpression); - if (!EFI_ERROR (Status) && Question->DisableExpression->Result.Value.b) { + if (Question->Expression != NULL) { + if (EvaluateExpressionList(Question->Expression, TRUE, FormSet, Form) == ExpressDisable) { continue; } } + if (RetrieveValueFirst) { + // + // Call the Retrieve call back to get the initial question value. + // + Status = ProcessRetrieveForQuestion(FormSet->ConfigAccess, Question); + } + // - // Reset Question to its default value + // If not request to get the initial value or get initial value fail, then get default value. // - Status = GetQuestionDefault (FormSet, Form, Question, DefaultId); - if (EFI_ERROR (Status)) { - continue; + if (!RetrieveValueFirst || EFI_ERROR (Status)) { + Status = GetQuestionDefault (FormSet, Form, Question, DefaultId); + if (EFI_ERROR (Status)) { + continue; + } } // @@ -2593,10 +3228,94 @@ ExtractFormSetDefault ( // if ((Question->Storage != NULL) && (Question->Storage->Type != EFI_HII_VARSTORE_EFI_VARIABLE)) { - SetQuestionValue (FormSet, Form, Question, TRUE); + SetQuestionValue (FormSet, Form, Question, GetSetValueWithEditBuffer); + // + // Update Form NV flag. + // + Form->NvUpdateRequired = TRUE; + } + } + } else if (SettingScope == FormSetLevel) { + FormLink = GetFirstNode (&FormSet->FormListHead); + while (!IsNull (&FormSet->FormListHead, FormLink)) { + Form = FORM_BROWSER_FORM_FROM_LINK (FormLink); + ExtractDefault (FormSet, Form, DefaultId, FormLevel, GetDefaultValueScope, Storage, RetrieveValueFirst); + FormLink = GetNextNode (&FormSet->FormListHead, FormLink); + } + } else if (SettingScope == SystemLevel) { + // + // Open all FormSet by locate HII packages. + // Initiliaze the maintain FormSet to store default data as back up data. + // + BackUpFormSet = gOldFormSet; + gOldFormSet = NULL; + + // + // Get all the Hii handles + // + HiiHandles = HiiGetHiiHandles (NULL); + ASSERT (HiiHandles != NULL); + + // + // Search for formset of each class type + // + for (Index = 0; HiiHandles[Index] != NULL; Index++) { + // + // Check HiiHandles[Index] does exist in global maintain list. + // + if (GetFormSetFromHiiHandle (HiiHandles[Index]) != NULL) { + continue; + } + + // + // Initilize FormSet Setting + // + LocalFormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET)); + ASSERT (LocalFormSet != NULL); + ZeroMem (&ZeroGuid, sizeof (ZeroGuid)); + Status = InitializeFormSet (HiiHandles[Index], &ZeroGuid, LocalFormSet, FALSE); + if (EFI_ERROR (Status) || IsListEmpty (&LocalFormSet->FormListHead)) { + DestroyFormSet (LocalFormSet); + continue; + } + Status = InitializeCurrentSetting (LocalFormSet); + if (EFI_ERROR (Status)) { + DestroyFormSet (LocalFormSet); + continue; + } + // + // Initilize Questions' Value + // + Status = LoadFormSetConfig (NULL, LocalFormSet); + if (EFI_ERROR (Status)) { + DestroyFormSet (LocalFormSet); + continue; + } + + // + // Add FormSet into the maintain list. + // + InsertTailList (&gBrowserFormSetList, &LocalFormSet->Link); + } + + // + // Free resources, and restore gOldFormSet and gClassOfVfr + // + FreePool (HiiHandles); + gOldFormSet = BackUpFormSet; + + // + // Set Default Value for each FormSet in the maintain list. + // + Link = GetFirstNode (&gBrowserFormSetList); + while (!IsNull (&gBrowserFormSetList, Link)) { + LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); + Link = GetNextNode (&gBrowserFormSetList, Link); + if (!ValidateFormSet(LocalFormSet)) { + continue; } + ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, GetDefaultValueScope, Storage, RetrieveValueFirst); } - FormLink = GetNextNode (&FormSet->FormListHead, FormLink); } return EFI_SUCCESS; @@ -2608,6 +3327,7 @@ ExtractFormSetDefault ( @param Selection Selection contains the information about the Selection, form and formset to be displayed. Selection action may be updated in retrieve callback. + If Selection is NULL, only initialize Question value. @param FormSet FormSet data structure. @param Form Form data structure. @@ -2634,7 +3354,7 @@ LoadFormConfig ( // // Initialize local copy of Value for each Question // - Status = GetQuestionValue (FormSet, Form, Question, TRUE); + Status = GetQuestionValue (FormSet, Form, Question, GetSetValueWithEditBuffer); if (EFI_ERROR (Status)) { return Status; } @@ -2644,25 +3364,10 @@ LoadFormConfig ( } // - // According the spec, ref opcode try to get value from call back with "retrieve" type. - // - if ((Question->Operand == EFI_IFR_REF_OP) && (FormSet->ConfigAccess != NULL)) { - Status = ProcessCallBackFunction(Selection, Question, EFI_BROWSER_ACTION_RETRIEVE, TRUE); - if (EFI_ERROR (Status)) { - return Status; - } - } - - // - // Check whether EfiVarstore with CallBack can be got. + // Call the Retrieve call back function for all questions. // - if ((FormSet->ConfigAccess != NULL) && - (Selection->Action != UI_ACTION_REFRESH_FORMSET) && - (Question->QuestionId != 0) && - (Question->Storage != NULL) && - (Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) && + if ((FormSet->ConfigAccess != NULL) && (Selection != NULL) && ((Question->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK)) { - // // Check QuestionValue does exist. // @@ -2672,17 +3377,21 @@ LoadFormConfig ( } else { BufferValue = (UINT8 *) &Question->HiiValue.Value; } - Status = gRT->GetVariable ( - Question->VariableName, - &Question->Storage->Guid, - NULL, - &StorageWidth, - BufferValue - ); - if (!EFI_ERROR (Status)) { - Status = ProcessCallBackFunction(Selection, Question, EFI_BROWSER_ACTION_RETRIEVE, TRUE); + // + // For efivarstore storage, initial question value first. + // + if ((Question->Storage != NULL) && (Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) { + Status = gRT->GetVariable ( + Question->VariableName, + &Question->Storage->Guid, + NULL, + &StorageWidth, + BufferValue + ); } + + Status = ProcessCallBackFunction(Selection, Question, EFI_BROWSER_ACTION_RETRIEVE, TRUE); } Link = GetNextNode (&Form->StatementListHead, Link); @@ -2697,6 +3406,7 @@ LoadFormConfig ( @param Selection Selection contains the information about the Selection, form and formset to be displayed. Selection action may be updated in retrieve callback. + If Selection is NULL, only initialize Question value. @param FormSet FormSet data structure. @retval EFI_SUCCESS The function completed successfully. @@ -2716,18 +3426,331 @@ LoadFormSetConfig ( while (!IsNull (&FormSet->FormListHead, Link)) { Form = FORM_BROWSER_FORM_FROM_LINK (Link); - // - // Initialize local copy of Value for each Form - // - Status = LoadFormConfig (Selection, FormSet, Form); - if (EFI_ERROR (Status)) { - return Status; + // + // Initialize local copy of Value for each Form + // + Status = LoadFormConfig (Selection, FormSet, Form); + if (EFI_ERROR (Status)) { + return Status; + } + + Link = GetNextNode (&FormSet->FormListHead, Link); + } + + return EFI_SUCCESS; +} + +/** + Remove the Request element from the Config Request. + + @param Storage Pointer to the browser storage. + @param RequestElement The pointer to the Request element. + +**/ +VOID +RemoveElement ( + IN OUT BROWSER_STORAGE *Storage, + IN CHAR16 *RequestElement + ) +{ + CHAR16 *NewStr; + CHAR16 *DestStr; + + ASSERT (Storage->ConfigRequest != NULL && RequestElement != NULL); + + NewStr = StrStr (Storage->ConfigRequest, RequestElement); + + if (NewStr == NULL) { + return; + } + + // + // Remove this element from this ConfigRequest. + // + DestStr = NewStr; + NewStr += StrLen (RequestElement); + CopyMem (DestStr, NewStr, StrSize (NewStr)); + + Storage->SpareStrLen += StrLen (RequestElement); +} + +/** + Adjust config request in storage, remove the request elements existed in the input ConfigRequest. + + @param Storage Pointer to the browser storage. + @param ConfigRequest The pointer to the Request element. + +**/ +VOID +RemoveConfigRequest ( + BROWSER_STORAGE *Storage, + CHAR16 *ConfigRequest + ) +{ + CHAR16 *RequestElement; + CHAR16 *NextRequestElement; + CHAR16 *SearchKey; + + if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + // + // "&Name1&Name2" section for EFI_HII_VARSTORE_NAME_VALUE storage + // + SearchKey = L"&"; + } else { + // + // "&OFFSET=####&WIDTH=####" section for EFI_HII_VARSTORE_BUFFER storage + // + SearchKey = L"&OFFSET"; + } + + // + // Find SearchKey storage + // + if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + RequestElement = StrStr (ConfigRequest, L"PATH"); + ASSERT (RequestElement != NULL); + RequestElement = StrStr (RequestElement, SearchKey); + } else { + RequestElement = StrStr (ConfigRequest, SearchKey); + } + + while (RequestElement != NULL) { + // + // +1 to avoid find header itself. + // + NextRequestElement = StrStr (RequestElement + 1, SearchKey); + + // + // The last Request element in configRequest string. + // + if (NextRequestElement != NULL) { + // + // Replace "&" with '\0'. + // + *NextRequestElement = L'\0'; + } + + RemoveElement (Storage, RequestElement); + + if (NextRequestElement != NULL) { + // + // Restore '&' with '\0' for later used. + // + *NextRequestElement = L'&'; + } + + RequestElement = NextRequestElement; + } + + // + // If no request element remain, just remove the ConfigRequest string. + // + if (StrCmp (Storage->ConfigRequest, Storage->ConfigHdr) == 0) { + FreePool (Storage->ConfigRequest); + Storage->ConfigRequest = NULL; + Storage->SpareStrLen = 0; + } +} + +/** + Base on the current formset info, clean the ConfigRequest string in browser storage. + + @param FormSet Pointer of the FormSet + +**/ +VOID +CleanBrowserStorage ( + IN OUT FORM_BROWSER_FORMSET *FormSet + ) +{ + LIST_ENTRY *Link; + FORMSET_STORAGE *Storage; + + Link = GetFirstNode (&FormSet->StorageListHead); + while (!IsNull (&FormSet->StorageListHead, Link)) { + Storage = FORMSET_STORAGE_FROM_LINK (Link); + Link = GetNextNode (&FormSet->StorageListHead, Link); + + if ((Storage->BrowserStorage->Type != EFI_HII_VARSTORE_BUFFER) && + (Storage->BrowserStorage->Type != EFI_HII_VARSTORE_NAME_VALUE)) { + continue; + } + + if (Storage->ConfigRequest == NULL || Storage->BrowserStorage->ConfigRequest == NULL) { + continue; + } + + RemoveConfigRequest (Storage->BrowserStorage, Storage->ConfigRequest); + } +} + +/** + Check whether current element in the ConfigReqeust string. + + @param BrowserStorage Storage which includes ConfigReqeust. + @param RequestElement New element need to check. + + @retval TRUE The Element is in the ConfigReqeust string. + @retval FALSE The Element not in the configReqeust String. + +**/ +BOOLEAN +ElementValidation ( + BROWSER_STORAGE *BrowserStorage, + CHAR16 *RequestElement + ) +{ + return StrStr (BrowserStorage->ConfigRequest, RequestElement) != NULL ? TRUE : FALSE; +} + +/** + Append the Request element to the Config Request. + + @param ConfigRequest Current ConfigRequest info. + @param SpareStrLen Current remain free buffer for config reqeust. + @param RequestElement New Request element. + +**/ +VOID +AppendConfigRequest ( + IN OUT CHAR16 **ConfigRequest, + IN OUT UINTN *SpareStrLen, + IN CHAR16 *RequestElement + ) +{ + CHAR16 *NewStr; + UINTN StringSize; + UINTN StrLength; + + StrLength = StrLen (RequestElement); + + // + // Append to + // + if (StrLength > *SpareStrLen) { + // + // Old String buffer is not sufficient for RequestElement, allocate a new one + // + StringSize = (*ConfigRequest != NULL) ? StrSize (*ConfigRequest) : sizeof (CHAR16); + NewStr = AllocateZeroPool (StringSize + CONFIG_REQUEST_STRING_INCREMENTAL * sizeof (CHAR16)); + ASSERT (NewStr != NULL); + + if (*ConfigRequest != NULL) { + CopyMem (NewStr, *ConfigRequest, StringSize); + FreePool (*ConfigRequest); + } + *ConfigRequest = NewStr; + *SpareStrLen = CONFIG_REQUEST_STRING_INCREMENTAL; + } + + StrCat (*ConfigRequest, RequestElement); + *SpareStrLen -= StrLength; +} + +/** + Adjust the config request info, remove the request elements which already in AllConfigRequest string. + + @param Storage Form set Storage. + @param ConfigRequest Return the ConfigRequest info. + + @retval TRUE Has element not covered by current used elements, need to continue to call ExtractConfig + @retval FALSE All elements covered by current used elements. + +**/ +BOOLEAN +ConfigRequestAdjust ( + IN FORMSET_STORAGE *Storage, + OUT CHAR16 **ConfigRequest + ) +{ + CHAR16 *RequestElement; + CHAR16 *NextRequestElement; + CHAR16 *RetBuf; + UINTN SpareBufLen; + CHAR16 *SearchKey; + BOOLEAN RetVal; + + SpareBufLen = 0; + RetBuf = NULL; + RetVal = FALSE; + + if (Storage->BrowserStorage->ConfigRequest == NULL) { + Storage->BrowserStorage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigRequest), Storage->ConfigRequest); + *ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigRequest), Storage->ConfigRequest); + return TRUE; + } + + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + // + // "&Name1&Name2" section for EFI_HII_VARSTORE_NAME_VALUE storage + // + SearchKey = L"&"; + } else { + // + // "&OFFSET=####&WIDTH=####" section for EFI_HII_VARSTORE_BUFFER storage + // + SearchKey = L"&OFFSET"; + } + + // + // Prepare the config header. + // + RetBuf = AllocateCopyPool(StrSize (Storage->BrowserStorage->ConfigHdr), Storage->BrowserStorage->ConfigHdr); + ASSERT (RetBuf != NULL); + + // + // Find SearchKey storage + // + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) { + RequestElement = StrStr (Storage->ConfigRequest, L"PATH"); + ASSERT (RequestElement != NULL); + RequestElement = StrStr (RequestElement, SearchKey); + } else { + RequestElement = StrStr (Storage->ConfigRequest, SearchKey); + } + + while (RequestElement != NULL) { + // + // +1 to avoid find header itself. + // + NextRequestElement = StrStr (RequestElement + 1, SearchKey); + + // + // The last Request element in configRequest string. + // + if (NextRequestElement != NULL) { + // + // Replace "&" with '\0'. + // + *NextRequestElement = L'\0'; + } + + if (!ElementValidation (Storage->BrowserStorage, RequestElement)) { + // + // Add this element to the Storage->BrowserStorage->AllRequestElement. + // + AppendConfigRequest(&Storage->BrowserStorage->ConfigRequest, &Storage->BrowserStorage->SpareStrLen, RequestElement); + AppendConfigRequest (&RetBuf, &SpareBufLen, RequestElement); + RetVal = TRUE; + } + + if (NextRequestElement != NULL) { + // + // Restore '&' with '\0' for later used. + // + *NextRequestElement = L'&'; } - Link = GetNextNode (&FormSet->FormListHead, Link); + RequestElement = NextRequestElement; } - return EFI_SUCCESS; + if (RetVal) { + *ConfigRequest = RetBuf; + } else { + FreePool (RetBuf); + } + + return RetVal; } /** @@ -2749,11 +3772,29 @@ LoadStorage ( EFI_STRING Progress; EFI_STRING Result; CHAR16 *StrPtr; + CHAR16 *ConfigRequest; - if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) { return EFI_SUCCESS; } + if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) { + Status = EFI_SUCCESS; + // + // EFI varstore data all get from variable, so no need to get again. + // + if (Storage->BrowserStorage->ReferenceCount == 1) { + Status = gRT->GetVariable ( + Storage->BrowserStorage->Name, + &Storage->BrowserStorage->Guid, + NULL, + (UINTN*)&Storage->BrowserStorage->Size, + Storage->BrowserStorage->EditBuffer + ); + } + return Status; + } + if (FormSet->ConfigAccess == NULL) { return EFI_NOT_FOUND; } @@ -2765,15 +3806,25 @@ LoadStorage ( return EFI_SUCCESS; } + // + // Adjust the ConfigRequest string, only the field not saved in BrowserStorage->AllConfig + // will used to call ExtractConfig. + // + if (!ConfigRequestAdjust(Storage, &ConfigRequest)) { + return EFI_SUCCESS; + } + // // Request current settings from Configuration Driver // Status = FormSet->ConfigAccess->ExtractConfig ( FormSet->ConfigAccess, - Storage->ConfigRequest, + ConfigRequest, &Progress, &Result ); + FreePool (ConfigRequest); + if (EFI_ERROR (Status)) { return Status; } @@ -2781,67 +3832,16 @@ LoadStorage ( // // Convert Result from to // - StrPtr = StrStr (Result, L"ALTCFG"); + StrPtr = StrStr (Result, L"&GUID="); if (StrPtr != NULL) { *StrPtr = L'\0'; } - Status = ConfigRespToStorage (Storage, Result); + Status = ConfigRespToStorage (Storage->BrowserStorage, Result); FreePool (Result); return Status; } - -/** - Copy uncommitted data from source Storage to destination Storage. - - @param Dst Target Storage for uncommitted data. - @param Src Source Storage for uncommitted data. - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Source and destination Storage is not the same type. - -**/ -EFI_STATUS -CopyStorage ( - IN OUT FORMSET_STORAGE *Dst, - IN FORMSET_STORAGE *Src - ) -{ - LIST_ENTRY *Link; - NAME_VALUE_NODE *Node; - - if ((Dst->Type != Src->Type) || (Dst->Size != Src->Size)) { - return EFI_INVALID_PARAMETER; - } - - switch (Src->Type) { - case EFI_HII_VARSTORE_BUFFER: - CopyMem (Dst->EditBuffer, Src->EditBuffer, Src->Size); - CopyMem (Dst->Buffer, Src->Buffer, Src->Size); - break; - - case EFI_HII_VARSTORE_NAME_VALUE: - Link = GetFirstNode (&Src->NameValueListHead); - while (!IsNull (&Src->NameValueListHead, Link)) { - Node = NAME_VALUE_NODE_FROM_LINK (Link); - - SetValueByName (Dst, Node->Name, Node->EditValue, TRUE); - SetValueByName (Dst, Node->Name, Node->Value, FALSE); - - Link = GetNextNode (&Src->NameValueListHead, Link); - } - break; - - case EFI_HII_VARSTORE_EFI_VARIABLE: - default: - break; - } - - return EFI_SUCCESS; -} - - /** Get current setting of Questions. @@ -2865,12 +3865,9 @@ InitializeCurrentSetting ( EFI_STATUS Status; // - // Extract default from IFR binary - // - Status = ExtractFormSetDefault (FormSet, EFI_HII_DEFAULT_CLASS_STANDARD); - if (EFI_ERROR (Status)) { - return Status; - } + // Extract default from IFR binary for no storage questions. + // + ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE); // // Request current settings from Configuration Driver @@ -2897,23 +3894,30 @@ InitializeCurrentSetting ( } } + // + // Storage is not found in backup formset and current global storage not has other driver used, + // request it from ConfigDriver + // if (OldStorage == NULL) { - // - // Storage is not found in backup formset, request it from ConfigDriver - // Status = LoadStorage (FormSet, Storage); - // - // Now Edit Buffer is filled with default values(lower priority) and current - // settings(higher priority), sychronize it to shadow Buffer - // - if (!EFI_ERROR (Status)) { - SynchronizeStorage (Storage); + + if (EFI_ERROR (Status)) { + // + // If get last time changed value failed, extract default from IFR binary + // + ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForStorage, Storage->BrowserStorage, TRUE); + // + // ExtractDefault will set the NV flag to TRUE, so need this function to clean the flag + // in current situation. + // + UpdateNvInfoInForm (FormSet, FALSE); } - } else { + // - // Storage found in backup formset, use it + // Now Edit Buffer is filled with default values(lower priority) or current + // settings(higher priority), sychronize it to shadow Buffer // - Status = CopyStorage (Storage, OldStorage); + SynchronizeStorage (Storage->BrowserStorage, TRUE); } Link = GetNextNode (&FormSet->StorageListHead, Link); @@ -2923,23 +3927,23 @@ InitializeCurrentSetting ( // If has old formset, get the old nv update status. // if (gOldFormSet != NULL) { - Link = GetFirstNode (&FormSet->FormListHead); - while (!IsNull (&FormSet->FormListHead, Link)) { - Form = FORM_BROWSER_FORM_FROM_LINK (Link); - - Link2 = GetFirstNode (&gOldFormSet->FormListHead); - while (!IsNull (&gOldFormSet->FormListHead, Link2)) { - Form2 = FORM_BROWSER_FORM_FROM_LINK (Link2); + Link = GetFirstNode (&FormSet->FormListHead); + while (!IsNull (&FormSet->FormListHead, Link)) { + Form = FORM_BROWSER_FORM_FROM_LINK (Link); - if (Form->FormId == Form2->FormId) { - Form->NvUpdateRequired = Form2->NvUpdateRequired; - break; - } + Link2 = GetFirstNode (&gOldFormSet->FormListHead); + while (!IsNull (&gOldFormSet->FormListHead, Link2)) { + Form2 = FORM_BROWSER_FORM_FROM_LINK (Link2); - Link2 = GetNextNode (&gOldFormSet->FormListHead, Link2); + if (Form->FormId == Form2->FormId) { + Form->NvUpdateRequired = Form2->NvUpdateRequired; + break; } - Link = GetNextNode (&FormSet->FormListHead, Link); + + Link2 = GetNextNode (&gOldFormSet->FormListHead, Link2); } + Link = GetNextNode (&FormSet->FormListHead, Link); + } } return EFI_SUCCESS; @@ -2995,8 +3999,8 @@ GetIfrBinaryData ( // // if FormSetGuid is NULL or zero GUID, return first Setup FormSet in the package list // - if (FormSetGuid == NULL || CompareGuid (FormSetGuid, &gZeroGuid)) { - ComparingGuid = &gEfiHiiPlatformSetupFormsetGuid; + if (FormSetGuid == NULL) { + ComparingGuid = &gZeroGuid; } else { ComparingGuid = FormSetGuid; } @@ -3042,7 +4046,8 @@ GetIfrBinaryData ( // // Try to compare against formset GUID // - if (CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) { + if (CompareGuid (FormSetGuid, &gZeroGuid) || + CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) { break; } @@ -3089,7 +4094,7 @@ GetIfrBinaryData ( return EFI_NOT_FOUND; } - if (ClassGuidMatch && (FormSetGuid != NULL)) { + if (FormSetGuid != NULL) { // // Return the FormSet GUID // @@ -3124,6 +4129,7 @@ GetIfrBinaryData ( found in package list. On output, GUID of the formset found(if not NULL). @param FormSet FormSet data structure. + @param UpdateGlobalVar Whether need to update the global variable. @retval EFI_SUCCESS The function completed successfully. @retval EFI_NOT_FOUND The specified FormSet could not be found. @@ -3133,7 +4139,8 @@ EFI_STATUS InitializeFormSet ( IN EFI_HII_HANDLE Handle, IN OUT EFI_GUID *FormSetGuid, - OUT FORM_BROWSER_FORMSET *FormSet + OUT FORM_BROWSER_FORMSET *FormSet, + IN BOOLEAN UpdateGlobalVar ) { EFI_STATUS Status; @@ -3145,6 +4152,7 @@ InitializeFormSet ( return Status; } + FormSet->Signature = FORM_BROWSER_FORMSET_SIGNATURE; FormSet->HiiHandle = Handle; CopyMem (&FormSet->Guid, FormSetGuid, sizeof (EFI_GUID)); @@ -3177,6 +4185,13 @@ InitializeFormSet ( return Status; } + // + // If not need to update the global variable, just return. + // + if (!UpdateGlobalVar) { + return Status; + } + // // Set VFR type by FormSet SubClass field // @@ -3195,8 +4210,11 @@ InitializeFormSet ( } } + gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING; + if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) { gFrontPageHandle = FormSet->HiiHandle; + gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING; } // @@ -3208,20 +4226,10 @@ InitializeFormSet ( // Update the function key setting. // gFunctionKeySetting = gFunctionKeySettingTable[Index].KeySetting; - // - // Function key prompt can not be displayed if the function key has been disabled. - // - if ((gFunctionKeySetting & FUNCTION_NINE) != FUNCTION_NINE) { - gFunctionNineString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle); - } - - if ((gFunctionKeySetting & FUNCTION_TEN) != FUNCTION_TEN) { - gFunctionTenString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle); - } } } - return Status; + return EFI_SUCCESS; } @@ -3259,13 +4267,10 @@ SaveBrowserContext ( Context->FunctionKeySetting = gFunctionKeySetting; Context->ResetRequired = gResetRequired; Context->Direction = gDirection; - Context->FunctionNineString = gFunctionNineString; - Context->FunctionTenString = gFunctionTenString; Context->EnterString = gEnterString; Context->EnterCommitString = gEnterCommitString; Context->EnterEscapeString = gEnterEscapeString; Context->EscapeString = gEscapeString; - Context->SaveFailed = gSaveFailed; Context->MoveHighlight = gMoveHighlight; Context->MakeSelection = gMakeSelection; Context->DecNumericInput = gDecNumericInput; @@ -3294,6 +4299,7 @@ SaveBrowserContext ( Context->HelpBlockWidth = gHelpBlockWidth; Context->OldFormSet = gOldFormSet; Context->MenuRefreshHead = gMenuRefreshHead; + Context->ProtocolNotFound = gProtocolNotFound; CopyMem (&Context->ScreenDimensions, &gScreenDimensions, sizeof (gScreenDimensions)); CopyMem (&Context->MenuOption, &gMenuOption, sizeof (gMenuOption)); @@ -3339,13 +4345,10 @@ RestoreBrowserContext ( gFunctionKeySetting = Context->FunctionKeySetting; gResetRequired = Context->ResetRequired; gDirection = Context->Direction; - gFunctionNineString = Context->FunctionNineString; - gFunctionTenString = Context->FunctionTenString; gEnterString = Context->EnterString; gEnterCommitString = Context->EnterCommitString; gEnterEscapeString = Context->EnterEscapeString; gEscapeString = Context->EscapeString; - gSaveFailed = Context->SaveFailed; gMoveHighlight = Context->MoveHighlight; gMakeSelection = Context->MakeSelection; gDecNumericInput = Context->DecNumericInput; @@ -3374,6 +4377,7 @@ RestoreBrowserContext ( gHelpBlockWidth = Context->HelpBlockWidth; gOldFormSet = Context->OldFormSet; gMenuRefreshHead = Context->MenuRefreshHead; + gProtocolNotFound = Context->ProtocolNotFound; CopyMem (&gScreenDimensions, &Context->ScreenDimensions, sizeof (gScreenDimensions)); CopyMem (&gMenuOption, &Context->MenuOption, sizeof (gMenuOption)); @@ -3384,3 +4388,339 @@ RestoreBrowserContext ( RemoveEntryList (&Context->Link); gBS->FreePool (Context); } + +/** + Find the matched FormSet context in the backup maintain list based on HiiHandle. + + @param Handle The Hii Handle. + + @return the found FormSet context. If no found, NULL will return. + +**/ +FORM_BROWSER_FORMSET * +GetFormSetFromHiiHandle ( + EFI_HII_HANDLE Handle + ) +{ + LIST_ENTRY *Link; + FORM_BROWSER_FORMSET *FormSet; + + Link = GetFirstNode (&gBrowserFormSetList); + while (!IsNull (&gBrowserFormSetList, Link)) { + FormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); + Link = GetNextNode (&gBrowserFormSetList, Link); + if (!ValidateFormSet(FormSet)) { + continue; + } + if (FormSet->HiiHandle == Handle) { + return FormSet; + } + } + + return NULL; +} + +/** + Check whether the input HII handle is the FormSet that is being used. + + @param Handle The Hii Handle. + + @retval TRUE HII handle is being used. + @retval FALSE HII handle is not being used. + +**/ +BOOLEAN +IsHiiHandleInBrowserContext ( + EFI_HII_HANDLE Handle + ) +{ + LIST_ENTRY *Link; + BROWSER_CONTEXT *Context; + + // + // HiiHandle is Current FormSet. + // + if ((gOldFormSet != NULL) && (gOldFormSet->HiiHandle == Handle)) { + return TRUE; + } + + // + // Check whether HiiHandle is in BrowserContext. + // + Link = GetFirstNode (&gBrowserContextList); + while (!IsNull (&gBrowserContextList, Link)) { + Context = BROWSER_CONTEXT_FROM_LINK (Link); + if (Context->OldFormSet->HiiHandle == Handle) { + // + // HiiHandle is in BrowserContext + // + return TRUE; + } + Link = GetNextNode (&gBrowserContextList, Link); + } + + return FALSE; +} + +/** + Find the registered HotKey based on KeyData. + + @param[in] KeyData A pointer to a buffer that describes the keystroke + information for the hot key. + + @return The registered HotKey context. If no found, NULL will return. +**/ +BROWSER_HOT_KEY * +GetHotKeyFromRegisterList ( + IN EFI_INPUT_KEY *KeyData + ) +{ + LIST_ENTRY *Link; + BROWSER_HOT_KEY *HotKey; + + Link = GetFirstNode (&gBrowserHotKeyList); + while (!IsNull (&gBrowserHotKeyList, Link)) { + HotKey = BROWSER_HOT_KEY_FROM_LINK (Link); + if (HotKey->KeyData->ScanCode == KeyData->ScanCode) { + return HotKey; + } + Link = GetNextNode (&gBrowserHotKeyList, Link); + } + + return NULL; +} + +/** + Configure what scope the hot key will impact. + All hot keys have the same scope. The mixed hot keys with the different level are not supported. + If no scope is set, the default scope will be FormSet level. + After all registered hot keys are removed, previous Scope can reset to another level. + + @param[in] Scope Scope level to be set. + + @retval EFI_SUCCESS Scope is set correctly. + @retval EFI_INVALID_PARAMETER Scope is not the valid value specified in BROWSER_SETTING_SCOPE. + @retval EFI_UNSPPORTED Scope level is different from current one that the registered hot keys have. + +**/ +EFI_STATUS +EFIAPI +SetScope ( + IN BROWSER_SETTING_SCOPE Scope + ) +{ + if (Scope >= MaxLevel) { + return EFI_INVALID_PARAMETER; + } + + // + // When no hot key registered in system or on the first setting, + // Scope can be set. + // + if (mBrowserScopeFirstSet || IsListEmpty (&gBrowserHotKeyList)) { + gBrowserSettingScope = Scope; + mBrowserScopeFirstSet = FALSE; + } else if (Scope != gBrowserSettingScope) { + return EFI_UNSUPPORTED; + } + + return EFI_SUCCESS; +} + +/** + Register the hot key with its browser action, or unregistered the hot key. + Only support hot key that is not printable character (control key, function key, etc.). + If the action value is zero, the hot key will be unregistered if it has been registered. + If the same hot key has been registered, the new action and help string will override the previous ones. + + @param[in] KeyData A pointer to a buffer that describes the keystroke + information for the hot key. Its type is EFI_INPUT_KEY to + be supported by all ConsoleIn devices. + @param[in] Action Action value that describes what action will be trigged when the hot key is pressed. + @param[in] DefaultId Specifies the type of defaults to retrieve, which is only for DEFAULT action. + @param[in] HelpString Help string that describes the hot key information. + Its value may be NULL for the unregistered hot key. + + @retval EFI_SUCCESS Hot key is registered or unregistered. + @retval EFI_INVALID_PARAMETER KeyData is NULL or HelpString is NULL on register. + @retval EFI_NOT_FOUND KeyData is not found to be unregistered. + @retval EFI_UNSUPPORTED Key represents a printable character. It is conflicted with Browser. +**/ +EFI_STATUS +EFIAPI +RegisterHotKey ( + IN EFI_INPUT_KEY *KeyData, + IN UINT32 Action, + IN UINT16 DefaultId, + IN EFI_STRING HelpString OPTIONAL + ) +{ + BROWSER_HOT_KEY *HotKey; + + // + // Check input parameters. + // + if (KeyData == NULL || KeyData->UnicodeChar != CHAR_NULL || + (Action != BROWSER_ACTION_UNREGISTER && HelpString == NULL)) { + return EFI_INVALID_PARAMETER; + } + + // + // Check whether the input KeyData is in BrowserHotKeyList. + // + HotKey = GetHotKeyFromRegisterList (KeyData); + + // + // Unregister HotKey + // + if (Action == BROWSER_ACTION_UNREGISTER) { + if (HotKey != NULL) { + // + // The registered HotKey is found. + // Remove it from List, and free its resource. + // + RemoveEntryList (&HotKey->Link); + FreePool (HotKey->KeyData); + FreePool (HotKey->HelpString); + return EFI_SUCCESS; + } else { + // + // The registered HotKey is not found. + // + return EFI_NOT_FOUND; + } + } + + // + // Register HotKey into List. + // + if (HotKey == NULL) { + // + // Create new Key, and add it into List. + // + HotKey = AllocateZeroPool (sizeof (BROWSER_HOT_KEY)); + ASSERT (HotKey != NULL); + HotKey->Signature = BROWSER_HOT_KEY_SIGNATURE; + HotKey->KeyData = AllocateCopyPool (sizeof (EFI_INPUT_KEY), KeyData); + InsertTailList (&gBrowserHotKeyList, &HotKey->Link); + } + + // + // Fill HotKey information. + // + HotKey->Action = Action; + HotKey->DefaultId = DefaultId; + if (HotKey->HelpString != NULL) { + FreePool (HotKey->HelpString); + } + HotKey->HelpString = AllocateCopyPool (StrSize (HelpString), HelpString); + + return EFI_SUCCESS; +} + +/** + Register Exit handler function. + When more than one handler function is registered, the latter one will override the previous one. + When NULL handler is specified, the previous Exit handler will be unregistered. + + @param[in] Handler Pointer to handler function. + +**/ +VOID +EFIAPI +RegiserExitHandler ( + IN EXIT_HANDLER Handler + ) +{ + ExitHandlerFunction = Handler; + return; +} + +/** + Create reminder to let user to choose save or discard the changed browser data. + Caller can use it to actively check the changed browser data. + + @retval BROWSER_NO_CHANGES No browser data is changed. + @retval BROWSER_SAVE_CHANGES The changed browser data is saved. + @retval BROWSER_DISCARD_CHANGES The changed browser data is discard. + +**/ +UINT32 +EFIAPI +SaveReminder ( + VOID + ) +{ + LIST_ENTRY *Link; + FORM_BROWSER_FORMSET *FormSet; + BOOLEAN IsDataChanged; + UINT32 DataSavedAction; + CHAR16 *YesResponse; + CHAR16 *NoResponse; + CHAR16 *EmptyString; + CHAR16 *ChangeReminderString; + CHAR16 *SaveConfirmString; + EFI_INPUT_KEY Key; + + DataSavedAction = BROWSER_NO_CHANGES; + IsDataChanged = FALSE; + Link = GetFirstNode (&gBrowserFormSetList); + while (!IsNull (&gBrowserFormSetList, Link)) { + FormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); + Link = GetNextNode (&gBrowserFormSetList, Link); + if (!ValidateFormSet(FormSet)) { + continue; + } + if (IsNvUpdateRequired (FormSet)) { + IsDataChanged = TRUE; + break; + } + } + + // + // No data is changed. No save is required. + // + if (!IsDataChanged) { + return DataSavedAction; + } + + // + // If data is changed, prompt user + // + gST->ConIn->ReadKeyStroke (gST->ConIn, &Key); + + YesResponse = GetToken (STRING_TOKEN (ARE_YOU_SURE_YES), gHiiHandle); + ASSERT (YesResponse != NULL); + NoResponse = GetToken (STRING_TOKEN (ARE_YOU_SURE_NO), gHiiHandle); + ASSERT (NoResponse != NULL); + EmptyString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle); + ChangeReminderString = GetToken (STRING_TOKEN (CHANGE_REMINDER), gHiiHandle); + SaveConfirmString = GetToken (STRING_TOKEN (SAVE_CONFIRM), gHiiHandle); + + do { + CreateDialog (4, TRUE, 0, NULL, &Key, EmptyString, ChangeReminderString, SaveConfirmString, EmptyString); + } while + (((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (NoResponse[0] | UPPER_LOWER_CASE_OFFSET)) && + ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (YesResponse[0] | UPPER_LOWER_CASE_OFFSET)) + ); + + // + // If the user hits the YesResponse key + // + if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse[0] | UPPER_LOWER_CASE_OFFSET)) { + SubmitForm (NULL, NULL, SystemLevel); + DataSavedAction = BROWSER_SAVE_CHANGES; + } else { + DiscardForm (NULL, NULL, SystemLevel); + DataSavedAction = BROWSER_DISCARD_CHANGES; + gResetRequired = FALSE; + } + + FreePool (YesResponse); + FreePool (NoResponse); + FreePool (EmptyString); + FreePool (SaveConfirmString); + FreePool (ChangeReminderString); + + return DataSavedAction; +}