UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdePkg / Include / Protocol / HiiString.h

diff --git a/MdePkg/Include/Protocol/HiiString.h b/MdePkg/Include/Protocol/HiiString.h
index eafe5de6fe83f8bdcb058664ee686b64a2a4fa43..e120e9e470e0fc43c813d63d35d8d0621249fd78 100644 (file)
--- a/MdePkg/Include/Protocol/HiiString.h
+++ b/MdePkg/Include/Protocol/HiiString.h
@@ -15,11 +15,12 @@
 #ifndef __HII_STRING_H__\r
 #define __HII_STRING_H__\r
 \r
-#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."\r
-\r
 #define EFI_HII_STRING_PROTOCOL_GUID \\r
   { 0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a } }\r
 \r
+#include <Protocol/HiiDatabase.h>\r
+#include <Protocol/HiiFont.h>\r
+\r
 \r
 typedef struct _EFI_HII_STRING_PROTOCOL EFI_HII_STRING_PROTOCOL;\r
 \r
@@ -59,11 +60,12 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_NEW_STRING) (\r
   IN CONST  EFI_HII_STRING_PROTOCOL   *This,\r
-  IN CONST  EFI_HII_HANDLE            PackageList,\r
-  OUT       EFI_STRING_ID             *StringId\r
+  IN        EFI_HII_HANDLE            PackageList,\r
+  OUT       EFI_STRING_ID             *StringId,\r
   IN CONST  CHAR8                     *Language,\r
+  IN  CONST CHAR16                    *LanguageName, OPTIONAL  \r
   IN CONST  EFI_STRING                String,\r
-  IN CONST  EFI_FONT_INFO             *StringFontInfo OPTIONAL,\r
+  IN CONST  EFI_FONT_INFO             *StringFontInfo OPTIONAL\r
 );\r
 \r
 \r
@@ -124,11 +126,11 @@ EFI_STATUS
 (EFIAPI *EFI_HII_GET_STRING) (\r
   IN CONST  EFI_HII_STRING_PROTOCOL *This,\r
   IN CONST  CHAR8                   *Language,\r
-  IN CONST  EFI_HII_HANDLE          PackageList,\r
-  IN CONST  EFI_STRING_ID           StringId,\r
+  IN        EFI_HII_HANDLE          PackageList,\r
+  IN        EFI_STRING_ID           StringId,\r
   OUT       EFI_STRING              String,\r
-  IN OUT    UINTN                   StringSize,\r
-  OUT       EFI_FONT_INFO           *StringFontInfo OPTIONAL\r
+  IN OUT    UINTN                   *StringSize,\r
+  OUT       EFI_FONT_INFO           **StringFontInfo OPTIONAL\r
 );\r
 \r
 /**\r
@@ -168,10 +170,10 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_SET_STRING) (\r
   IN CONST  EFI_HII_STRING_PROTOCOL *This,\r
-  IN CONST  EFI_HII_HANDLE          PackageList,\r
-  IN CONST  EFI_STRING_ID           StringId,\r
+  IN        EFI_HII_HANDLE          PackageList,\r
+  IN        EFI_STRING_ID           StringId,\r
   IN CONST  CHAR8                   *Language,\r
-  IN CONST  EFI_STRING              String,\r
+  IN        EFI_STRING              String,\r
   IN CONST  EFI_FONT_INFO           *StringFontInfo OPTIONAL\r
 );\r
 \r
@@ -208,10 +210,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_LANGUAGES) (\r
-  IN CONST  EFI_HII_DATABASE_PROTOCOL *This,\r
-  IN CONST  EFI_HII_HANDLE            PackageList,\r
+  IN CONST  EFI_HII_STRING_PROTOCOL   *This,\r
+  IN        EFI_HII_HANDLE            PackageList,\r
   IN OUT    CHAR8                     *Languages,\r
-  IN OUT    UINTN                     LanguagesSize\r
+  IN OUT    UINTN                     *LanguagesSize\r
 );\r
 \r
 \r
@@ -263,12 +265,12 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_GET_2ND_LANGUAGES) (\r
-  IN CONST  EFI_HII_DATABASE_PROTOCOL *This,\r
-  IN CONST  EFI_HII_HANDLE            PackageList,\r
-  IN CONST  CHAR8                     *FirstLanguage;\r
+(EFIAPI *EFI_HII_GET_2ND_LANGUAGES) (\r
+  IN CONST  EFI_HII_STRING_PROTOCOL   *This,\r
+  IN        EFI_HII_HANDLE            PackageList,\r
+  IN CONST  CHAR8                     *FirstLanguage,\r
   IN OUT    CHAR8                     *SecondLanguages,\r
-  IN OUT    UINTN                     SecondLanguagesSize\r
+  IN OUT    UINTN                     *SecondLanguagesSize\r
 );\r
 \r
 \r
@@ -301,3 +303,4 @@ extern EFI_GUID gEfiHiiStringProtocolGuid;
 \r
 #endif\r
 \r
+\r