improve platformlangcodes/langcodes and platformlang/lang autoupdate mechanism.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 73207cc718ec7e9031e4e09cf06ee7be1b162685..10bbf74294ed4dbc1b34b910cb62dc9400324786 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -156,7 +156,6 @@ FrontPageCallback (
   CHAR8                         *LanguageString;\r
   CHAR8                         *LangCode;\r
   CHAR8                         *Lang;\r
-  CHAR8                         OldLang[ISO_639_2_ENTRY_SIZE];\r
   UINTN                         Index;\r
   EFI_STATUS                    Status;\r
   CHAR8                         *PlatformSupportedLanguages;\r
@@ -230,25 +229,11 @@ FrontPageCallback (
                       AsciiStrSize (BestLanguage),\r
                       Lang\r
                       );\r
-\r
-      if (!FeaturePcdGet (PcdUefiVariableDefaultLangDeprecate)) {\r
-        //\r
-        // Set UEFI deprecated variable "Lang" for backwards compatibility\r
-        //\r
-        Status = ConvertRfc3066LanguageToIso639Language (BestLanguage, OldLang);\r
-        if (!EFI_ERROR (Status)) {\r
-          Status = gRT->SetVariable (\r
-                          L"Lang",\r
-                          &gEfiGlobalVariableGuid,\r
-                          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                          ISO_639_2_ENTRY_SIZE,\r
-                          OldLang\r
-                          );\r
-        }\r
-      }\r
       FreePool (BestLanguage);\r
+    } else {\r
+      ASSERT (FALSE);\r
     }\r
-  \r
+\r
     FreePool (PlatformSupportedLanguages);\r
     FreePool (Lang);\r
     FreePool (LanguageString);\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index ae64c7252b9e587ce596fd9c1ba965ed2a6dadd8..78a6198737b993d9f54d1f5560fc9b04333ccda0 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -504,7 +504,7 @@ InitializeLanguage (
   EFI_STATUS  Status;\r
   UINTN       Size;\r
   CHAR8       *Lang;\r
-  CHAR8       LangCode[ISO_639_2_ENTRY_SIZE];\r
+  CHAR8       LangCode[ISO_639_2_ENTRY_SIZE + 1];\r
   CHAR8       *LangCodes;\r
   CHAR8       *PlatformLang;\r
   CHAR8       *PlatformLangCodes;\r
@@ -523,7 +523,7 @@ InitializeLanguage (
                       L"LangCodes",\r
                       &gEfiGlobalVariableGuid,\r
                       EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                      AsciiStrLen (LangCodes),\r
+                      AsciiStrSize (LangCodes),\r
                       LangCodes\r
                       );\r
     }\r
@@ -547,7 +547,7 @@ InitializeLanguage (
     //\r
     // Find current LangCode from Lang NV Variable\r
     //\r
-    Size = ISO_639_2_ENTRY_SIZE;\r
+    Size = ISO_639_2_ENTRY_SIZE + 1;\r
     Status = gRT->GetVariable (\r
                     L"Lang",\r
                     &gEfiGlobalVariableGuid,\r
@@ -576,7 +576,7 @@ InitializeLanguage (
                       L"Lang",\r
                       &gEfiGlobalVariableGuid,\r
                       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                      ISO_639_2_ENTRY_SIZE,\r
+                      ISO_639_2_ENTRY_SIZE + 1,\r
                       Lang\r
                       );\r
     }\r