/** @file\r
Entry and initialization module for the browser.\r
\r
-Copyright (c) 2007 - 2008, Intel Corporation\r
+Copyright (c) 2007 - 2009, Intel Corporation\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
{\r
SendForm,\r
BrowserCallback\r
- },\r
- {\r
- UnicodeVSPrint\r
}\r
};\r
\r
EFI_HII_STRING_PROTOCOL *mHiiString;\r
EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting;\r
\r
-BANNER_DATA *BannerData;\r
-EFI_HII_HANDLE FrontPageHandle;\r
+UINTN gBrowserContextCount = 0;\r
+LIST_ENTRY gBrowserContextList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserContextList);\r
+\r
+BANNER_DATA *gBannerData;\r
+EFI_HII_HANDLE gFrontPageHandle;\r
UINTN gClassOfVfr;\r
UINTN gFunctionKeySetting;\r
BOOLEAN gResetRequired;\r
BOOLEAN gNvUpdateRequired;\r
EFI_HII_HANDLE gHiiHandle;\r
-BOOLEAN gFirstIn;\r
UINT16 gDirection;\r
EFI_SCREEN_DESCRIPTOR gScreenDimensions;\r
-BOOLEAN gUpArrow;\r
-BOOLEAN gDownArrow;\r
\r
//\r
// Browser Global Strings\r
//\r
-CHAR16 *gFunctionOneString;\r
-CHAR16 *gFunctionTwoString;\r
CHAR16 *gFunctionNineString;\r
CHAR16 *gFunctionTenString;\r
CHAR16 *gEnterString;\r
CHAR16 *gEnterCommitString;\r
+CHAR16 *gEnterEscapeString;\r
CHAR16 *gEscapeString;\r
CHAR16 *gSaveFailed;\r
CHAR16 *gMoveHighlight;\r
CHAR16 *gPlusString;\r
CHAR16 *gMinusString;\r
CHAR16 *gAdjustNumber;\r
+CHAR16 *gSaveChanges;\r
+CHAR16 *gOptionMismatch;\r
+\r
+CHAR16 *mUnknownString = L"!";\r
\r
CHAR16 gPromptBlockWidth;\r
CHAR16 gOptionBlockWidth;\r
0xab368524, 0xb60c, 0x495b, {0xa0, 0x9, 0x12, 0xe8, 0x5b, 0x1a, 0xea, 0x32}\r
};\r
\r
+FORM_BROWSER_FORMSET *gOldFormSet;\r
+\r
FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = {\r
//\r
// Boot Manager\r
@param FormId This field specifies which EFI_IFR_FORM to render as the first\r
displayable page. If this field has a value of 0x0000, then\r
the forms browser will render the specified forms in their encoded order.\r
- @param ScreenDimensions Points to recommended form dimensions, including any non-content area, in \r
+ @param ScreenDimensions Points to recommended form dimensions, including any non-content area, in\r
characters.\r
@param ActionRequest Points to the action recommended by the form.\r
\r
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- UI_MENU_SELECTION *Selection;\r
- UINTN Index;\r
- FORM_BROWSER_FORMSET *FormSet;\r
+ EFI_STATUS Status;\r
+ UI_MENU_SELECTION *Selection;\r
+ UINTN Index;\r
+ FORM_BROWSER_FORMSET *FormSet;\r
+\r
+ //\r
+ // Save globals used by SendForm()\r
+ //\r
+ SaveBrowserContext ();\r
\r
Status = EFI_SUCCESS;\r
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
if ((gScreenDimensions.RightColumn < ScreenDimensions->RightColumn) ||\r
(gScreenDimensions.BottomRow < ScreenDimensions->BottomRow)\r
) {\r
- return EFI_INVALID_PARAMETER;\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
} else {\r
//\r
// Local dimension validation.\r
) {\r
CopyMem (&gScreenDimensions, (VOID *) ScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
} else {\r
- return EFI_INVALID_PARAMETER;\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
}\r
}\r
}\r
InitializeBrowserStrings ();\r
\r
gFunctionKeySetting = DEFAULT_FUNCTION_KEY_SETTING;\r
- gClassOfVfr = EFI_SETUP_APPLICATION_SUBCLASS;\r
+ gClassOfVfr = FORMSET_CLASS_PLATFORM_SETUP;\r
\r
//\r
// Ensure we are in Text mode\r
//\r
- if (gFirstIn) {\r
- gFirstIn = FALSE;\r
- gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
- DisableQuietBoot ();\r
- }\r
+ gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
Selection = AllocateZeroPool (sizeof (UI_MENU_SELECTION));\r
Selection->FormId = FormId;\r
}\r
\r
+ gOldFormSet = NULL;\r
+ gNvUpdateRequired = FALSE;\r
+\r
do {\r
FormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET));\r
ASSERT (FormSet != NULL);\r
}\r
Selection->FormSet = FormSet;\r
\r
- //\r
- // Initialize current settings of Questions in this FormSet\r
- //\r
- Status = InitializeCurrentSetting (FormSet);\r
- if (EFI_ERROR (Status)) {\r
- DestroyFormSet (FormSet);\r
- break;\r
- }\r
-\r
//\r
// Display this formset\r
//\r
Status = SetupBrowser (Selection);\r
\r
gCurrentSelection = NULL;\r
- DestroyFormSet (FormSet);\r
\r
if (EFI_ERROR (Status)) {\r
break;\r
\r
} while (Selection->Action == UI_ACTION_REFRESH_FORMSET);\r
\r
- gBS->FreePool (Selection);\r
+ if (gOldFormSet != NULL) {\r
+ DestroyFormSet (gOldFormSet);\r
+ gOldFormSet = NULL;\r
+ }\r
+\r
+ FreePool (Selection);\r
}\r
\r
if (ActionRequest != NULL) {\r
gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
gST->ConOut->ClearScreen (gST->ConOut);\r
\r
+Done:\r
+ //\r
+ // Restore globals used by SendForm()\r
+ //\r
+ RestoreBrowserContext ();\r
+\r
return Status;\r
}\r
\r
if (*ResultsDataSize < BufferSize) {\r
*ResultsDataSize = BufferSize;\r
\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
return EFI_BUFFER_TOO_SMALL;\r
}\r
\r
*ResultsDataSize = BufferSize;\r
CopyMem (ResultsData, StrPtr, BufferSize);\r
\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
} else {\r
//\r
// Prepare <ConfigResp>\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_HANDLE HiiDriverHandle;\r
- EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
\r
//\r
// Locate required Hii relative protocols\r
//\r
// Publish our HII data\r
//\r
- Status = HiiLibCreateHiiDriverHandle (&HiiDriverHandle);\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- PackageList = HiiLibPreparePackageList (1, &gSetupBrowserGuid, SetupBrowserStrings);\r
- ASSERT (PackageList != NULL);\r
- Status = mHiiDatabase->NewPackageList (\r
- mHiiDatabase,\r
- PackageList,\r
- HiiDriverHandle,\r
- &gHiiHandle\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
+ gHiiHandle = HiiAddPackages (\r
+ &gSetupBrowserGuid,\r
+ ImageHandle,\r
+ SetupBrowserStrings,\r
+ NULL\r
+ );\r
+ ASSERT (gHiiHandle != NULL);\r
\r
//\r
// Initialize Driver private data\r
//\r
- gFirstIn = TRUE;\r
- BannerData = AllocateZeroPool (sizeof (BANNER_DATA));\r
- ASSERT (BannerData != NULL);\r
+ gBannerData = AllocateZeroPool (sizeof (BANNER_DATA));\r
+ ASSERT (gBannerData != NULL);\r
\r
//\r
// Install FormBrowser2 protocol\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
- //\r
- // Install Print protocol\r
- //\r
- Status = gBS->InstallProtocolInterface (\r
- &mPrivateData.Handle,\r
- &gEfiPrintProtocolGuid,\r
- EFI_NATIVE_INTERFACE,\r
- &mPrivateData.Print\r
- );\r
-\r
return Status;\r
}\r
\r
)\r
{\r
EFI_STRING_ID StringId;\r
- EFI_STATUS Status;\r
\r
- StringId = 0;\r
- Status = HiiLibNewString (HiiHandle, &StringId, String);\r
- ASSERT_EFI_ERROR (Status);\r
+ StringId = HiiSetString (HiiHandle, 0, String, NULL);\r
+ ASSERT (StringId != 0);\r
\r
return StringId;\r
}\r
CHAR16 NullChar;\r
\r
NullChar = CHAR_NULL;\r
- return HiiLibSetString (HiiHandle, StringId, &NullChar);\r
+ HiiSetString (HiiHandle, StringId, &NullChar, NULL);\r
+ return EFI_SUCCESS;\r
}\r
\r
\r
IN EFI_HII_HANDLE HiiHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR16 *String;\r
- UINTN BufferLength;\r
-\r
- //\r
- // Set default string size assumption at no more than 256 bytes\r
- //\r
- BufferLength = 0x100;\r
- String = AllocateZeroPool (BufferLength);\r
- ASSERT (String != NULL);\r
-\r
- Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
+ EFI_STRING String;\r
\r
- if (Status == EFI_BUFFER_TOO_SMALL) {\r
- gBS->FreePool (String);\r
- String = AllocateZeroPool (BufferLength);\r
+ String = HiiGetString (HiiHandle, Token, NULL);\r
+ if (String == NULL) {\r
+ String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString);\r
ASSERT (String != NULL);\r
-\r
- Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
}\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- return String;\r
+ return (CHAR16 *) String;\r
}\r
\r
\r
IN CHAR16 *Src\r
)\r
{\r
- SafeFreePool (*Dest);\r
+ if (*Dest != NULL) {\r
+ FreePool (*Dest);\r
+ }\r
*Dest = AllocateCopyPool (StrSize (Src), Src);\r
ASSERT (*Dest != NULL);\r
}\r
StrCpy (NewString, *Dest);\r
StrCat (NewString, Src);\r
\r
- gBS->FreePool (*Dest);\r
+ FreePool (*Dest);\r
*Dest = NewString;\r
}\r
\r
Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
\r
if (StrCmp (Name, Node->Name) == 0) {\r
- SafeFreePool (Node->EditValue);\r
+ if (Node->EditValue != NULL) {\r
+ FreePool (Node->EditValue);\r
+ }\r
Node->EditValue = AllocateCopyPool (StrSize (Value), Value);\r
ASSERT (Node->EditValue != NULL);\r
return EFI_SUCCESS;\r
CHAR16 *Progress;\r
CHAR16 *Result;\r
CHAR16 *Value;\r
+ CHAR16 *StringPtr;\r
UINTN Length;\r
+ UINTN Index;\r
+ UINTN LengthStr;\r
BOOLEAN IsBufferStorage;\r
BOOLEAN IsString;\r
+ CHAR16 TemStr[5];\r
+ UINT8 DigitUint8;\r
\r
Status = EFI_SUCCESS;\r
\r
return Status;\r
}\r
\r
+ LengthStr = StrLen (Value);\r
+ Status = EFI_SUCCESS;\r
if (IsString) {\r
//\r
// Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD"\r
+ // Add string tail char L'\0' into Length\r
//\r
- Length = StorageWidth + sizeof (CHAR16);\r
- Status = ConfigStringToUnicode ((CHAR16 *) Dst, &Length, Value);\r
+ Length = StorageWidth + sizeof (CHAR16);\r
+ if (Length < ((LengthStr / 4 + 1) * 2)) {\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ } else {\r
+ StringPtr = (CHAR16 *) Dst;\r
+ ZeroMem (TemStr, sizeof (TemStr));\r
+ for (Index = 0; Index < LengthStr; Index += 4) {\r
+ StrnCpy (TemStr, Value + Index, 4);\r
+ StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);\r
+ }\r
+ //\r
+ // Add tailing L'\0' character\r
+ //\r
+ StringPtr[Index/4] = L'\0';\r
+ }\r
} else {\r
- Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
+ if (StorageWidth < ((LengthStr + 1) / 2)) {\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ } else {\r
+ ZeroMem (TemStr, sizeof (TemStr));\r
+ for (Index = 0; Index < LengthStr; Index ++) {\r
+ TemStr[0] = Value[LengthStr - Index - 1];\r
+ DigitUint8 = (UINT8) StrHexToUint64 (TemStr);\r
+ if ((Index & 1) == 0) {\r
+ Dst [Index/2] = DigitUint8;\r
+ } else {\r
+ Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);\r
+ }\r
+ }\r
+ }\r
}\r
\r
- gBS->FreePool (Value);\r
+ FreePool (Value);\r
}\r
} else {\r
//\r
Value = Value + 6;\r
}\r
if (*Value != '=') {\r
- gBS->FreePool (Result);\r
+ FreePool (Result);\r
return EFI_NOT_FOUND;\r
}\r
//\r
// Skip '=', point to value\r
//\r
Value = Value + 1;\r
+\r
+ //\r
+ // Suppress <AltResp> if any\r
+ //\r
+ StringPtr = Value;\r
+ while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
+ StringPtr++;\r
+ }\r
+ *StringPtr = L'\0';\r
+\r
+ LengthStr = StrLen (Value);\r
+ Status = EFI_SUCCESS;\r
if (!IsBufferStorage && IsString) {\r
//\r
// Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD"\r
+ // Add string tail char L'\0' into Length\r
//\r
- Length = StorageWidth + sizeof (CHAR16);\r
- Status = ConfigStringToUnicode ((CHAR16 *) Dst, &Length, Value);\r
+ Length = StorageWidth + sizeof (CHAR16);\r
+ if (Length < ((LengthStr / 4 + 1) * 2)) {\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ } else {\r
+ StringPtr = (CHAR16 *) Dst;\r
+ ZeroMem (TemStr, sizeof (TemStr));\r
+ for (Index = 0; Index < LengthStr; Index += 4) {\r
+ StrnCpy (TemStr, Value + Index, 4);\r
+ StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);\r
+ }\r
+ //\r
+ // Add tailing L'\0' character\r
+ //\r
+ StringPtr[Index/4] = L'\0';\r
+ }\r
} else {\r
- Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
- if (EFI_ERROR (Status)) {\r
- gBS->FreePool (Result);\r
- return Status;\r
+ if (StorageWidth < ((LengthStr + 1) / 2)) {\r
+ Status = EFI_BUFFER_TOO_SMALL;\r
+ } else {\r
+ ZeroMem (TemStr, sizeof (TemStr));\r
+ for (Index = 0; Index < LengthStr; Index ++) {\r
+ TemStr[0] = Value[LengthStr - Index - 1];\r
+ DigitUint8 = (UINT8) StrHexToUint64 (TemStr);\r
+ if ((Index & 1) == 0) {\r
+ Dst [Index/2] = DigitUint8;\r
+ } else {\r
+ Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);\r
+ }\r
+ }\r
}\r
}\r
\r
+ if (EFI_ERROR (Status)) {\r
+ FreePool (Result);\r
+ return Status;\r
+ }\r
+\r
//\r
// Synchronize Edit Buffer\r
//\r
} else {\r
SetValueByName (Storage, Question->VariableName, Value);\r
}\r
- gBS->FreePool (Result);\r
+\r
+ FreePool (Result);\r
}\r
\r
return Status;\r
UINTN Length;\r
BOOLEAN IsBufferStorage;\r
BOOLEAN IsString;\r
+ UINT8 *TemBuffer;\r
+ CHAR16 *TemName;\r
+ CHAR16 *TemString;\r
+ UINTN Index;\r
\r
Status = EFI_SUCCESS;\r
\r
} else {\r
if (IsString) {\r
//\r
- // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
+ // Allocate enough string buffer.\r
//\r
Value = NULL;\r
BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16);\r
Value = AllocateZeroPool (BufferLen);\r
ASSERT (Value != NULL);\r
- Status = UnicodeToConfigString (Value, &BufferLen, (CHAR16 *) Src);\r
- ASSERT_EFI_ERROR (Status);\r
+ //\r
+ // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
+ //\r
+ TemName = (CHAR16 *) Src;\r
+ TemString = Value;\r
+ for (; *TemName != L'\0'; TemName++) {\r
+ TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4);\r
+ }\r
} else {\r
BufferLen = StorageWidth * 2 + 1;\r
Value = AllocateZeroPool (BufferLen * sizeof (CHAR16));\r
ASSERT (Value != NULL);\r
- BufToHexString (Value, &BufferLen, Src, StorageWidth);\r
- ToLower (Value);\r
+ //\r
+ // Convert Buffer to Hex String\r
+ //\r
+ TemBuffer = Src + StorageWidth - 1;\r
+ TemString = Value;\r
+ for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) {\r
+ TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2);\r
+ }\r
}\r
\r
Status = SetValueByName (Storage, Question->VariableName, Value);\r
- gBS->FreePool (Value);\r
+ FreePool (Value);\r
}\r
\r
if (!Cached) {\r
}\r
\r
Value = ConfigResp + StrLen (ConfigResp);\r
+\r
if (!IsBufferStorage && IsString) {\r
//\r
// Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
//\r
- BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16);\r
- Status = UnicodeToConfigString (Value, &BufferLen, (CHAR16 *) Src);\r
- ASSERT_EFI_ERROR (Status);\r
+ TemName = (CHAR16 *) Src;\r
+ TemString = Value;\r
+ for (; *TemName != L'\0'; TemName++) {\r
+ TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4);\r
+ }\r
} else {\r
- BufferLen = StorageWidth * 2 + 1;\r
- BufToHexString (Value, &BufferLen, Src, StorageWidth);\r
- ToLower (Value);\r
+ //\r
+ // Convert Buffer to Hex String\r
+ //\r
+ TemBuffer = Src + StorageWidth - 1;\r
+ TemString = Value;\r
+ for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) {\r
+ TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2);\r
+ }\r
+ }\r
+\r
+ //\r
+ // Convert to lower char.\r
+ //\r
+ for (TemString = Value; *Value != L'\0'; Value++) {\r
+ if (*Value >= L'A' && *Value <= L'Z') {\r
+ *Value = (CHAR16) (*Value - L'A' + L'a');\r
+ }\r
}\r
\r
//\r
&Progress\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
return Status;\r
}\r
}\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
\r
//\r
// Synchronize shadow Buffer\r
do {\r
CreateDialog (4, TRUE, 0, NULL, &Key, gEmptyString, PopUp, gPressEnter, gEmptyString);\r
} while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
- gBS->FreePool (PopUp);\r
+ FreePool (PopUp);\r
}\r
\r
return EFI_NOT_READY;\r
&Progress\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
return Status;\r
}\r
}\r
- gBS->FreePool (ConfigResp);\r
+ FreePool (ConfigResp);\r
\r
//\r
// Config success, update storage shadow Buffer\r
QUESTION_OPTION *Option;\r
EFI_HII_VALUE *HiiValue;\r
UINT8 Index;\r
+ EFI_STRING StrValue;\r
\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ StrValue = NULL;\r
\r
//\r
// Statement don't have storage, skip them\r
CopyMem (HiiValue, &Default->Value, sizeof (EFI_HII_VALUE));\r
}\r
\r
+ if (HiiValue->Type == EFI_IFR_TYPE_STRING) {\r
+ StrValue = HiiGetString (FormSet->HiiHandle, HiiValue->Value.string, NULL);\r
+ if (StrValue == NULL) {\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ Question->BufferValue = AllocateCopyPool (StrSize (StrValue), StrValue);\r
+ }\r
+\r
return EFI_SUCCESS;\r
}\r
\r
// For Questions without default\r
//\r
switch (Question->Operand) {\r
- case EFI_IFR_NUMERIC_OP:\r
- //\r
- // Take minimal value as numeric's default value\r
- //\r
- HiiValue->Value.u64 = Question->Minimum;\r
- break;\r
-\r
case EFI_IFR_ONE_OF_OP:\r
//\r
// Take first oneof option as oneof's default value\r
//\r
- Link = GetFirstNode (&Question->OptionListHead);\r
- if (!IsNull (&Question->OptionListHead, Link)) {\r
- Option = QUESTION_OPTION_FROM_LINK (Link);\r
- CopyMem (HiiValue, &Option->Value, sizeof (EFI_HII_VALUE));\r
+ if (ValueToOption (Question, HiiValue) == NULL) {\r
+ Link = GetFirstNode (&Question->OptionListHead);\r
+ if (!IsNull (&Question->OptionListHead, Link)) {\r
+ Option = QUESTION_OPTION_FROM_LINK (Link);\r
+ CopyMem (HiiValue, &Option->Value, sizeof (EFI_HII_VALUE));\r
+ }\r
}\r
break;\r
\r
while (!IsNull (&Question->OptionListHead, Link)) {\r
Option = QUESTION_OPTION_FROM_LINK (Link);\r
\r
- Question->BufferValue[Index] = Option->Value.Value.u8;\r
+ SetArrayData (Question->BufferValue, Question->ValueType, Index, Option->Value.Value.u64);\r
\r
Index++;\r
if (Index >= Question->MaxContainers) {\r
Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
Link = GetNextNode (&Form->StatementListHead, Link);\r
\r
+ //\r
+ // If Question is disabled, don't reset it to default\r
+ //\r
+ if (Question->DisableExpression != NULL) {\r
+ Status = EvaluateExpression (FormSet, Form, Question->DisableExpression);\r
+ if (!EFI_ERROR (Status) && Question->DisableExpression->Result.Value.b) {\r
+ continue;\r
+ }\r
+ }\r
+\r
//\r
// Reset Question to its default value\r
//\r
}\r
\r
\r
+/**\r
+ Initialize Question's Edit copy from Storage for the whole Formset.\r
+\r
+ @param FormSet FormSet data structure.\r
+\r
+ @retval EFI_SUCCESS The function completed successfully.\r
+\r
+**/\r
+EFI_STATUS\r
+LoadFormSetConfig (\r
+ IN FORM_BROWSER_FORMSET *FormSet\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Link;\r
+ FORM_BROWSER_FORM *Form;\r
+\r
+ Link = GetFirstNode (&FormSet->FormListHead);\r
+ while (!IsNull (&FormSet->FormListHead, Link)) {\r
+ Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
+\r
+ //\r
+ // Initialize local copy of Value for each Form\r
+ //\r
+ Status = LoadFormConfig (FormSet, Form);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ Link = GetNextNode (&FormSet->FormListHead, Link);\r
+ }\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
+\r
/**\r
Fill storage's edit copy with settings requested from Configuration Driver.\r
\r
}\r
\r
Status = ConfigRespToStorage (Storage, Result);\r
- gBS->FreePool (Result);\r
+ FreePool (Result);\r
return Status;\r
}\r
\r
\r
+/**\r
+ Copy uncommitted data from source Storage to destination Storage.\r
+\r
+ @param Dst Target Storage for uncommitted data.\r
+ @param Src Source Storage for uncommitted data.\r
+\r
+ @retval EFI_SUCCESS The function completed successfully.\r
+ @retval EFI_INVALID_PARAMETER Source and destination Storage is not the same type.\r
+\r
+**/\r
+EFI_STATUS\r
+CopyStorage (\r
+ IN OUT FORMSET_STORAGE *Dst,\r
+ IN FORMSET_STORAGE *Src\r
+ )\r
+{\r
+ LIST_ENTRY *Link;\r
+ NAME_VALUE_NODE *Node;\r
+\r
+ if ((Dst->Type != Src->Type) || (Dst->Size != Src->Size)) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ switch (Src->Type) {\r
+ case EFI_HII_VARSTORE_BUFFER:\r
+ CopyMem (Dst->EditBuffer, Src->EditBuffer, Src->Size);\r
+ break;\r
+\r
+ case EFI_HII_VARSTORE_NAME_VALUE:\r
+ Link = GetFirstNode (&Src->NameValueListHead);\r
+ while (!IsNull (&Src->NameValueListHead, Link)) {\r
+ Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
+\r
+ SetValueByName (Dst, Node->Name, Node->EditValue);\r
+\r
+ Link = GetNextNode (&Src->NameValueListHead, Link);\r
+ }\r
+ break;\r
+\r
+ case EFI_HII_VARSTORE_EFI_VARIABLE:\r
+ default:\r
+ break;\r
+ }\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
+\r
/**\r
Get current setting of Questions.\r
\r
)\r
{\r
LIST_ENTRY *Link;\r
+ LIST_ENTRY *Link2;\r
FORMSET_STORAGE *Storage;\r
+ FORMSET_STORAGE *StorageSrc;\r
+ FORMSET_STORAGE *OldStorage;\r
FORM_BROWSER_FORM *Form;\r
EFI_STATUS Status;\r
\r
while (!IsNull (&FormSet->StorageListHead, Link)) {\r
Storage = FORMSET_STORAGE_FROM_LINK (Link);\r
\r
- Status = LoadStorage (FormSet, Storage);\r
+ OldStorage = NULL;\r
+ if (gOldFormSet != NULL) {\r
+ //\r
+ // Try to find the Storage in backup formset gOldFormSet\r
+ //\r
+ Link2 = GetFirstNode (&gOldFormSet->StorageListHead);\r
+ while (!IsNull (&gOldFormSet->StorageListHead, Link2)) {\r
+ StorageSrc = FORMSET_STORAGE_FROM_LINK (Link2);\r
+\r
+ if (StorageSrc->VarStoreId == Storage->VarStoreId) {\r
+ OldStorage = StorageSrc;\r
+ break;\r
+ }\r
+\r
+ Link2 = GetNextNode (&gOldFormSet->StorageListHead, Link2);\r
+ }\r
+ }\r
+\r
+ if (OldStorage == NULL) {\r
+ //\r
+ // Storage is not found in backup formset, request it from ConfigDriver\r
+ //\r
+ Status = LoadStorage (FormSet, Storage);\r
+ } else {\r
+ //\r
+ // Storage found in backup formset, use it\r
+ //\r
+ Status = CopyStorage (Storage, OldStorage);\r
+ }\r
\r
//\r
// Now Edit Buffer is filled with default values(lower priority) and current\r
BOOLEAN ReturnDefault;\r
UINT32 PackageListLength;\r
EFI_HII_PACKAGE_HEADER PackageHeader;\r
+ UINT8 Index;\r
+ UINT8 NumberOfClassGuid;\r
+ BOOLEAN IsSetupClassGuid;\r
+ EFI_GUID *ClassGuid;\r
\r
OpCodeData = NULL;\r
Package = NULL;\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+ ASSERT (HiiPackageList != NULL);\r
\r
//\r
// Get Form package from this HII package List\r
Package = ((UINT8 *) HiiPackageList) + Offset;\r
CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
\r
- if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) {\r
+ if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
//\r
// Search FormSet in this Form Package\r
//\r
// Check whether return default FormSet\r
//\r
if (ReturnDefault) {\r
- break;\r
+ //\r
+ // Check ClassGuid of formset OpCode\r
+ //\r
+ IsSetupClassGuid = FALSE;\r
+ NumberOfClassGuid = (UINT8) (((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3);\r
+ ClassGuid = (EFI_GUID *) (OpCodeData + sizeof (EFI_IFR_FORM_SET));\r
+ for (Index = 0; Index < NumberOfClassGuid; Index++) {\r
+ if (CompareGuid (ClassGuid + Index, &gEfiHiiPlatformSetupFormsetGuid)) {\r
+ IsSetupClassGuid = TRUE;\r
+ break;\r
+ }\r
+ }\r
+ if (IsSetupClassGuid) {\r
+ break;\r
+ }\r
}\r
\r
//\r
//\r
// Form package not found in this Package List\r
//\r
- gBS->FreePool (HiiPackageList);\r
+ FreePool (HiiPackageList);\r
return EFI_NOT_FOUND;\r
}\r
\r
*BinaryLength = PackageHeader.Length - Offset2;\r
*BinaryData = AllocateCopyPool (*BinaryLength, OpCodeData);\r
\r
- gBS->FreePool (HiiPackageList);\r
+ FreePool (HiiPackageList);\r
\r
if (*BinaryData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
return Status;\r
}\r
\r
- gClassOfVfr = FormSet->SubClass;\r
- if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) {\r
- FrontPageHandle = FormSet->HiiHandle;\r
+ gClassOfVfr = FORMSET_CLASS_PLATFORM_SETUP;\r
+ if (FormSet->SubClass == EFI_FRONT_PAGE_SUBCLASS) {\r
+ gClassOfVfr = FORMSET_CLASS_FRONT_PAGE;\r
+ gFrontPageHandle = FormSet->HiiHandle;\r
}\r
\r
//\r
//\r
// Function key prompt can not be displayed if the function key has been disabled.\r
//\r
- if ((gFunctionKeySetting & FUNCTION_ONE) != FUNCTION_ONE) {\r
- gFunctionOneString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle);\r
- }\r
-\r
- if ((gFunctionKeySetting & FUNCTION_TWO) != FUNCTION_TWO) {\r
- gFunctionTwoString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle);\r
- }\r
-\r
if ((gFunctionKeySetting & FUNCTION_NINE) != FUNCTION_NINE) {\r
gFunctionNineString = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle);\r
}\r
\r
return Status;\r
}\r
+\r
+\r
+/**\r
+ Save globals used by previous call to SendForm(). SendForm() may be called from \r
+ HiiConfigAccess.Callback(), this will cause SendForm() be reentried.\r
+ So, save globals of previous call to SendForm() and restore them upon exit.\r
+\r
+**/\r
+VOID\r
+SaveBrowserContext (\r
+ VOID\r
+ )\r
+{\r
+ BROWSER_CONTEXT *Context;\r
+\r
+ gBrowserContextCount++;\r
+ if (gBrowserContextCount == 1) {\r
+ //\r
+ // This is not reentry of SendForm(), no context to save\r
+ //\r
+ return;\r
+ }\r
+\r
+ Context = AllocatePool (sizeof (BROWSER_CONTEXT));\r
+ ASSERT (Context != NULL);\r
+\r
+ Context->Signature = BROWSER_CONTEXT_SIGNATURE;\r
+\r
+ //\r
+ // Save FormBrowser context\r
+ //\r
+ Context->BannerData = gBannerData;\r
+ Context->ClassOfVfr = gClassOfVfr;\r
+ Context->FunctionKeySetting = gFunctionKeySetting;\r
+ Context->ResetRequired = gResetRequired;\r
+ Context->NvUpdateRequired = gNvUpdateRequired;\r
+ Context->Direction = gDirection;\r
+ Context->FunctionNineString = gFunctionNineString;\r
+ Context->FunctionTenString = gFunctionTenString;\r
+ Context->EnterString = gEnterString;\r
+ Context->EnterCommitString = gEnterCommitString;\r
+ Context->EnterEscapeString = gEnterEscapeString;\r
+ Context->EscapeString = gEscapeString;\r
+ Context->SaveFailed = gSaveFailed;\r
+ Context->MoveHighlight = gMoveHighlight;\r
+ Context->MakeSelection = gMakeSelection;\r
+ Context->DecNumericInput = gDecNumericInput;\r
+ Context->HexNumericInput = gHexNumericInput;\r
+ Context->ToggleCheckBox = gToggleCheckBox;\r
+ Context->PromptForData = gPromptForData;\r
+ Context->PromptForPassword = gPromptForPassword;\r
+ Context->PromptForNewPassword = gPromptForNewPassword;\r
+ Context->ConfirmPassword = gConfirmPassword;\r
+ Context->ConfirmError = gConfirmError;\r
+ Context->PassowordInvalid = gPassowordInvalid;\r
+ Context->PressEnter = gPressEnter;\r
+ Context->EmptyString = gEmptyString;\r
+ Context->AreYouSure = gAreYouSure;\r
+ Context->YesResponse = gYesResponse;\r
+ Context->NoResponse = gNoResponse;\r
+ Context->MiniString = gMiniString;\r
+ Context->PlusString = gPlusString;\r
+ Context->MinusString = gMinusString;\r
+ Context->AdjustNumber = gAdjustNumber;\r
+ Context->SaveChanges = gSaveChanges;\r
+ Context->OptionMismatch = gOptionMismatch;\r
+ Context->PromptBlockWidth = gPromptBlockWidth;\r
+ Context->OptionBlockWidth = gOptionBlockWidth;\r
+ Context->HelpBlockWidth = gHelpBlockWidth;\r
+ Context->OldFormSet = gOldFormSet;\r
+ Context->MenuRefreshHead = gMenuRefreshHead;\r
+\r
+ CopyMem (&Context->ScreenDimensions, &gScreenDimensions, sizeof (gScreenDimensions));\r
+ CopyMem (&Context->MenuOption, &gMenuOption, sizeof (gMenuOption));\r
+\r
+ //\r
+ // Insert to FormBrowser context list\r
+ //\r
+ InsertHeadList (&gBrowserContextList, &Context->Link);\r
+}\r
+\r
+\r
+/**\r
+ Restore globals used by previous call to SendForm().\r
+\r
+**/\r
+VOID\r
+RestoreBrowserContext (\r
+ VOID\r
+ )\r
+{\r
+ LIST_ENTRY *Link;\r
+ BROWSER_CONTEXT *Context;\r
+\r
+ ASSERT (gBrowserContextCount != 0);\r
+ gBrowserContextCount--;\r
+ if (gBrowserContextCount == 0) {\r
+ //\r
+ // This is not reentry of SendForm(), no context to restore\r
+ //\r
+ return;\r
+ }\r
+\r
+ ASSERT (!IsListEmpty (&gBrowserContextList));\r
+\r
+ Link = GetFirstNode (&gBrowserContextList);\r
+ Context = BROWSER_CONTEXT_FROM_LINK (Link);\r
+\r
+ //\r
+ // Restore FormBrowser context\r
+ //\r
+ gBannerData = Context->BannerData;\r
+ gClassOfVfr = Context->ClassOfVfr;\r
+ gFunctionKeySetting = Context->FunctionKeySetting;\r
+ gResetRequired = Context->ResetRequired;\r
+ gNvUpdateRequired = Context->NvUpdateRequired;\r
+ gDirection = Context->Direction;\r
+ gFunctionNineString = Context->FunctionNineString;\r
+ gFunctionTenString = Context->FunctionTenString;\r
+ gEnterString = Context->EnterString;\r
+ gEnterCommitString = Context->EnterCommitString;\r
+ gEnterEscapeString = Context->EnterEscapeString;\r
+ gEscapeString = Context->EscapeString;\r
+ gSaveFailed = Context->SaveFailed;\r
+ gMoveHighlight = Context->MoveHighlight;\r
+ gMakeSelection = Context->MakeSelection;\r
+ gDecNumericInput = Context->DecNumericInput;\r
+ gHexNumericInput = Context->HexNumericInput;\r
+ gToggleCheckBox = Context->ToggleCheckBox;\r
+ gPromptForData = Context->PromptForData;\r
+ gPromptForPassword = Context->PromptForPassword;\r
+ gPromptForNewPassword = Context->PromptForNewPassword;\r
+ gConfirmPassword = Context->ConfirmPassword;\r
+ gConfirmError = Context->ConfirmError;\r
+ gPassowordInvalid = Context->PassowordInvalid;\r
+ gPressEnter = Context->PressEnter;\r
+ gEmptyString = Context->EmptyString;\r
+ gAreYouSure = Context->AreYouSure;\r
+ gYesResponse = Context->YesResponse;\r
+ gNoResponse = Context->NoResponse;\r
+ gMiniString = Context->MiniString;\r
+ gPlusString = Context->PlusString;\r
+ gMinusString = Context->MinusString;\r
+ gAdjustNumber = Context->AdjustNumber;\r
+ gSaveChanges = Context->SaveChanges;\r
+ gOptionMismatch = Context->OptionMismatch;\r
+ gPromptBlockWidth = Context->PromptBlockWidth;\r
+ gOptionBlockWidth = Context->OptionBlockWidth;\r
+ gHelpBlockWidth = Context->HelpBlockWidth;\r
+ gOldFormSet = Context->OldFormSet;\r
+ gMenuRefreshHead = Context->MenuRefreshHead;\r
+\r
+ CopyMem (&gScreenDimensions, &Context->ScreenDimensions, sizeof (gScreenDimensions));\r
+ CopyMem (&gMenuOption, &Context->MenuOption, sizeof (gMenuOption));\r
+\r
+ //\r
+ // Remove from FormBrowser context list\r
+ //\r
+ RemoveEntryList (&Context->Link);\r
+ gBS->FreePool (Context);\r
+}\r
projects / mirror_edk2.git / blobdiff