diff options
| author | Eric Dong <eric.dong@intel.com> | 2015-09-17 02:17:53 +0000 |
|---|---|---|
| committer | hwu1225 <hwu1225@Edk2> | 2015-09-17 02:17:53 +0000 |
| commit | 873ad3b80c39a28895ec1550f4b39e0c3fcd0907 (patch) | |
| tree | a247bab72977ed928c41958fac608c43c3e0ca36 /MdeModulePkg | |
| parent | 0c9da39b512058153731ba35542ee781f33f5477 (diff) | |
| download | edk2-platforms-873ad3b80c39a28895ec1550f4b39e0c3fcd0907.tar.xz | |
MdeModulePkg/HiiDatabase: Refine KeywordHandlerProtocol->SetData().
Update this function to follow UEFI spec requirement.
(Sync patch r18490 from main trunk.)
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/branches/UDK2015@18494 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index b978669687..6923d6c473 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -2829,6 +2829,7 @@ EfiConfigKeywordHandlerSetData ( BOOLEAN ReadOnly;
EFI_STRING InternalProgress;
CHAR16 *TempString;
+ CHAR16 *KeywordStartPos;
if (This == NULL || Progress == NULL || ProgressErr == NULL || KeywordString == NULL) {
return EFI_INVALID_PARAMETER;
@@ -2843,6 +2844,7 @@ EfiConfigKeywordHandlerSetData ( KeywordData = NULL;
ValueElement = NULL;
ConfigResp = NULL;
+ KeywordStartPos = NULL;
KeywordStringId = 0;
//
@@ -2886,6 +2888,7 @@ EfiConfigKeywordHandlerSetData ( //
// 3. Extract keyword from the KeywordRequest string.
//
+ KeywordStartPos = StringPtr;
Status = ExtractKeyword(StringPtr, &KeywordData, &NextStringPtr);
if (EFI_ERROR (Status)) {
//
@@ -2942,8 +2945,8 @@ EfiConfigKeywordHandlerSetData ( // 8. Check the readonly flag.
//
if (ExtractReadOnlyFromOpCode (OpCode) != ReadOnly) {
- *ProgressErr = KEYWORD_HANDLER_INCOMPATIBLE_VALUE_DETECTED;
- Status = EFI_INVALID_PARAMETER;
+ *ProgressErr = KEYWORD_HANDLER_ACCESS_NOT_PERMITTED;
+ Status = EFI_ACCESS_DENIED;
goto Done;
}
@@ -2970,6 +2973,7 @@ EfiConfigKeywordHandlerSetData ( FreePool (ConfigResp);
ConfigResp = NULL;
}
+ KeywordStartPos = NULL;
}
//
@@ -2988,7 +2992,11 @@ EfiConfigKeywordHandlerSetData ( *ProgressErr = KEYWORD_HANDLER_NO_ERROR;
Done:
- *Progress = KeywordString + (StringPtr - TempString);
+ if (KeywordStartPos != NULL) {
+ *Progress = KeywordString + (KeywordStartPos - TempString);
+ } else {
+ *Progress = KeywordString + (StringPtr - TempString);
+ }
ASSERT (TempString != NULL);
FreePool (TempString);
@@ -3010,7 +3018,7 @@ Done: if (MultiConfigResp != NULL && MultiConfigResp != ConfigResp) {
FreePool (MultiConfigResp);
}
-
+
return Status;
}
|