Sync HII and Setupbrowser related header files with UEFI 2.1 spec.

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

diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/HiiFont.h
index d581d5312d688b60f5239536c8701a1d949ae493..c9568aac5a6f001f01715e62bc302e8341bda6b1 100644 (file)
--- a/MdePkg/Include/Protocol/HiiFont.h
+++ b/MdePkg/Include/Protocol/HiiFont.h
@@ -10,20 +10,22 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-  Module Name: HiiFont.h\r
-\r
 **/\r
 \r
 #ifndef __HII_FONT_H__\r
 #define __HII_FONT_H__\r
 \r
+#include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/HiiImage.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_FONT_PROTOCOL_GUID \\r
 { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 } }\r
 \r
 typedef struct _EFI_HII_FONT_PROTOCOL EFI_HII_FONT_PROTOCOL;\r
 \r
+typedef VOID    *EFI_FONT_HANDLE;\r
 \r
 //\r
 // EFI_HII_OUT_FLAGS\r
@@ -145,10 +147,10 @@ typedef struct {
   \r
 **/\r
 typedef struct _EFI_FONT_DISPLAY_INFO {\r
-  EFI_FONT_INFO                 FontInfo;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor;\r
   EFI_FONT_INFO_MASK            FontInfoMask;\r
+  EFI_FONT_INFO                 FontInfo;  \r
 } EFI_FONT_DISPLAY_INFO;\r
 \r
 /**\r
@@ -493,8 +495,8 @@ EFI_STATUS
   IN CONST  EFI_HII_FONT_PROTOCOL *This,\r
   IN OUT    EFI_FONT_HANDLE       *FontHandle,\r
   IN CONST  EFI_FONT_DISPLAY_INFO *StringInfoIn,\r
-  OUT       EFI_FONT_DISPLAY_INFO *StringInfoOut,\r
-  IN CONST  EFI_STRING            *String OPTIONAL\r
+  OUT       EFI_FONT_DISPLAY_INFO **StringInfoOut,\r
+  IN CONST  EFI_STRING            String OPTIONAL\r
 );\r
 \r
 /**\r