tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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@18490 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2015-09-17 01:20:37 +00:00 committed by ydong10
parent 6c20eda777
commit 580d230d12
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2829,6 +2829,7 @@ EfiConfigKeywordHandlerSetData (
BOOLEAN ReadOnly; BOOLEAN ReadOnly;
EFI_STRING InternalProgress; EFI_STRING InternalProgress;
CHAR16 *TempString; CHAR16 *TempString;
CHAR16 *KeywordStartPos;
if (This == NULL || Progress == NULL || ProgressErr == NULL || KeywordString == NULL) { if (This == NULL || Progress == NULL || ProgressErr == NULL || KeywordString == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -2843,6 +2844,7 @@ EfiConfigKeywordHandlerSetData (
KeywordData = NULL; KeywordData = NULL;
ValueElement = NULL; ValueElement = NULL;
ConfigResp = NULL; ConfigResp = NULL;
KeywordStartPos = NULL;
KeywordStringId = 0; KeywordStringId = 0;
// //
@ -2886,6 +2888,7 @@ EfiConfigKeywordHandlerSetData (
// //
// 3. Extract keyword from the KeywordRequest string. // 3. Extract keyword from the KeywordRequest string.
// //
KeywordStartPos = StringPtr;
Status = ExtractKeyword(StringPtr, &KeywordData, &NextStringPtr); Status = ExtractKeyword(StringPtr, &KeywordData, &NextStringPtr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// //
@ -2942,8 +2945,8 @@ EfiConfigKeywordHandlerSetData (
// 8. Check the readonly flag. // 8. Check the readonly flag.
// //
if (ExtractReadOnlyFromOpCode (OpCode) != ReadOnly) { if (ExtractReadOnlyFromOpCode (OpCode) != ReadOnly) {
*ProgressErr = KEYWORD_HANDLER_INCOMPATIBLE_VALUE_DETECTED; *ProgressErr = KEYWORD_HANDLER_ACCESS_NOT_PERMITTED;
Status = EFI_INVALID_PARAMETER; Status = EFI_ACCESS_DENIED;
goto Done; goto Done;
} }
@ -2970,6 +2973,7 @@ EfiConfigKeywordHandlerSetData (
FreePool (ConfigResp); FreePool (ConfigResp);
ConfigResp = NULL; ConfigResp = NULL;
} }
KeywordStartPos = NULL;
} }
// //
@ -2988,7 +2992,11 @@ EfiConfigKeywordHandlerSetData (
*ProgressErr = KEYWORD_HANDLER_NO_ERROR; *ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done: Done:
*Progress = KeywordString + (StringPtr - TempString); if (KeywordStartPos != NULL) {
*Progress = KeywordString + (KeywordStartPos - TempString);
} else {
*Progress = KeywordString + (StringPtr - TempString);
}
ASSERT (TempString != NULL); ASSERT (TempString != NULL);
FreePool (TempString); FreePool (TempString);
@ -3010,7 +3018,7 @@ Done:
if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) { if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) {
FreePool (MultiConfigResp); FreePool (MultiConfigResp);
} }
return Status; return Status;
} }