Add more check to avoid code enter into wrong state.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / HiiDatabase.h

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 2c8b7adabad67a055baf9420f7f925d1c8c09e9e..7a905c0dd34020bd62da1ca99c2443901ba4dd98 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiConfigRouting.h>\r
 #include <Protocol/HiiConfigAccess.h>\r
 #include <Protocol/UgaDraw.h>\r
-\r
+#include <Guid/HiiFormMapMethodGuid.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -47,6 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HiiLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/PcdLib.h>\r
+#include <Library/LanguageLib.h>\r
 \r
 #include <Guid/MdeModuleHii.h>\r
 \r
@@ -384,11 +385,11 @@ HiiGetDefaultImage (
 EFI_STATUS\r
 EFIAPI\r
 HiiThunkUpdateForm (\r
-  IN EFI_HII_PROTOCOL                   *This,\r
-  IN FRAMEWORK_EFI_HII_HANDLE           Handle,\r
-  IN EFI_FORM_LABEL                     Label,\r
-  IN BOOLEAN                            AddData,\r
-  IN FRAMEWORK_EFI_HII_UPDATE_DATA      *Data\r
+  IN EFI_HII_PROTOCOL          *This,\r
+  IN FRAMEWORK_EFI_HII_HANDLE  Handle,\r
+  IN EFI_FORM_LABEL            Label,\r
+  IN BOOLEAN                   AddData,\r
+  IN EFI_HII_UPDATE_DATA       *Data\r
   );\r
 \r
 EFI_STATUS\r
@@ -406,7 +407,7 @@ ThunkSendForm (
   IN  BOOLEAN                         UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,\r
   IN  UINTN                           HandleCount,\r
-  IN  FRAMEWORK_EFI_IFR_PACKET        *Packet, OPTIONAL\r
+  IN  EFI_IFR_PACKET                  *Packet, OPTIONAL\r
   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
@@ -458,9 +459,9 @@ NewOrAddPackNotify (
 **/\r
 EFI_STATUS\r
 FwUpdateDataToUefiUpdateData (\r
-  IN       HII_THUNK_CONTEXT                *ThunkContext,\r
-  IN CONST FRAMEWORK_EFI_HII_UPDATE_DATA    *FwUpdateData,\r
-  IN       VOID                             *UefiOpCodeHandle\r
+  IN       HII_THUNK_CONTEXT    *ThunkContext,\r
+  IN CONST EFI_HII_UPDATE_DATA  *FwUpdateData,\r
+  IN       VOID                 *UefiOpCodeHandle\r
   )\r
 ;\r
 \r
@@ -476,18 +477,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 +497,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 +520,7 @@ ConvertRfc3066LanguageToIso639Language (
 **/\r
 CHAR8*\r
 EFIAPI\r
-ConvertIso639LanguageToRfc3066Language (\r
+ConvertIso639LanguageToRfc4646Language (\r
   IN  CONST CHAR8   *LanguageIso639\r
   )\r
 ;\r