X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FLanguage.c;h=09f48b874bd65112dbb3701c4db60d7a0069a427;hp=4e7537c9e42c2beebb17aae1e2905bb381e532a9;hb=180a5a35cb49699bd249dee19e41cee34c856a58;hpb=5c08e1173703234cc2913757f237ee916087498a

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index 4e7537c9e4..09f48b874b 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -1,8 +1,8 @@
 /** @file
   Language settings
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2008, 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
 http://opensource.org/licenses/bsd-license.php
@@ -15,16 +15,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Language.h"
 #include "FrontPage.h"
 
-#define NARROW_GLYPH_NUMBER 8
-#define WIDE_GLYPH_NUMBER   75
-
 EFI_GUID  mFontPackageGuid = {
   0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}
 };
 
+#define NARROW_GLYPH_NUMBER 8
+#define WIDE_GLYPH_NUMBER   75
+
 typedef struct {
   ///
-  /// This 4-bytes total array length is required by HiiLibPreparePackageList()
+  /// This 4-bytes total array length is required by HiiAddPackages()
   ///
   UINT32                 Length;
 
@@ -259,24 +259,56 @@ ExportFonts (
   VOID
   )
 {
-  EFI_STATUS                   Status;
-  EFI_HANDLE                   DriverHandle;
   EFI_HII_HANDLE               HiiHandle;
-  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;
 
-  //
-  // Create driver handle used by HII database
-  //
-  Status = HiiLibCreateHiiDriverHandle (&DriverHandle);
-  if (EFI_ERROR (Status)) {
-    return ;
+  HiiHandle = HiiAddPackages (
+                &mFontPackageGuid,
+                mBdsImageHandle,
+                &mFontBin,
+                NULL
+                );
+  ASSERT (HiiHandle != NULL);
+}
+
+/**
+  Get next language from language code list (with separator ';').
+
+  If LangCode is NULL, then ASSERT.
+  If Lang is NULL, then ASSERT.
+
+  @param  LangCode    On input: point to first language in the list. On
+                                 output: point to next language in the list, or
+                                 NULL if no more language in the list.
+  @param  Lang           The first language in the list.
+
+**/
+VOID
+EFIAPI
+GetNextLanguage (
+  IN OUT CHAR8      **LangCode,
+  OUT CHAR8         *Lang
+  )
+{
+  UINTN  Index;
+  CHAR8  *StringPtr;
+
+  ASSERT (LangCode != NULL);
+  ASSERT (*LangCode != NULL);
+  ASSERT (Lang != NULL);
+
+  Index = 0;
+  StringPtr = *LangCode;
+  while (StringPtr[Index] != 0 && StringPtr[Index] != ';') {
+    Index++;
   }
 
-  PackageList = HiiLibPreparePackageList (1, &mFontPackageGuid, &mFontBin);
-  ASSERT (PackageList != NULL);
+  CopyMem (Lang, StringPtr, Index);
+  Lang[Index] = 0;
 
-  gHiiDatabase->NewPackageList (gHiiDatabase, PackageList, DriverHandle, &HiiHandle);
-  FreePool (PackageList);
+  if (StringPtr[Index] == ';') {
+    Index++;
+  }
+  *LangCode = StringPtr + Index;
 }
 
 /**
@@ -294,7 +326,7 @@ InitializeLanguage (
   EFI_STATUS  Status;
   UINTN       Size;
   CHAR8       *Lang;
-  CHAR8       LangCode[ISO_639_2_ENTRY_SIZE];
+  CHAR8       LangCode[ISO_639_2_ENTRY_SIZE + 1];
   CHAR8       *LangCodes;
   CHAR8       *PlatformLang;
   CHAR8       *PlatformLangCodes;
@@ -313,7 +345,7 @@ InitializeLanguage (
                       L"LangCodes",
                       &gEfiGlobalVariableGuid,
                       EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                      AsciiStrLen (LangCodes),
+                      AsciiStrSize (LangCodes),
                       LangCodes
                       );
     }
@@ -337,7 +369,7 @@ InitializeLanguage (
     //
     // Find current LangCode from Lang NV Variable
     //
-    Size = ISO_639_2_ENTRY_SIZE;
+    Size = ISO_639_2_ENTRY_SIZE + 1;
     Status = gRT->GetVariable (
                     L"Lang",
                     &gEfiGlobalVariableGuid,
@@ -366,7 +398,7 @@ InitializeLanguage (
                       L"Lang",
                       &gEfiGlobalVariableGuid,
                       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                      ISO_639_2_ENTRY_SIZE,
+                      ISO_639_2_ENTRY_SIZE + 1,
                       Lang
                       );
     }