SF.net SVN: edk2-buildtools:[2480] trunk/BaseTools/Source/C/VfrCompile

[<yd...@us...>]

Revision: 2480
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2480&view=rev
Author:   ydong10
Date:     2012-01-16 05:48:20 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Enhance code logic when get string info base on the input StringId.
Signed-off-by:ydong10
Reviewed-by: mdkinney
Reviewed-by: lgao4

Modified Paths:
--------------
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2012-01-13 05:52:23 UTC (rev 2479)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2012-01-16 05:48:20 UTC (rev 2480)
@@ -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 @@
   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 @@
   }
 
   //
-  // 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;
     }
   }

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2012-01-13 05:52:23 UTC (rev 2479)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2012-01-16 05:48:20 UTC (rev 2480)
@@ -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 @@
   UINT32 GetUnicodeStringTextSize (
     IN  UINT8            *StringSrc
     );
+    
+  BOOLEAN GetBestLanguage (
+    IN CONST CHAR8  *SupportedLanguages,
+    IN CHAR8        *Language
+    );
 
 public:
   CVfrStringDB ();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.