Add in thunk support for HiiGetSecondaryLanguages and HiiGetPrimaryLanguages

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index c7d339e1079933a05feea16a6e0b24aa26bbcc3b..d5ef19c356aeea52e3ba4963e4e28a8a58cd4465 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -1,8 +1,8 @@
 /**@file\r
+Framework to UEFI 2.1 HII Thunk. The driver consume UEFI HII protocols\r
+to produce a Framework HII protocol.\r
 \r
-Framework to UEFI 2.1 HII Thunk\r
-\r
-Copyright (c) 2003, Intel Corporation\r
+Copyright (c) 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -175,7 +175,36 @@ Returns:
 \r
 --*/\r
 {\r
-  ASSERT (FALSE);\r
+  EFI_HII_THUNK_PRIVATE_DATA *Private;\r
+  EFI_HII_HANDLE             UefiHiiHandle;\r
+  CHAR8                      *AsciiLanguageCodes;\r
+  CHAR16                     *UnicodeLanguageCodes;\r
+\r
+  Private = EFI_HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
+\r
+  \r
+  \r
+  UefiHiiHandle = FrameworkHiiHandleToUefiHiiHandle (Private, Handle);\r
+  if (UefiHiiHandle == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  AsciiLanguageCodes = HiiLibGetSupportedLanguages (UefiHiiHandle);\r
+\r
+  if (AsciiLanguageCodes == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  UnicodeLanguageCodes = AllocateZeroPool (AsciiStrSize (AsciiLanguageCodes) * sizeof (CHAR16));\r
+  if (UnicodeLanguageCodes == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  //\r
+  // The language returned is in RFC 3066 format.\r
+  //\r
+  *LanguageString = AsciiStrToUnicodeStr (AsciiLanguageCodes, UnicodeLanguageCodes);\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -200,7 +229,41 @@ Returns:
 \r
 --*/\r
 {\r
-  ASSERT (FALSE);\r
+  EFI_HII_THUNK_PRIVATE_DATA *Private;\r
+  EFI_HII_HANDLE             UefiHiiHandle;\r
+  CHAR8                      *AsciiPrimaryLanguage;\r
+  CHAR8                      *AsciiLanguageCodes;\r
+  CHAR16                     *UnicodeLanguageCodes;\r
+\r
+  Private = EFI_HII_THUNK_PRIVATE_DATA_FROM_THIS(This);\r
+\r
+  \r
+  \r
+  UefiHiiHandle = FrameworkHiiHandleToUefiHiiHandle (Private, Handle);\r
+  if (UefiHiiHandle == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  AsciiPrimaryLanguage = AllocateZeroPool (StrLen (PrimaryLanguage) + 1);\r
+\r
+  UnicodeStrToAsciiStr (PrimaryLanguage, AsciiPrimaryLanguage);\r
+\r
+  AsciiLanguageCodes = HiiLibGetSupportedSecondaryLanguages (UefiHiiHandle, AsciiPrimaryLanguage);\r
+\r
+  if (AsciiLanguageCodes == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  UnicodeLanguageCodes = AllocateZeroPool (AsciiStrSize (AsciiLanguageCodes) * sizeof (CHAR16));\r
+  if (UnicodeLanguageCodes == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  //\r
+  // The language returned is in RFC 3066 format.\r
+  //\r
+  *LanguageString = AsciiStrToUnicodeStr (AsciiLanguageCodes, UnicodeLanguageCodes);\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index f0ef02e2dd4965af142f1731cc427cec3e9968b4..dd07afd06a782afeeae3f65b7be1fa65de85f8ca 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -44,7 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/FrameworkIfrSupportLib.h>\r
 #include <Library/HiiLib.h>\r
-#include "Utility.h"\r
 \r
 //\r
 // Macros\r
@@ -319,4 +318,6 @@ HiiCompareLanguage (
   )\r
 ;\r
 \r
+#include "Utility.h"\r
+\r
 #endif\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Keyboard.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Keyboard.c
index d54c9b9d2946b9663c6b32d9c011325b0bc2b754..9a49ee576107587518f2cd5afedbf45d58aee482 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Keyboard.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Keyboard.c
@@ -33,5 +33,10 @@ Returns:
 \r
 --*/\r
 {\r
-  return EFI_SUCCESS;\r
+  ASSERT (FALSE);\r
+  //\r
+  // In previous Framewok HII implementation, GetKeyBoardLayout is defined in HII 0.92 specification,\r
+  // but it is not implemented. We ASSERT and return UNSUPPORTED here. \r
+  //\r
+  return EFI_UNSUPPORTED;\r
 }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 30b743e19e39749c0d6bc838a63fe5cb2a18c593..001efa2e141d864c064ce2e3dabd7a56622026af 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -39,3 +39,30 @@ GetGuidOfFirstFormset (
   return NULL;\r
 }\r
 \r
+EFI_HII_HANDLE\r
+FrameworkHiiHandleToUefiHiiHandle (\r
+  IN CONST EFI_HII_THUNK_PRIVATE_DATA *Private,\r
+  IN FRAMEWORK_EFI_HII_HANDLE          FrameworkHiiHandle\r
+  )\r
+{\r
+  LIST_ENTRY                                *ListEntry;\r
+  HII_TRHUNK_HANDLE_MAPPING_DATABASE_ENTRY  *HandleMapEntry;\r
+\r
+  ASSERT (FrameworkHiiHandle != (FRAMEWORK_EFI_HII_HANDLE) 0);\r
+  ASSERT (Private != NULL);\r
+\r
+  for (ListEntry = Private->HiiThunkHandleMappingDBListHead.ForwardLink;\r
+       ListEntry != &Private->HiiThunkHandleMappingDBListHead;\r
+       ListEntry = ListEntry->ForwardLink\r
+       ) {\r
+\r
+    HandleMapEntry = HII_TRHUNK_HANDLE_MAPPING_DATABASE_ENTRY_FROM_LISTENTRY (ListEntry);\r
+\r
+    if (FrameworkHiiHandle == HandleMapEntry->FrameworkHiiHandle) {\r
+      return HandleMapEntry->UefiHiiHandle;\r
+    }\r
+  }\r
+  \r
+  return (EFI_HII_HANDLE) NULL;\r
+}\r
+\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
index 5edde947adbb7f3a71f3ef57605d3cf6d60bdf21..a0a3be39343fc02ccd94f5259bd9d25de74cc6f8 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
@@ -21,4 +21,21 @@ GetGuidOfFirstFormset (
   CONST EFI_HII_FORM_PACKAGE * FormPackage\r
 );\r
 \r
+/**\r
+  Find the UefiHiiHandle based on a Framework HII Handle returned by\r
+  the HII Thunk to Framework HII code.\r
+\r
+  @param Private                        The pointer to the private data of Hii Thunk.\r
+  @param FrameworkHiiHandle     Framework HII Handle returned by  the HII Thunk to Framework HII code.\r
+\r
+  @retval  NULL                           If Framework HII Handle passed in does not have matching UEFI HII handle.\r
+  @retval  !NULL                         If the match is found.\r
+  \r
+**/\r
+EFI_HII_HANDLE\r
+FrameworkHiiHandleToUefiHiiHandle (\r
+  IN CONST EFI_HII_THUNK_PRIVATE_DATA *Private,\r
+  IN FRAMEWORK_EFI_HII_HANDLE          FrameworkHiiHandle\r
+  )\r
+;\r
 #endif\r