/** @file\r
Parser for IFR binary encoding.\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
EFI_STATUS\r
InitializeConfigHdr (\r
IN FORM_BROWSER_FORMSET *FormSet,\r
- IN OUT BROWSER_STORAGE *Storage\r
+ IN OUT FORMSET_STORAGE *Storage\r
)\r
{\r
CHAR16 *Name;\r
\r
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
- Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
- Name = Storage->Name;\r
+ if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER || \r
+ Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
+ Name = Storage->BrowserStorage->Name;\r
} else {\r
Name = NULL;\r
}\r
\r
Storage->ConfigHdr = HiiConstructConfigHdr (\r
- &Storage->Guid,\r
+ &Storage->BrowserStorage->Guid,\r
Name,\r
FormSet->DriverHandle\r
);\r
}\r
\r
BrowserStorage->HiiHandle = FormSet->HiiHandle;\r
- InitializeConfigHdr (FormSet, BrowserStorage);\r
\r
BrowserStorage->Initialized = FALSE;\r
- } else {\r
- if ((StorageType == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) && \r
- (FormSet->DriverHandle != NULL) && \r
- (!IsDevicePathExist (BrowserStorage->ConfigHdr))) {\r
- //\r
- // If this storage not has device path info but new formset has,\r
- // update the device path info.\r
- //\r
- FreePool (BrowserStorage->ConfigHdr);\r
- InitializeConfigHdr (FormSet, BrowserStorage);\r
- }\r
}\r
\r
Storage->BrowserStorage = BrowserStorage;\r
- Storage->ConfigRequest = AllocateCopyPool (StrSize (BrowserStorage->ConfigHdr), BrowserStorage->ConfigHdr);\r
+ InitializeConfigHdr (FormSet, Storage);\r
+ Storage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigHdr), Storage->ConfigHdr);\r
Storage->SpareStrLen = 0;\r
\r
return Storage;\r
}\r
\r
+/**\r
+ Get Formset_storage base on the input varstoreid info.\r
+\r
+ @param FormSet Pointer of the current FormSet.\r
+ @param VarStoreId Varstore ID info.\r
+\r
+ @return Pointer to a FORMSET_STORAGE data structure.\r
+\r
+**/\r
+FORMSET_STORAGE *\r
+GetFstStgFromVarId (\r
+ IN FORM_BROWSER_FORMSET *FormSet,\r
+ IN EFI_VARSTORE_ID VarStoreId\r
+ )\r
+{\r
+ FORMSET_STORAGE *FormsetStorage;\r
+ LIST_ENTRY *Link;\r
+ BOOLEAN Found;\r
+\r
+ Found = FALSE;\r
+ FormsetStorage = NULL;\r
+ //\r
+ // Find Formset Storage for this Question\r
+ //\r
+ Link = GetFirstNode (&FormSet->StorageListHead);\r
+ while (!IsNull (&FormSet->StorageListHead, Link)) {\r
+ FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
+\r
+ if (FormsetStorage->VarStoreId == VarStoreId) {\r
+ Found = TRUE;\r
+ break;\r
+ }\r
+\r
+ Link = GetNextNode (&FormSet->StorageListHead, Link);\r
+ }\r
+\r
+ return Found ? FormsetStorage : NULL;\r
+}\r
+\r
+/**\r
+ Get Formset_storage base on the input browser storage.\r
+\r
+ More than one formsets may share the same browser storage,\r
+ this function just get the first formset storage which\r
+ share the browser storage.\r
+\r
+ @param Storage browser storage info.\r
+\r
+ @return Pointer to a FORMSET_STORAGE data structure.\r
+ \r
+\r
+**/\r
+FORMSET_STORAGE *\r
+GetFstStgFromBrsStg (\r
+ IN BROWSER_STORAGE *Storage\r
+ )\r
+{\r
+ FORMSET_STORAGE *FormsetStorage;\r
+ LIST_ENTRY *Link;\r
+ LIST_ENTRY *FormsetLink;\r
+ FORM_BROWSER_FORMSET *FormSet;\r
+ BOOLEAN Found;\r
+\r
+ Found = FALSE;\r
+ FormsetStorage = NULL;\r
+\r
+ FormsetLink = GetFirstNode (&gBrowserFormSetList);\r
+ while (!IsNull (&gBrowserFormSetList, FormsetLink)) {\r
+ FormSet = FORM_BROWSER_FORMSET_FROM_LINK (FormsetLink);\r
+ FormsetLink = GetNextNode (&gBrowserFormSetList, FormsetLink);\r
+\r
+ Link = GetFirstNode (&FormSet->StorageListHead);\r
+ while (!IsNull (&FormSet->StorageListHead, Link)) {\r
+ FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
+ Link = GetNextNode (&FormSet->StorageListHead, Link);\r
+\r
+ if (FormsetStorage->BrowserStorage == Storage) {\r
+ Found = TRUE;\r
+ break;\r
+ }\r
+ }\r
+\r
+ if (Found) {\r
+ break;\r
+ }\r
+ }\r
+\r
+ return Found ? FormsetStorage : NULL;\r
+}\r
+\r
/**\r
Initialize Request Element of a Question. <RequestElement> ::= '&'<BlockName> | '&'<Label>\r
\r
//\r
// Find Formset Storage for this Question\r
//\r
- FormsetStorage = NULL;\r
- Link = GetFirstNode (&FormSet->StorageListHead);\r
- while (!IsNull (&FormSet->StorageListHead, Link)) {\r
- FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
-\r
- if (FormsetStorage->VarStoreId == Question->VarStoreId) {\r
- break;\r
- }\r
-\r
- Link = GetNextNode (&FormSet->StorageListHead, Link);\r
- }\r
+ FormsetStorage = GetFstStgFromVarId(FormSet, Question->VarStoreId);\r
ASSERT (FormsetStorage != NULL);\r
\r
//\r
while (!IsNull (&Form->ConfigRequestHead, Link)) {\r
ConfigInfo = FORM_BROWSER_CONFIG_REQUEST_FROM_LINK (Link);\r
\r
- if (ConfigInfo != NULL && ConfigInfo->Storage == Storage) {\r
+ if (ConfigInfo != NULL && ConfigInfo->Storage == FormsetStorage->BrowserStorage) {\r
Find = TRUE;\r
break;\r
}\r
ConfigInfo = AllocateZeroPool(sizeof (FORM_BROWSER_CONFIG_REQUEST));\r
ASSERT (ConfigInfo != NULL);\r
ConfigInfo->Signature = FORM_BROWSER_CONFIG_REQUEST_SIGNATURE;\r
- ConfigInfo->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigHdr), Storage->ConfigHdr);\r
+ ConfigInfo->ConfigRequest = AllocateCopyPool (StrSize (FormsetStorage->ConfigHdr), FormsetStorage->ConfigHdr);\r
ASSERT (ConfigInfo->ConfigRequest != NULL);\r
ConfigInfo->SpareStrLen = 0;\r
- ConfigInfo->Storage = Storage;\r
+ ConfigInfo->Storage = FormsetStorage->BrowserStorage;\r
InsertTailList(&Form->ConfigRequestHead, &ConfigInfo->Link);\r
}\r
\r
Default = QUESTION_DEFAULT_FROM_LINK (Link);\r
RemoveEntryList (&Default->Link);\r
\r
+ if (Default->Value.Buffer != NULL) {\r
+ FreePool (Default->Value.Buffer);\r
+ }\r
FreePool (Default);\r
}\r
\r
(Operand == EFI_IFR_TO_UPPER_OP) ||\r
(Operand == EFI_IFR_MAP_OP) ||\r
(Operand == EFI_IFR_VERSION_OP) ||\r
- (Operand == EFI_IFR_SECURITY_OP)) {\r
+ (Operand == EFI_IFR_SECURITY_OP) ||\r
+ (Operand == EFI_IFR_MATCH2_OP)) {\r
return TRUE;\r
} else {\r
return FALSE;\r
IN UINT8 Operand\r
)\r
{\r
- return Operand > EFI_IFR_WARNING_IF_OP ? TRUE : FALSE;\r
+ return Operand > EFI_IFR_MATCH2_OP ? TRUE : FALSE;\r
}\r
\r
/**\r
CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_SECURITY *) OpCodeData)->Permissions, sizeof (EFI_GUID));\r
break;\r
\r
+ case EFI_IFR_MATCH2_OP:\r
+ CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_MATCH2 *) OpCodeData)->SyntaxType, sizeof (EFI_GUID));\r
+ break;\r
+\r
case EFI_IFR_GET_OP:\r
case EFI_IFR_SET_OP:\r
CopyMem (&TempVarstoreId, &((EFI_IFR_GET *) OpCodeData)->VarStoreId, sizeof (TempVarstoreId));\r
\r
CurrentDefault->Value.Type = ((EFI_IFR_DEFAULT *) OpCodeData)->Type;\r
CopyMem (&CurrentDefault->DefaultId, &((EFI_IFR_DEFAULT *) OpCodeData)->DefaultId, sizeof (UINT16));\r
- if (OpCodeLength > OFFSET_OF (EFI_IFR_DEFAULT, Value)) {\r
+ if (CurrentDefault->Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+ CurrentDefault->Value.BufferLen = (UINT16) (OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
+ CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_DEFAULT *) OpCodeData)->Value);\r
+ ASSERT (CurrentDefault->Value.Buffer != NULL);\r
+ } else {\r
CopyMem (&CurrentDefault->Value.Value, &((EFI_IFR_DEFAULT *) OpCodeData)->Value, OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
ExtendValueToU64 (&CurrentDefault->Value);\r
}\r
// Option\r
//\r
case EFI_IFR_ONE_OF_OPTION_OP:\r
+ if (ParentStatement->Operand == EFI_IFR_ORDERED_LIST_OP && ((((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG)) != 0)) {\r
+ //\r
+ // It's keep the default value for ordered list opcode.\r
+ //\r
+ CurrentDefault = AllocateZeroPool (sizeof (QUESTION_DEFAULT));\r
+ ASSERT (CurrentDefault != NULL);\r
+ CurrentDefault->Signature = QUESTION_DEFAULT_SIGNATURE;\r
+\r
+ CurrentDefault->Value.Type = EFI_IFR_TYPE_BUFFER;\r
+ if ((((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Flags & EFI_IFR_OPTION_DEFAULT) != 0) {\r
+ CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
+ } else {\r
+ CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
+ }\r
+\r
+ CurrentDefault->Value.BufferLen = (UINT16) (OpCodeLength - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
+ CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Value);\r
+ ASSERT (CurrentDefault->Value.Buffer != NULL);\r
+\r
+ //\r
+ // Insert to Default Value list of current Question\r
+ //\r
+ InsertTailList (&ParentStatement->DefaultListHead, &CurrentDefault->Link);\r
+ break;\r
+ }\r
+\r
//\r
// EFI_IFR_ONE_OF_OPTION appear in scope of a Question.\r
// It create a selection for use in current Question.\r
// Refresh guid.\r
//\r
case EFI_IFR_REFRESH_ID_OP:\r
- ASSERT (ParentStatement != NULL);\r
- CopyMem (&ParentStatement->RefreshGuid, &((EFI_IFR_REFRESH_ID *) OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
+ //\r
+ // Get ScopeOpcode from top of stack\r
+ //\r
+ PopScope (&ScopeOpCode);\r
+ PushScope (ScopeOpCode);\r
+\r
+ switch (ScopeOpCode) {\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ ASSERT (CurrentForm != NULL);\r
+ CopyMem (&CurrentForm->RefreshGuid, &((EFI_IFR_REFRESH_ID *) OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
+ break;\r
+\r
+ default:\r
+ ASSERT (ParentStatement != NULL);\r
+ CopyMem (&ParentStatement->RefreshGuid, &((EFI_IFR_REFRESH_ID *) OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
+ break;\r
+ }\r
break;\r
\r
//\r
projects / mirror_edk2.git / blobdiff