/** @file\r
Entry and initialization module for the browser.\r
\r
-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
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
CHAR16 *StrPtr;\r
UINTN BufferSize;\r
UINTN TmpSize;\r
+ FORMSET_STORAGE *BrowserStorage;\r
\r
if (RetrieveData) {\r
//\r
// Skip <ConfigHdr> and '&' to point to <ConfigBody> when first copy the configbody.\r
// Also need to consider add "\0" at first time.\r
//\r
- StrPtr = ConfigResp + StrLen (Storage->ConfigHdr) + 1;\r
+ StrPtr = StrStr (ConfigResp, L"PATH");\r
+ ASSERT (StrPtr != NULL);\r
+ StrPtr = StrStr (StrPtr, L"&");\r
+ StrPtr += 1;\r
BufferSize = StrSize (StrPtr);\r
\r
-\r
//\r
// Copy the data if the input buffer is bigger enough.\r
//\r
//\r
// Prepare <ConfigResp>\r
//\r
+ BrowserStorage = GetFstStgFromBrsStg (Storage);\r
+ ASSERT (BrowserStorage != NULL);\r
TmpSize = StrLen (*ResultsData);\r
- BufferSize = (TmpSize + StrLen (Storage->ConfigHdr) + 2) * sizeof (CHAR16);\r
+ BufferSize = (TmpSize + StrLen (BrowserStorage->ConfigHdr) + 2) * sizeof (CHAR16);\r
ConfigResp = AllocateZeroPool (BufferSize);\r
ASSERT (ConfigResp != NULL);\r
\r
- StrCpy (ConfigResp, Storage->ConfigHdr);\r
+ StrCpy (ConfigResp, BrowserStorage->ConfigHdr);\r
StrCat (ConfigResp, L"&");\r
StrCat (ConfigResp, *ResultsData);\r
\r
LIST_ENTRY *Link;\r
NAME_VALUE_NODE *Node;\r
UINT8 *SourceBuf;\r
+ FORMSET_STORAGE *FormsetStorage;\r
\r
Status = EFI_SUCCESS;\r
\r
\r
case EFI_HII_VARSTORE_NAME_VALUE:\r
*ConfigResp = NULL;\r
- NewStringCat (ConfigResp, Storage->ConfigHdr);\r
+ FormsetStorage = GetFstStgFromBrsStg(Storage);\r
+ ASSERT (FormsetStorage != NULL);\r
+ NewStringCat (ConfigResp, FormsetStorage->ConfigHdr);\r
\r
Link = GetFirstNode (&Storage->NameValueListHead);\r
while (!IsNull (&Storage->NameValueListHead, Link)) {\r
UINTN StorageWidth;\r
EFI_TIME EfiTime;\r
BROWSER_STORAGE *Storage;\r
+ FORMSET_STORAGE *FormsetStorage;\r
EFI_IFR_TYPE_VALUE *QuestionValue;\r
CHAR16 *ConfigRequest;\r
CHAR16 *Progress;\r
FreePool (Value);\r
}\r
} else {\r
+ FormsetStorage = GetFstStgFromVarId(FormSet, Question->VarStoreId);\r
+ ASSERT (FormsetStorage != NULL);\r
//\r
// <ConfigRequest> ::= <ConfigHdr> + <BlockName> ||\r
// <ConfigHdr> + "&" + <VariableName>\r
//\r
if (IsBufferStorage) {\r
- Length = StrLen (Storage->ConfigHdr);\r
+ Length = StrLen (FormsetStorage->ConfigHdr);\r
Length += StrLen (Question->BlockName);\r
} else {\r
- Length = StrLen (Storage->ConfigHdr);\r
+ Length = StrLen (FormsetStorage->ConfigHdr);\r
Length += StrLen (Question->VariableName) + 1;\r
}\r
ConfigRequest = AllocateZeroPool ((Length + 1) * sizeof (CHAR16));\r
ASSERT (ConfigRequest != NULL);\r
\r
- StrCpy (ConfigRequest, Storage->ConfigHdr);\r
+ StrCpy (ConfigRequest, FormsetStorage->ConfigHdr);\r
if (IsBufferStorage) {\r
StrCat (ConfigRequest, Question->BlockName);\r
} else {\r
UINTN BufferLen;\r
UINTN StorageWidth;\r
BROWSER_STORAGE *Storage;\r
+ FORMSET_STORAGE *FormsetStorage;\r
EFI_IFR_TYPE_VALUE *QuestionValue;\r
CHAR16 *ConfigResp;\r
CHAR16 *Progress;\r
} else {\r
Length += (StorageWidth * 2);\r
}\r
- ConfigResp = AllocateZeroPool ((StrLen (Storage->ConfigHdr) + Length + 1) * sizeof (CHAR16));\r
+ FormsetStorage = GetFstStgFromVarId(FormSet, Question->VarStoreId);\r
+ ASSERT (FormsetStorage != NULL);\r
+ ConfigResp = AllocateZeroPool ((StrLen (FormsetStorage->ConfigHdr) + Length + 1) * sizeof (CHAR16));\r
ASSERT (ConfigResp != NULL);\r
\r
- StrCpy (ConfigResp, Storage->ConfigHdr);\r
+ StrCpy (ConfigResp, FormsetStorage->ConfigHdr);\r
if (IsBufferStorage) {\r
StrCat (ConfigResp, Question->BlockName);\r
StrCat (ConfigResp, L"&VALUE=");\r
*RetQuestion = Statement;\r
break;\r
}\r
+\r
+ if (Statement->VariableName != NULL && StrStr (Statement->VariableName, Progress) != NULL) {\r
+ *RetQuestion = Statement;\r
+ break;\r
+ }\r
}\r
}\r
\r
//\r
// Default value is embedded in EFI_IFR_DEFAULT\r
//\r
- CopyMem (HiiValue, &Default->Value, sizeof (EFI_HII_VALUE));\r
+ if (Default->Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+ ASSERT (HiiValue->Buffer != NULL);\r
+ CopyMem (HiiValue->Buffer, Default->Value.Buffer, Default->Value.BufferLen);\r
+ } else {\r
+ CopyMem (HiiValue, &Default->Value, sizeof (EFI_HII_VALUE));\r
+ }\r
}\r
\r
if (HiiValue->Type == EFI_IFR_TYPE_STRING) {\r
@param FormSet Form data structure.\r
@param Form Form data structure.\r
@param DefaultId The Class of the default.\r
+ @param BrowserStorage The input request storage for the questions.\r
\r
**/\r
VOID\r
ExtractAltCfgForForm (\r
IN FORM_BROWSER_FORMSET *FormSet,\r
IN FORM_BROWSER_FORM *Form,\r
- IN UINT16 DefaultId\r
+ IN UINT16 DefaultId,\r
+ IN BROWSER_STORAGE *BrowserStorage\r
)\r
{\r
EFI_STATUS Status;\r
FormSetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
Storage = FormSetStorage->BrowserStorage;\r
Link = GetNextNode (&FormSet->StorageListHead, Link);\r
+ if (BrowserStorage != NULL && BrowserStorage != Storage) {\r
+ continue;\r
+ }\r
\r
if (Storage->Type != EFI_HII_VARSTORE_EFI_VARIABLE &&\r
FormSetStorage->ElementCount != 0 &&\r
- FormSetStorage->ConfigAltResp != NULL) {\r
+ FormSetStorage->HasCallAltCfg) {\r
return;\r
}\r
}\r
Link = GetNextNode (&Form->ConfigRequestHead, Link);\r
\r
Storage = ConfigInfo->Storage;\r
+ if (BrowserStorage != NULL && BrowserStorage != Storage) {\r
+ continue;\r
+ }\r
+\r
if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) {\r
continue;\r
}\r
\r
@param FormSet Form data structure.\r
@param DefaultId The Class of the default.\r
+ @param BrowserStorage The input request storage for the questions.\r
\r
**/\r
VOID\r
ExtractAltCfgForFormSet (\r
IN FORM_BROWSER_FORMSET *FormSet,\r
- IN UINT16 DefaultId\r
+ IN UINT16 DefaultId,\r
+ IN BROWSER_STORAGE *BrowserStorage\r
)\r
{\r
EFI_STATUS Status;\r
Storage = FormSetStorage->BrowserStorage;\r
Link = GetNextNode (&FormSet->StorageListHead, Link);\r
\r
+ if (BrowserStorage != NULL && BrowserStorage != Storage) {\r
+ continue;\r
+ }\r
+\r
if (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE) {\r
continue;\r
}\r
continue;\r
}\r
\r
+ FormSetStorage->HasCallAltCfg = TRUE;\r
+\r
//\r
// 2. Get value through hii config routine protocol.\r
//\r
FreePool (FormSetStorage->ConfigAltResp);\r
FormSetStorage->ConfigAltResp = NULL;\r
}\r
+\r
+ FormSetStorage->HasCallAltCfg = FALSE;\r
}\r
}\r
\r
@param RetrieveValueFirst Whether call the retrieve call back to\r
get the initial value before get default\r
value.\r
+ @param SkipGetAltCfg Whether skip the get altcfg string process.\r
\r
@retval EFI_SUCCESS The function completed successfully.\r
@retval EFI_UNSUPPORTED Unsupport SettingScope.\r
IN BROWSER_SETTING_SCOPE SettingScope,\r
IN BROWSER_GET_DEFAULT_VALUE GetDefaultValueScope,\r
IN BROWSER_STORAGE *Storage OPTIONAL,\r
- IN BOOLEAN RetrieveValueFirst\r
+ IN BOOLEAN RetrieveValueFirst,\r
+ IN BOOLEAN SkipGetAltCfg\r
)\r
{\r
EFI_STATUS Status;\r
//\r
// Prepare the AltCfg String for form.\r
//\r
- ExtractAltCfgForForm (FormSet, Form, DefaultId);\r
+ if (!SkipGetAltCfg && (GetDefaultValueScope != GetDefaultForNoStorage)) {\r
+ ExtractAltCfgForForm (FormSet, Form, DefaultId, Storage);\r
+ }\r
\r
//\r
// Extract Form default\r
//\r
// Clean the AltCfg String.\r
//\r
- CleanAltCfgForForm(Form);\r
+ if (!SkipGetAltCfg && (GetDefaultValueScope != GetDefaultForNoStorage)) {\r
+ CleanAltCfgForForm(Form);\r
+ }\r
} else if (SettingScope == FormSetLevel) {\r
//\r
// Prepare the AltCfg String for formset.\r
//\r
- ExtractAltCfgForFormSet (FormSet, DefaultId);\r
+ if (!SkipGetAltCfg && (GetDefaultValueScope != GetDefaultForNoStorage)) {\r
+ ExtractAltCfgForFormSet (FormSet, DefaultId, Storage);\r
+ }\r
\r
FormLink = GetFirstNode (&FormSet->FormListHead);\r
while (!IsNull (&FormSet->FormListHead, FormLink)) {\r
Form = FORM_BROWSER_FORM_FROM_LINK (FormLink);\r
- ExtractDefault (FormSet, Form, DefaultId, FormLevel, GetDefaultValueScope, Storage, RetrieveValueFirst);\r
+ ExtractDefault (FormSet, Form, DefaultId, FormLevel, GetDefaultValueScope, Storage, RetrieveValueFirst, SkipGetAltCfg);\r
FormLink = GetNextNode (&FormSet->FormListHead, FormLink);\r
}\r
\r
//\r
// Clean the AltCfg String.\r
//\r
- CleanAltCfgForFormSet (FormSet);\r
+ if (!SkipGetAltCfg && (GetDefaultValueScope != GetDefaultForNoStorage)) {\r
+ CleanAltCfgForFormSet (FormSet);\r
+ }\r
} else if (SettingScope == SystemLevel) {\r
//\r
// Preload all Hii formset.\r
\r
mSystemLevelFormSet = LocalFormSet;\r
\r
- ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, GetDefaultValueScope, Storage, RetrieveValueFirst);\r
+ ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, GetDefaultValueScope, Storage, RetrieveValueFirst, SkipGetAltCfg);\r
}\r
\r
mSystemLevelFormSet = OldFormSet;\r
/**\r
Adjust config request in storage, remove the request elements existed in the input ConfigRequest.\r
\r
- @param Storage Pointer to the browser storage.\r
+ @param Storage Pointer to the formset storage.\r
@param ConfigRequest The pointer to the Request element.\r
\r
**/\r
VOID\r
RemoveConfigRequest (\r
- BROWSER_STORAGE *Storage,\r
+ FORMSET_STORAGE *Storage,\r
CHAR16 *ConfigRequest\r
)\r
{\r
return;\r
}\r
\r
- if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
+ if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
//\r
// "&Name1&Name2" section for EFI_HII_VARSTORE_NAME_VALUE storage\r
//\r
//\r
// Find SearchKey storage\r
//\r
- if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
+ if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
RequestElement = StrStr (ConfigRequest, L"PATH");\r
ASSERT (RequestElement != NULL);\r
RequestElement = StrStr (RequestElement, SearchKey); \r
*NextRequestElement = L'\0';\r
}\r
\r
- RemoveElement (Storage, RequestElement);\r
+ RemoveElement (Storage->BrowserStorage, RequestElement);\r
\r
if (NextRequestElement != NULL) {\r
//\r
//\r
// If no request element remain, just remove the ConfigRequest string.\r
//\r
- if (StrCmp (Storage->ConfigRequest, Storage->ConfigHdr) == 0) {\r
- FreePool (Storage->ConfigRequest);\r
- Storage->ConfigRequest = NULL;\r
- Storage->SpareStrLen = 0;\r
+ if (StrCmp (Storage->BrowserStorage->ConfigRequest, Storage->ConfigHdr) == 0) {\r
+ FreePool (Storage->BrowserStorage->ConfigRequest);\r
+ Storage->BrowserStorage->ConfigRequest = NULL;\r
+ Storage->BrowserStorage->SpareStrLen = 0;\r
}\r
}\r
\r
continue;\r
}\r
\r
- RemoveConfigRequest (Storage->BrowserStorage, Storage->ConfigRequest);\r
+ RemoveConfigRequest (Storage, Storage->ConfigRequest);\r
} else if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||\r
Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
if (Storage->BrowserStorage->ConfigRequest != NULL) { \r
return RetVal;\r
}\r
\r
-/**\r
-\r
- Base on ConfigRequest info to get default value for current formset. \r
-\r
- ConfigRequest info include the info about which questions in current formset need to \r
- get default value. This function only get these questions default value.\r
- \r
- @param FormSet FormSet data structure.\r
- @param Storage Storage need to update value.\r
- @param ConfigRequest The config request string.\r
-\r
-**/\r
-VOID\r
-GetDefaultForFormset (\r
- IN FORM_BROWSER_FORMSET *FormSet,\r
- IN BROWSER_STORAGE *Storage,\r
- IN CHAR16 *ConfigRequest\r
- )\r
-{\r
- UINT8 *BackUpBuf;\r
- UINTN BufferSize;\r
- LIST_ENTRY BackUpList;\r
- NAME_VALUE_NODE *Node;\r
- LIST_ENTRY *Link;\r
- LIST_ENTRY *NodeLink;\r
- NAME_VALUE_NODE *TmpNode;\r
- EFI_STATUS Status;\r
- EFI_STRING Progress;\r
- EFI_STRING Result;\r
-\r
- BackUpBuf = NULL;\r
- InitializeListHead(&BackUpList);\r
-\r
- //\r
- // Back update the edit buffer.\r
- // \r
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
- (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {\r
- BackUpBuf = AllocateCopyPool (Storage->Size, Storage->EditBuffer);\r
- ASSERT (BackUpBuf != NULL);\r
- } else if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
- Link = GetFirstNode (&Storage->NameValueListHead);\r
- while (!IsNull (&Storage->NameValueListHead, Link)) {\r
- Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
- Link = GetNextNode (&Storage->NameValueListHead, Link);\r
-\r
- //\r
- // Only back Node belong to this formset.\r
- //\r
- if (StrStr (Storage->ConfigRequest, Node->Name) == NULL) {\r
- continue;\r
- }\r
-\r
- TmpNode = AllocateCopyPool (sizeof (NAME_VALUE_NODE), Node);\r
- ASSERT (TmpNode != NULL);\r
- TmpNode->Name = AllocateCopyPool (StrSize(Node->Name) * sizeof (CHAR16), Node->Name);\r
- ASSERT (TmpNode->Name != NULL);\r
- TmpNode->EditValue = AllocateCopyPool (StrSize(Node->EditValue) * sizeof (CHAR16), Node->EditValue);\r
- ASSERT (TmpNode->EditValue != NULL);\r
-\r
- InsertTailList(&BackUpList, &TmpNode->Link);\r
- }\r
- }\r
-\r
- //\r
- // Get default value.\r
- //\r
- ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForStorage, Storage, TRUE);\r
-\r
- //\r
- // Update the question value based on the input ConfigRequest.\r
- //\r
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
- (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {\r
- ASSERT (BackUpBuf != NULL);\r
- BufferSize = Storage->Size;\r
- Status = mHiiConfigRouting->BlockToConfig(\r
- mHiiConfigRouting,\r
- ConfigRequest,\r
- Storage->EditBuffer,\r
- BufferSize,\r
- &Result,\r
- &Progress\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
- \r
- Status = mHiiConfigRouting->ConfigToBlock (\r
- mHiiConfigRouting,\r
- Result,\r
- BackUpBuf,\r
- &BufferSize,\r
- &Progress\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- if (Result != NULL) {\r
- FreePool (Result);\r
- }\r
- \r
- CopyMem (Storage->EditBuffer, BackUpBuf, Storage->Size);\r
- FreePool (BackUpBuf);\r
- } else if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
- //\r
- // Update question value, only element in ConfigReqeust will be update.\r
- //\r
- Link = GetFirstNode (&BackUpList);\r
- while (!IsNull (&BackUpList, Link)) {\r
- Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
- Link = GetNextNode (&BackUpList, Link);\r
-\r
- if (StrStr (ConfigRequest, Node->Name) != NULL) {\r
- continue;\r
- }\r
-\r
- NodeLink = GetFirstNode (&Storage->NameValueListHead);\r
- while (!IsNull (&Storage->NameValueListHead, NodeLink)) {\r
- TmpNode = NAME_VALUE_NODE_FROM_LINK (NodeLink);\r
- NodeLink = GetNextNode (&Storage->NameValueListHead, NodeLink);\r
- \r
- if (StrCmp (Node->Name, TmpNode->Name) != 0) {\r
- continue;\r
- }\r
-\r
- FreePool (TmpNode->EditValue);\r
- TmpNode->EditValue = AllocateCopyPool (StrSize(Node->EditValue) * sizeof (CHAR16), Node->EditValue);\r
-\r
- RemoveEntryList (&Node->Link);\r
- FreePool (Node->EditValue);\r
- FreePool (Node->Name);\r
- FreePool (Node);\r
- }\r
- }\r
-\r
- //\r
- // Restore the Name/Value node.\r
- // \r
- Link = GetFirstNode (&BackUpList);\r
- while (!IsNull (&BackUpList, Link)) {\r
- Node = NAME_VALUE_NODE_FROM_LINK (Link);\r
- Link = GetNextNode (&BackUpList, Link);\r
- \r
- //\r
- // Free this node.\r
- //\r
- RemoveEntryList (&Node->Link);\r
- FreePool (Node->EditValue);\r
- FreePool (Node->Name);\r
- FreePool (Node);\r
- }\r
- }\r
-}\r
-\r
/**\r
Fill storage's edit copy with settings requested from Configuration Driver.\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWW"followed by a Null-terminator\r
//\r
- StrLen = StrSize (Storage->BrowserStorage->ConfigHdr) + 20 * sizeof (CHAR16);\r
+ StrLen = StrSize (Storage->ConfigHdr) + 20 * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (StrLen);\r
ASSERT (ConfigRequest != NULL);\r
UnicodeSPrint (\r
ConfigRequest, \r
StrLen, \r
L"%s&OFFSET=0&WIDTH=%04x", \r
- Storage->BrowserStorage->ConfigHdr,\r
+ Storage->ConfigHdr,\r
Storage->BrowserStorage->Size);\r
} else {\r
ConfigRequest = Storage->ConfigRequest;\r
// If get value fail, extract default from IFR binary\r
//\r
if (EFI_ERROR (Status)) {\r
- ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForStorage, Storage->BrowserStorage, TRUE);\r
+ ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForStorage, Storage->BrowserStorage, TRUE, TRUE);\r
} else {\r
//\r
// Convert Result from <ConfigAltResp> to <ConfigResp>\r
//\r
// Extract default from IFR binary for no storage questions.\r
// \r
- ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE);\r
+ ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE, FALSE);\r
\r
//\r
// Request current settings from Configuration Driver\r
// Executet the difault action.\r
//\r
if ((Action & BROWSER_ACTION_DEFAULT) != 0) {\r
- Status = ExtractDefault (FormSet, Form, DefaultId, gBrowserSettingScope, GetDefaultForAll, NULL, FALSE);\r
+ Status = ExtractDefault (FormSet, Form, DefaultId, gBrowserSettingScope, GetDefaultForAll, NULL, FALSE, FALSE);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
projects / mirror_edk2.git / blobdiff