sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/HiiDatabase: Refine KeywordHandlerProtocol->GetData().

Browse Source 
Update this function to follow UEFI spec requirement.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18489 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong
2015-09-17 01:15:32 +00:00
committed by ydong10
parent 3f4288fe26
commit 6c20eda777
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
View File

@ -1340,8 +1340,7 @@ GetStringIdFromRecord (
if (AsciiStrnCmp(Name, StringPackage->StringPkgHdr->Language, AsciiStrLen (Name)) == 0) { if (AsciiStrnCmp(Name, StringPackage->StringPkgHdr->Language, AsciiStrLen (Name)) == 0) {
Status = GetStringIdFromString (StringPackage, KeywordValue, StringId); Status = GetStringIdFromString (StringPackage, KeywordValue, StringId);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
RetVal = KEYWORD_HANDLER_KEYWORD_NOT_FOUND; return KEYWORD_HANDLER_KEYWORD_NOT_FOUND;
continue;
} else { } else {
if (*NameSpace == NULL) { if (*NameSpace == NULL) {
*NameSpace = AllocateCopyPool (AsciiStrSize (StringPackage->StringPkgHdr->Language), StringPackage->StringPkgHdr->Language); *NameSpace = AllocateCopyPool (AsciiStrSize (StringPackage->StringPkgHdr->Language), StringPackage->StringPkgHdr->Language);
@ -2556,6 +2555,7 @@ MergeToMultiKeywordResp (
@param NameSpace The namespace used to search the string. @param NameSpace The namespace used to search the string.
@param MultiResp Return the MultiKeywordResp string for the system. @param MultiResp Return the MultiKeywordResp string for the system.
@param ProgressErr Return the error status.
@retval EFI_OUT_OF_RESOURCES The memory can't be allocated. @retval EFI_OUT_OF_RESOURCES The memory can't be allocated.
@retval EFI_SUCCESS Generate the MultiKeywordResp string. @retval EFI_SUCCESS Generate the MultiKeywordResp string.
@ -2565,7 +2565,8 @@ MergeToMultiKeywordResp (
EFI_STATUS EFI_STATUS
EnumerateAllKeywords ( EnumerateAllKeywords (
IN CHAR8 *NameSpace, IN CHAR8 *NameSpace,
OUT EFI_STRING *MultiResp OUT EFI_STRING *MultiResp,
OUT UINT32 *ProgressErr
) )
{ {
LIST_ENTRY *Link; LIST_ENTRY *Link;
@ -2585,6 +2586,7 @@ EnumerateAllKeywords (
CHAR16 *MultiKeywordResp; CHAR16 *MultiKeywordResp;
CHAR16 *KeywordData; CHAR16 *KeywordData;
BOOLEAN ReadOnly; BOOLEAN ReadOnly;
BOOLEAN FindKeywordPackages;
DataBaseRecord = NULL; DataBaseRecord = NULL;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
@ -2594,6 +2596,7 @@ EnumerateAllKeywords (
ConfigRequest = NULL; ConfigRequest = NULL;
ValueElement = NULL; ValueElement = NULL;
KeywordResp = NULL; KeywordResp = NULL;
FindKeywordPackages = FALSE;
if (NameSpace == NULL) { if (NameSpace == NULL) {
NameSpace = UEFI_CONFIG_LANG; NameSpace = UEFI_CONFIG_LANG;
@ -2616,6 +2619,7 @@ EnumerateAllKeywords (
// Check whether has keyword string package. // Check whether has keyword string package.
// //
if (AsciiStrnCmp(NameSpace, StringPackage->StringPkgHdr->Language, AsciiStrLen (NameSpace)) == 0) { if (AsciiStrnCmp(NameSpace, StringPackage->StringPkgHdr->Language, AsciiStrLen (NameSpace)) == 0) {
FindKeywordPackages = TRUE;
// //
// Keep the NameSpace string. // Keep the NameSpace string.
// //
@ -2718,6 +2722,11 @@ Error:
// //
if (MultiKeywordResp == NULL) { if (MultiKeywordResp == NULL) {
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
if (!FindKeywordPackages) {
*ProgressErr = KEYWORD_HANDLER_NAMESPACE_ID_NOT_FOUND;
} else {
*ProgressErr = KEYWORD_HANDLER_KEYWORD_NOT_FOUND;
}
} else { } else {
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
} }
@ -2857,7 +2866,7 @@ EfiConfigKeywordHandlerSetData (
// 1.1 Check whether the input namespace is valid. // 1.1 Check whether the input namespace is valid.
// //
if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) { if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) {
*ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR; *ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING;
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
goto Done; goto Done;
} }
@ -3133,7 +3142,7 @@ EfiConfigKeywordHandlerGetData (
TempString = NULL; TempString = NULL;
} }
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
*ProgressErr = KEYWORD_HANDLER_NAMESPACE_ID_NOT_FOUND; *ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING;
return Status; return Status;
} }
// //
@ -3141,7 +3150,7 @@ EfiConfigKeywordHandlerGetData (
// //
if (NameSpace != NULL){ if (NameSpace != NULL){
if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) { if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) {
*ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR; *ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING;
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
} }
@ -3263,7 +3272,7 @@ EfiConfigKeywordHandlerGetData (
// //
// Enumerate all keyword in the system. // Enumerate all keyword in the system.
// //
Status = EnumerateAllKeywords(NameSpace, &MultiKeywordResp); Status = EnumerateAllKeywords(NameSpace, &MultiKeywordResp, ProgressErr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto Done;
} }