Sync BaseTools Trunk (version r2518) to EDKII main trunk.

Signed-off-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13178 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 93 insertions, 10 deletions

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index b4f9d8fd7f..2e859b8dfa 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -2,7 +2,7 @@
   

   The definition of CFormPkg's member function

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, 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        

@@ -963,7 +963,7 @@ CIfrRecordInfoDB::CheckIdOpCode (
   switch (OpCode) {

   case EFI_IFR_EQ_ID_VAL_OP:

   case EFI_IFR_EQ_ID_ID_OP:

-  case EFI_IFR_EQ_ID_LIST_OP:

+  case EFI_IFR_EQ_ID_VAL_LIST_OP:

   case EFI_IFR_QUESTION_REF1_OP:

     return TRUE;

   default:

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 92e47d97a3..5f4d87aa0a 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -2,7 +2,7 @@
   

   The definition of CFormPkg's member function

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, 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        

@@ -1885,8 +1885,8 @@ private:
 public:

   CIfrEqIdList (

   IN UINT32 LineNo

-  ) : CIfrObj (EFI_IFR_EQ_ID_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),

-                   CIfrOpHeader (EFI_IFR_EQ_ID_LIST_OP, &mEqIdVList->Header) {

+  ) : CIfrObj (EFI_IFR_EQ_ID_VAL_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),

+                   CIfrOpHeader (EFI_IFR_EQ_ID_VAL_LIST_OP, &mEqIdVList->Header) {

     SetLineNo (LineNo);

     mEqIdVList->QuestionId   = EFI_QUESTION_ID_INVALID;

     mEqIdVList->ListLength   = 0;

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
index c3a729eabf..0444677e86 100644
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
@@ -2,7 +2,7 @@
   

   Vfr common library functions.

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, 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        

@@ -3067,6 +3067,83 @@ CVfrStringDB::SetStringFileName(IN CHAR8 *StringFileName)
   mStringFileName[FileLen - 1] = '\0';

 }

 

+

+/**

+  Returns TRUE or FALSE whether SupportedLanguages contains the best matching language 

+  from a set of supported languages.

+

+  @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that

+                                  contains a set of language codes.

+  @param[in]  Language            A variable that contains pointers to Null-terminated

+                                  ASCII strings that contain one language codes.

+

+  @retval FALSE   The best matching language could not be found in SupportedLanguages.

+  @retval TRUE    The best matching language could be found in SupportedLanguages.

+

+**/

+BOOLEAN

+CVfrStringDB::GetBestLanguage (

+  IN CONST CHAR8  *SupportedLanguages,

+  IN CHAR8        *Language

+  )

+{

+  UINTN        CompareLength;

+  UINTN        LanguageLength;

+  CONST CHAR8  *Supported;

+

+  if (SupportedLanguages == NULL || Language == NULL){

+    return FALSE;

+  }

+

+  //

+  // Determine the length of the first RFC 4646 language code in Language

+  //

+  for (LanguageLength = 0; Language[LanguageLength] != 0 && Language[LanguageLength] != ';'; LanguageLength++);

+

+  //

+  // Trim back the length of Language used until it is empty

+  //

+  while (LanguageLength > 0) {

+    //

+    // Loop through all language codes in SupportedLanguages

+    //

+    for (Supported = SupportedLanguages; *Supported != '\0'; Supported += CompareLength) {

+      //

+      // Skip ';' characters in Supported

+      //

+      for (; *Supported != '\0' && *Supported == ';'; Supported++);

+      //

+      // Determine the length of the next language code in Supported

+      //

+      for (CompareLength = 0; Supported[CompareLength] != 0 && Supported[CompareLength] != ';'; CompareLength++);

+      //

+      // If Language is longer than the Supported, then skip to the next language

+      //

+      if (LanguageLength > CompareLength) {

+        continue;

+      }

+

+      //

+      // See if the first LanguageLength characters in Supported match Language

+      //

+      if (strncmp (Supported, Language, LanguageLength) == 0) {

+        return TRUE;

+      }

+    }

+

+    //

+    // Trim Language from the right to the next '-' character 

+    //

+    for (LanguageLength--; LanguageLength > 0 && Language[LanguageLength] != '-'; LanguageLength--);

+  }

+

+  //

+  // No matches were found 

+  //

+  return FALSE;

+}

+

+

 CHAR8 *

 CVfrStringDB::GetVarStoreNameFormStringId (

   IN EFI_STRING_ID StringId

@@ -3122,17 +3199,18 @@ CVfrStringDB::GetVarStoreNameFormStringId (
   }

 

   //

-  // Search the language, only search the "en-US".

+  // Search the language, get best language base on RFC 4647 matching algorithm.

   //

   Current = StringPtr;

-  while (strcmp (PkgHeader->Language, "en-US") != 0) {

+  while (!GetBestLanguage ("en", PkgHeader->Language)) {

     Current += PkgHeader->Header.Length;

     PkgHeader = (EFI_HII_STRING_PACKAGE_HDR *) Current;

     //

-    // If can't find "en-US" string package, just return the first string package.

+    // If can't find string package base on language, just return the first string package.

     //

     if (Current - StringPtr >= Length) {

       Current = StringPtr;

+      PkgHeader = (EFI_HII_STRING_PACKAGE_HDR *) StringPtr;

       break;

     }

   }

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
index 9facce8149..2c0ed7bd54 100644
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
@@ -2,7 +2,7 @@
   

   Vfr common library functions.

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, 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        

@@ -438,6 +438,11 @@ private:
   UINT32 GetUnicodeStringTextSize (

     IN  UINT8            *StringSrc

     );

+    

+  BOOLEAN GetBestLanguage (

+    IN CONST CHAR8  *SupportedLanguages,

+    IN CHAR8        *Language

+    );

 

 public:

   CVfrStringDB ();