Replace references to RFC 3066 with RFC 4646.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
index 74ddad0130ceff988595a8932aa29950c6307d13..a25650d8d7bf962490e9108d1bdcdb9299f7e8a1 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
@@ -306,8 +306,8 @@ HiiFindHandles (
 }\r
 \r
 EFI_STATUS\r
-LangCodes3066To639 (\r
-  IN CHAR8 *LangCodes3066,\r
+LangCodes4646To639 (\r
+  IN CHAR8 *LangCodes4646,\r
   IN CHAR8 **LangCodes639\r
   )\r
 {\r
@@ -317,22 +317,22 @@ LangCodes3066To639 (
   UINTN                      Count;\r
   EFI_STATUS                 Status;\r
 \r
-  ASSERT (LangCodes3066 != NULL);\r
+  ASSERT (LangCodes4646 != NULL);\r
   ASSERT (LangCodes639 != NULL);\r
   \r
   //\r
-  // Allocate working buffer to contain substring of LangCodes3066.\r
+  // Allocate working buffer to contain substring of LangCodes4646.\r
   //\r
-  Lang = AllocatePool (AsciiStrSize (LangCodes3066));\r
+  Lang = AllocatePool (AsciiStrSize (LangCodes4646));\r
   if (Lang == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   //\r
-  // Count the number of RFC 3066 language codes.\r
+  // Count the number of RFC 4646 language codes.\r
   //\r
   Index = 0;\r
-  AsciiLangCodes = LangCodes3066;\r
+  AsciiLangCodes = LangCodes4646;\r
   while (AsciiStrLen (AsciiLangCodes) != 0) {\r
     GetNextLanguage (&AsciiLangCodes, Lang);\r
     Index++;\r
@@ -349,11 +349,11 @@ LangCodes3066To639 (
     goto Done;\r
   }\r
 \r
-  AsciiLangCodes = LangCodes3066;\r
+  AsciiLangCodes = LangCodes4646;\r
 \r
   for (Index = 0; Index < Count; Index++) {\r
     GetNextLanguage (&AsciiLangCodes, Lang);\r
-    Status = ConvertRfc3066LanguageToIso639Language (Lang, *LangCodes639 + Index * ISO_639_2_ENTRY_SIZE);\r
+    Status = ConvertRfc4646LanguageToIso639Language (Lang, *LangCodes639 + Index * ISO_639_2_ENTRY_SIZE);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
@@ -391,7 +391,7 @@ HiiGetPrimaryLanguages (
 {\r
   HII_THUNK_PRIVATE_DATA     *Private;\r
   EFI_HII_HANDLE             UefiHiiHandle;\r
-  CHAR8                      *LangCodes3066;\r
+  CHAR8                      *LangCodes4646;\r
   CHAR16                     *UnicodeLangCodes639;\r
   CHAR8                      *LangCodes639;\r
   EFI_STATUS                 Status;\r
@@ -403,15 +403,15 @@ HiiGetPrimaryLanguages (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  LangCodes3066 = HiiGetSupportedLanguages (UefiHiiHandle);\r
+  LangCodes4646 = HiiGetSupportedLanguages (UefiHiiHandle);\r
 \r
-  if (LangCodes3066 == NULL) {\r
+  if (LangCodes4646 == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
 \r
   LangCodes639 = NULL;\r
-  Status = LangCodes3066To639 (LangCodes3066, &LangCodes639);\r
+  Status = LangCodes4646To639 (LangCodes4646, &LangCodes639);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -429,7 +429,7 @@ HiiGetPrimaryLanguages (
   *LanguageString = UnicodeLangCodes639;\r
 \r
 Done:\r
-  FreePool (LangCodes3066);\r
+  FreePool (LangCodes4646);\r
   if (LangCodes639 != NULL) {\r
     FreePool (LangCodes639);\r
   }\r
@@ -524,9 +524,9 @@ HiiGetSecondaryLanguages (
 {\r
   HII_THUNK_PRIVATE_DATA     *Private;\r
   EFI_HII_HANDLE             UefiHiiHandle;\r
-  CHAR8                      *PrimaryLang3066;\r
+  CHAR8                      *PrimaryLang4646;\r
   CHAR8                      *PrimaryLang639;\r
-  CHAR8                      *SecLangCodes3066;\r
+  CHAR8                      *SecLangCodes4646;\r
   CHAR8                      *SecLangCodes639;\r
   CHAR16                     *UnicodeSecLangCodes639;\r
   EFI_STATUS                 Status;\r
@@ -534,8 +534,8 @@ HiiGetSecondaryLanguages (
   Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
 \r
   SecLangCodes639        = NULL;\r
-  SecLangCodes3066       = NULL;\r
-  PrimaryLang3066        = NULL;\r
+  SecLangCodes4646       = NULL;\r
+  PrimaryLang4646        = NULL;\r
   UnicodeSecLangCodes639 = NULL;\r
 \r
   UefiHiiHandle = FwHiiHandleToUefiHiiHandle (Private, Handle);\r
@@ -551,17 +551,17 @@ HiiGetSecondaryLanguages (
 \r
   UnicodeStrToAsciiStr (PrimaryLanguage, PrimaryLang639);\r
 \r
-  PrimaryLang3066 = ConvertIso639LanguageToRfc3066Language (PrimaryLang639);\r
-  ASSERT_EFI_ERROR (PrimaryLang3066 != NULL);\r
+  PrimaryLang4646 = ConvertIso639LanguageToRfc4646Language (PrimaryLang639);\r
+  ASSERT_EFI_ERROR (PrimaryLang4646 != NULL);\r
 \r
-  SecLangCodes3066 = HiiGetSupportedSecondaryLanguages (UefiHiiHandle, PrimaryLang3066);\r
+  SecLangCodes4646 = HiiGetSupportedSecondaryLanguages (UefiHiiHandle, PrimaryLang4646);\r
 \r
-  if (SecLangCodes3066 == NULL) {\r
+  if (SecLangCodes4646 == NULL) {\r
     Status =  EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
 \r
-  Status = LangCodes3066To639 (SecLangCodes3066, &SecLangCodes639);\r
+  Status = LangCodes4646To639 (SecLangCodes4646, &SecLangCodes639);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -573,7 +573,7 @@ HiiGetSecondaryLanguages (
   }\r
 \r
   //\r
-  // The language returned is in RFC 3066 format.\r
+  // The language returned is in RFC 4646 format.\r
   //\r
   *LanguageString = AsciiStrToUnicodeStr (SecLangCodes639, UnicodeSecLangCodes639);\r
 \r
@@ -586,12 +586,12 @@ Done:
     FreePool (SecLangCodes639);\r
   }\r
 \r
-  if (PrimaryLang3066 != NULL) {\r
-    FreePool (PrimaryLang3066);\r
+  if (PrimaryLang4646 != NULL) {\r
+    FreePool (PrimaryLang4646);\r
   }\r
 \r
-  if (SecLangCodes3066 != NULL) {\r
-    FreePool (SecLangCodes3066);\r
+  if (SecLangCodes4646 != NULL) {\r
+    FreePool (SecLangCodes4646);\r
   }\r
   if (UnicodeSecLangCodes639 != NULL) {\r
     FreePool (UnicodeSecLangCodes639);\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 2c8b7adabad67a055baf9420f7f925d1c8c09e9e..1ae31b4e6f32c84d8bc639c317bd71d89b263332 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -476,18 +476,18 @@ InitSetBrowserStrings (
 ;\r
 \r
 /**\r
-  Convert language code from RFC3066 to ISO639-2.\r
+  Convert language code from RFC4646 to ISO639-2.\r
 \r
-  LanguageRfc3066 contain a single RFC 3066 code such as\r
+  LanguageRfc4646 contain a single RFC 4646 code such as\r
   "en-US" or "fr-FR".\r
 \r
-  The LanguageRfc3066 must be a buffer large enough\r
+  The LanguageRfc4646 must be a buffer large enough\r
   for ISO_639_2_ENTRY_SIZE characters.\r
 \r
-  If LanguageRfc3066 is NULL, then ASSERT.\r
+  If LanguageRfc4646 is NULL, then ASSERT.\r
   If LanguageIso639 is NULL, then ASSERT.\r
 \r
-  @param  LanguageRfc3066        RFC3066 language code.\r
+  @param  LanguageRfc4646        RFC4646 language code.\r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
   @retval EFI_SUCCESS            Language code converted.\r
@@ -496,21 +496,21 @@ InitSetBrowserStrings (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ConvertRfc3066LanguageToIso639Language (\r
-  IN  CHAR8   *LanguageRfc3066,\r
+ConvertRfc4646LanguageToIso639Language (\r
+  IN  CHAR8   *LanguageRfc4646,\r
   OUT CHAR8   *LanguageIso639\r
   )\r
 ;\r
 \r
 /**\r
-  Convert language code from ISO639-2 to RFC3066 and return the converted language.\r
+  Convert language code from ISO639-2 to RFC4646 and return the converted language.\r
   Caller is responsible for freeing the allocated buffer.\r
 \r
   LanguageIso639 contain a single ISO639-2 code such as\r
   "eng" or "fra".\r
 \r
   If LanguageIso639 is NULL, then ASSERT.\r
-  If LanguageRfc3066 is NULL, then ASSERT.\r
+  If LanguageRfc4646 is NULL, then ASSERT.\r
 \r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
@@ -519,7 +519,7 @@ ConvertRfc3066LanguageToIso639Language (
 **/\r
 CHAR8*\r
 EFIAPI\r
-ConvertIso639LanguageToRfc3066Language (\r
+ConvertIso639LanguageToRfc4646Language (\r
   IN  CONST CHAR8   *LanguageIso639\r
   )\r
 ;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
index 3fab323dc70c2c9901bff793af16752a7b5fd646..daf652c1ab7b460293b99a13f9606d135163271c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
@@ -17,10 +17,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 typedef struct {\r
   CHAR8 *Iso639;\r
-  CHAR8 *Rfc3066;\r
-} ISO639TORFC3066MAP;\r
+  CHAR8 *Rfc4646;\r
+} ISO639TORFC4646MAP;\r
 \r
-ISO639TORFC3066MAP Iso639ToRfc3066Map [] = {\r
+ISO639TORFC4646MAP Iso639ToRfc4646Map [] = {\r
     {"eng", "en-US"},\r
     {"fra", "fr-FR"},\r
 };\r
@@ -30,7 +30,7 @@ ISO639TORFC3066MAP Iso639ToRfc3066Map [] = {
 // Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.\r
 // The last 2 CHAR8 values are the ISO 639-1 code.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc3066ConversionTable[] =\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc4646ConversionTable[] =\r
 "\\r
 aaraa\\r
 abkab\\r
@@ -170,7 +170,7 @@ zulzu\
 ";\r
 \r
 CHAR8 *\r
-ConvertIso639ToRfc3066 (\r
+ConvertIso639ToRfc4646 (\r
   CHAR8 *Iso638Lang\r
   )\r
 {\r
@@ -186,9 +186,9 @@ ConvertIso639ToRfc3066 (
        }\r
   }\r
 \r
-  for (Index = 0; Index < sizeof (Iso639ToRfc3066Map) / sizeof (Iso639ToRfc3066Map[0]); Index++) {\r
-    if (AsciiStrnCmp (AsciiLanguage, Iso639ToRfc3066Map[Index].Iso639, AsciiStrSize (AsciiLanguage)) == 0) {\r
-      return Iso639ToRfc3066Map[Index].Rfc3066;\r
+  for (Index = 0; Index < sizeof (Iso639ToRfc4646Map) / sizeof (Iso639ToRfc4646Map[0]); Index++) {\r
+    if (AsciiStrnCmp (AsciiLanguage, Iso639ToRfc4646Map[Index].Iso639, AsciiStrSize (AsciiLanguage)) == 0) {\r
+      return Iso639ToRfc4646Map[Index].Rfc4646;\r
     }\r
   }\r
 \r
@@ -196,9 +196,9 @@ ConvertIso639ToRfc3066 (
 }\r
 \r
 /**\r
-  Convert language code from RFC3066 to ISO639-2.\r
+  Convert language code from RFC4646 to ISO639-2.\r
 \r
-  @param  LanguageRfc3066        RFC3066 language code.\r
+  @param  LanguageRfc4646        RFC4646 language code.\r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
   @retval EFI_SUCCESS            Language code converted.\r
@@ -207,21 +207,21 @@ ConvertIso639ToRfc3066 (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ConvertRfc3066LanguageToIso639Language (\r
-  IN  CHAR8   *LanguageRfc3066,\r
+ConvertRfc4646LanguageToIso639Language (\r
+  IN  CHAR8   *LanguageRfc4646,\r
   OUT CHAR8   *LanguageIso639\r
   )\r
 {\r
   UINTN  Index;\r
 \r
-  if ((LanguageRfc3066[2] != '-') && (LanguageRfc3066[2] != 0)) {\r
-    CopyMem (LanguageIso639, LanguageRfc3066, 3);\r
+  if ((LanguageRfc4646[2] != '-') && (LanguageRfc4646[2] != 0)) {\r
+    CopyMem (LanguageIso639, LanguageRfc4646, 3);\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
-    if (CompareMem (LanguageRfc3066, &Iso639ToRfc3066ConversionTable[Index + 3], 2) == 0) {\r
-      CopyMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3);\r
+  for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+    if (CompareMem (LanguageRfc4646, &Iso639ToRfc4646ConversionTable[Index + 3], 2) == 0) {\r
+      CopyMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3);\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -231,14 +231,14 @@ ConvertRfc3066LanguageToIso639Language (
 \r
 \r
 /**\r
-  Convert language code from ISO639-2 to RFC3066 and return the converted language.\r
+  Convert language code from ISO639-2 to RFC4646 and return the converted language.\r
   Caller is responsible for freeing the allocated buffer.\r
 \r
   LanguageIso639 contain a single ISO639-2 code such as\r
   "eng" or "fra".\r
 \r
   If LanguageIso639 is NULL, then ASSERT.\r
-  If LanguageRfc3066 is NULL, then ASSERT.\r
+  If LanguageRfc4646 is NULL, then ASSERT.\r
 \r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
@@ -247,20 +247,20 @@ ConvertRfc3066LanguageToIso639Language (
 **/\r
 CHAR8*\r
 EFIAPI\r
-ConvertIso639LanguageToRfc3066Language (\r
+ConvertIso639LanguageToRfc4646Language (\r
   IN  CONST CHAR8   *LanguageIso639\r
   )\r
 {\r
   UINTN Index;\r
-  CHAR8 *Rfc3066Language;\r
+  CHAR8 *Rfc4646Language;\r
   \r
-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
-    if (CompareMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3) == 0) {\r
-      Rfc3066Language = AllocateZeroPool (3);\r
-      if (Rfc3066Language != NULL) {\r
-        Rfc3066Language = CopyMem (Rfc3066Language, &Iso639ToRfc3066ConversionTable[Index + 3], 2);\r
+  for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+    if (CompareMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3) == 0) {\r
+      Rfc4646Language = AllocateZeroPool (3);\r
+      if (Rfc4646Language != NULL) {\r
+        Rfc4646Language = CopyMem (Rfc4646Language, &Iso639ToRfc4646ConversionTable[Index + 3], 2);\r
       }\r
-      return Rfc3066Language;\r
+      return Rfc4646Language;\r
     }\r
   }\r
 \r
@@ -383,7 +383,7 @@ GetTagGuidByFwHiiHandle (
   Create or update the String given a new string and String ID.\r
 \r
   @param ThunkContext           The Thunk Context.\r
-  @param Rfc3066AsciiLanguage   The RFC 3066 Language code in ASCII string format.\r
+  @param Rfc4646AsciiLanguage   The RFC 4646 Language code in ASCII string format.\r
   @param NewString              The new string.\r
   @param StringId               The String ID. If StringId is 0, a new String Token\r
                                 is created. Otherwise, the String Token StringId is \r
@@ -399,14 +399,14 @@ GetTagGuidByFwHiiHandle (
 EFI_STATUS\r
 UpdateString (\r
   IN CONST HII_THUNK_CONTEXT        *ThunkContext,\r
-  IN CONST CHAR8                    *Rfc3066AsciiLanguage,\r
+  IN CONST CHAR8                    *Rfc4646AsciiLanguage,\r
   IN       CHAR16                   *NewString,\r
   IN OUT STRING_REF                 *StringId\r
   )\r
 {\r
   EFI_STRING_ID                             NewStringId;\r
 \r
-  NewStringId = HiiSetString (ThunkContext->UefiHiiHandle, *StringId, NewString, Rfc3066AsciiLanguage);\r
+  NewStringId = HiiSetString (ThunkContext->UefiHiiHandle, *StringId, NewString, Rfc4646AsciiLanguage);\r
   *StringId = NewStringId;\r
   if (NewStringId == 0) {\r
     //\r
@@ -457,19 +457,19 @@ HiiNewString (
   EFI_STRING_ID                             LastStringId;\r
   CHAR8                                     AsciiLanguage[ISO_639_2_ENTRY_SIZE + 1];\r
   CHAR16                                    LanguageCopy[ISO_639_2_ENTRY_SIZE + 1];\r
-  CHAR8                                     *Rfc3066AsciiLanguage;\r
+  CHAR8                                     *Rfc4646AsciiLanguage;\r
 \r
   LastStringId      = (EFI_STRING_ID) 0;\r
   StringId          = (EFI_STRING_ID) 0;\r
-  Rfc3066AsciiLanguage = NULL;\r
+  Rfc4646AsciiLanguage = NULL;\r
 \r
   if (Language != NULL) {\r
     ZeroMem (AsciiLanguage, sizeof (AsciiLanguage));;\r
     ZeroMem (LanguageCopy, sizeof (LanguageCopy));\r
     CopyMem (LanguageCopy, Language, ISO_639_2_ENTRY_SIZE * sizeof (CHAR16));\r
     UnicodeStrToAsciiStr (LanguageCopy, AsciiLanguage);\r
-    Rfc3066AsciiLanguage = ConvertIso639ToRfc3066 (AsciiLanguage);\r
-    ASSERT (Rfc3066AsciiLanguage != NULL);\r
+    Rfc4646AsciiLanguage = ConvertIso639ToRfc4646 (AsciiLanguage);\r
+    ASSERT (Rfc4646AsciiLanguage != NULL);\r
   }\r
 \r
   Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
@@ -490,7 +490,7 @@ HiiNewString (
       if (CompareGuid (&TagGuid, &ThunkContext->TagGuid)) {\r
         if (ThunkContext->SharingStringPack) {\r
           StringId = *Reference;\r
-          Status = UpdateString (ThunkContext, Rfc3066AsciiLanguage, NewString, &StringId);\r
+          Status = UpdateString (ThunkContext, Rfc4646AsciiLanguage, NewString, &StringId);\r
           if (EFI_ERROR (Status)) {\r
             break;\r
           }\r
@@ -518,7 +518,7 @@ HiiNewString (
     }\r
   } else {\r
     StringId = *Reference;\r
-    Status = UpdateString (StringPackThunkContext, Rfc3066AsciiLanguage, NewString, &StringId);\r
+    Status = UpdateString (StringPackThunkContext, Rfc4646AsciiLanguage, NewString, &StringId);\r
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -591,7 +591,7 @@ HiiThunkGetString (
 {\r
   HII_THUNK_PRIVATE_DATA                *Private;\r
   CHAR8                                 *Iso639AsciiLanguage;\r
-  CHAR8                                 *Rfc3066AsciiLanguage;\r
+  CHAR8                                 *Rfc4646AsciiLanguage;\r
   CHAR8                                 *SupportedLanguages;\r
   CHAR8                                 *PlatformLanguage;\r
   CHAR8                                 *BestLanguage;\r
@@ -601,7 +601,7 @@ HiiThunkGetString (
   Private = HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
 \r
   Iso639AsciiLanguage = NULL;\r
-  Rfc3066AsciiLanguage = NULL;\r
+  Rfc4646AsciiLanguage = NULL;\r
 \r
   if (LanguageString != NULL) {\r
     Iso639AsciiLanguage = AllocateZeroPool (StrLen (LanguageString) + 1);\r
@@ -612,15 +612,15 @@ HiiThunkGetString (
 \r
     //\r
     // Caller of Framework HII Interface uses the Language Identification String defined \r
-    // in Iso639. So map it to the Language Identifier defined in RFC3066.\r
+    // in Iso639. So map it to the Language Identifier defined in RFC4646.\r
     //\r
-    Rfc3066AsciiLanguage = ConvertIso639ToRfc3066 (Iso639AsciiLanguage);\r
+    Rfc4646AsciiLanguage = ConvertIso639ToRfc4646 (Iso639AsciiLanguage);\r
 \r
     //\r
-    // If Rfc3066AsciiLanguage is NULL, more language mapping must be added to \r
-    // Iso639ToRfc3066Map.\r
+    // If Rfc4646AsciiLanguage is NULL, more language mapping must be added to \r
+    // Iso639ToRfc4646Map.\r
     //\r
-    ASSERT (Rfc3066AsciiLanguage != NULL);\r
+    ASSERT (Rfc4646AsciiLanguage != NULL);\r
     \r
   }\r
 \r
@@ -630,7 +630,7 @@ HiiThunkGetString (
     goto Done;\r
   }\r
 \r
-  if (Rfc3066AsciiLanguage == NULL) {\r
+  if (Rfc4646AsciiLanguage == NULL) {\r
     //\r
     // Get the languages that the package specified by HiiHandle supports\r
     //\r
@@ -679,7 +679,7 @@ Error2:
   } else {\r
     Status = mHiiStringProtocol->GetString (\r
                                  mHiiStringProtocol,\r
-                                 Rfc3066AsciiLanguage,\r
+                                 Rfc4646AsciiLanguage,\r
                                  UefiHiiHandle,\r
                                  Token,\r
                                  StringBuffer,\r

diff --git a/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c b/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c
index 33c8510b8dc16c51a361d9d9bd52fb41a5ce43c0..c24bf8d0091b9bdf7377e80996a9c958678a3f91 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/Uc2OnUcThunk/Uc2OnUcThunk.c
@@ -43,7 +43,7 @@ Module Name:
 // Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.\r
 // The last 2 CHAR8 values are the ISO 639-1 code.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc3066ConversionTable[] =\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc4646ConversionTable[] =\r
 "\\r
 aaraa\\r
 abkab\\r
@@ -183,14 +183,14 @@ zulzu\
 ";\r
 \r
 /**\r
-  Convert language code from ISO639-2 to RFC3066 and return the converted language.\r
+  Convert language code from ISO639-2 to RFC4646 and return the converted language.\r
   Caller is responsible for freeing the allocated buffer.\r
 \r
   LanguageIso639 contain a single ISO639-2 code such as\r
   "eng" or "fra".\r
 \r
   If LanguageIso639 is NULL, then ASSERT.\r
-  If LanguageRfc3066 is NULL, then ASSERT.\r
+  If LanguageRfc4646 is NULL, then ASSERT.\r
 \r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
@@ -199,20 +199,20 @@ zulzu\
 **/\r
 CHAR8*\r
 EFIAPI\r
-ConvertIso639LanguageToRfc3066Language (\r
+ConvertIso639LanguageToRfc4646Language (\r
   IN  CONST CHAR8   *LanguageIso639\r
   )\r
 {\r
   UINTN Index;\r
-  CHAR8 *Rfc3066Language;\r
+  CHAR8 *Rfc4646Language;\r
   \r
-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
-    if (CompareMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3) == 0) {\r
-      Rfc3066Language = AllocateZeroPool (3);\r
-      if (Rfc3066Language != NULL) {\r
-        Rfc3066Language = CopyMem (Rfc3066Language, &Iso639ToRfc3066ConversionTable[Index + 3], 2);\r
+  for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+    if (CompareMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3) == 0) {\r
+      Rfc4646Language = AllocateZeroPool (3);\r
+      if (Rfc4646Language != NULL) {\r
+        Rfc4646Language = CopyMem (Rfc4646Language, &Iso639ToRfc4646ConversionTable[Index + 3], 2);\r
       }\r
-      return Rfc3066Language;\r
+      return Rfc4646Language;\r
     }\r
   }\r
 \r
@@ -430,7 +430,7 @@ UcNotificationEvent (
     //\r
     // Fill in rest of private data structure\r
     //\r
-    Private->UC2.SupportedLanguages = ConvertIso639LanguageToRfc3066Language (Private->UC->SupportedLanguages);\r
+    Private->UC2.SupportedLanguages = ConvertIso639LanguageToRfc4646Language (Private->UC->SupportedLanguages);\r
     if (Private->UC2.SupportedLanguages != NULL) {\r
 \r
       //\r

diff --git a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c
index 76fec60269adc0f439c3583c3f96c59447927bd1..094c36652a6df0b5f687d823e3af157692e2b23c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c
+++ b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcOnUc2Thunk.c
@@ -43,7 +43,7 @@ Module Name:
 // Each entry is 5 CHAR8 values long.  The first 3 CHAR8 values are the ISO 639-2 code.\r
 // The last 2 CHAR8 values are the ISO 639-1 code.\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc3066ConversionTable[] =\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 Iso639ToRfc4646ConversionTable[] =\r
 "\\r
 aaraa\\r
 abkab\\r
@@ -183,9 +183,9 @@ zulzu\
 ";\r
 \r
 /**\r
-  Convert language code from RFC3066 to ISO639-2.\r
+  Convert language code from RFC4646 to ISO639-2.\r
 \r
-  @param  LanguageRfc3066        RFC3066 language code.\r
+  @param  LanguageRfc4646        RFC4646 language code.\r
   @param  LanguageIso639         ISO639-2 language code.\r
 \r
   @retval EFI_SUCCESS            Language code converted.\r
@@ -194,21 +194,21 @@ zulzu\
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ConvertRfc3066LanguageToIso639Language (\r
-  IN  CHAR8   *LanguageRfc3066,\r
+ConvertRfc4646LanguageToIso639Language (\r
+  IN  CHAR8   *LanguageRfc4646,\r
   OUT CHAR8   *LanguageIso639\r
   )\r
 {\r
   UINTN  Index;\r
 \r
-  if ((LanguageRfc3066[2] != '-') && (LanguageRfc3066[2] != 0)) {\r
-    CopyMem (LanguageIso639, LanguageRfc3066, 3);\r
+  if ((LanguageRfc4646[2] != '-') && (LanguageRfc4646[2] != 0)) {\r
+    CopyMem (LanguageIso639, LanguageRfc4646, 3);\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  for (Index = 0; Iso639ToRfc3066ConversionTable[Index] != 0; Index += 5) {\r
-    if (CompareMem (LanguageRfc3066, &Iso639ToRfc3066ConversionTable[Index + 3], 2) == 0) {\r
-      CopyMem (LanguageIso639, &Iso639ToRfc3066ConversionTable[Index], 3);\r
+  for (Index = 0; Iso639ToRfc4646ConversionTable[Index] != 0; Index += 5) {\r
+    if (CompareMem (LanguageRfc4646, &Iso639ToRfc4646ConversionTable[Index + 3], 2) == 0) {\r
+      CopyMem (LanguageIso639, &Iso639ToRfc4646ConversionTable[Index], 3);\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -428,7 +428,7 @@ Uc2NotificationEvent (
     // Fill in rest of private data structure\r
     //\r
     Private->UC.SupportedLanguages = AllocateZeroPool (ISO_639_2_ENTRY_SIZE + 1);\r
-    Status = ConvertRfc3066LanguageToIso639Language (Private->UC2->SupportedLanguages, Private->UC.SupportedLanguages);\r
+    Status = ConvertRfc4646LanguageToIso639Language (Private->UC2->SupportedLanguages, Private->UC.SupportedLanguages);\r
 \r
     if (!EFI_ERROR (Status)) {\r
 \r