Revision: 18074
http://sourceforge.net/p/edk2/code/18074
Author: ydong10
Date: 2015-07-27 07:40:18 +0000 (Mon, 27 Jul 2015)
Log Message:
-----------
Support get string from configuration string packages.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Library/UefiHiiLib/HiiString.c
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
Modified: trunk/edk2/MdeModulePkg/Library/UefiHiiLib/HiiString.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/UefiHiiLib/HiiString.c 2015-07-27
06:43:29 UTC (rev 18073)
+++ trunk/edk2/MdeModulePkg/Library/UefiHiiLib/HiiString.c 2015-07-27
07:40:18 UTC (rev 18074)
@@ -1,7 +1,7 @@
/** @file
HII Library implementation that uses DXE protocols and services.
- Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -106,6 +106,13 @@
if (*Supported != 0) {
*(Supported++) = '\0';
}
+
+ if ((SupportedLanguages == NULL) && AsciiStrnCmp (Language,
UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) == 0) {
+ //
+ // Skip string package used for keyword protocol.
+ //
+ continue;
+ }
//
// If StringId is 0, then call NewString(). Otherwise, call SetString()
Modified: trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c 2015-07-27
06:43:29 UTC (rev 18073)
+++ trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c 2015-07-27
07:40:18 UTC (rev 18074)
@@ -1834,12 +1834,6 @@
Link = Link->ForwardLink
) {
StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry,
HII_STRING_PACKAGE_SIGNATURE);
- if (AsciiStrnCmp (StringPackage->StringPkgHdr->Language, UEFI_CONFIG_LANG,
AsciiStrLen (UEFI_CONFIG_LANG)) == 0) {
- //
- // Skip string package used for keyword protocol.
- //
- continue;
- }
ResultSize += AsciiStrSize (StringPackage->StringPkgHdr->Language);
if (ResultSize <= *LanguagesSize) {
AsciiStrCpyS (Languages, *LanguagesSize / sizeof (CHAR8),
StringPackage->StringPkgHdr->Language);
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
