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

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

1 files changed, 5 insertions, 3 deletions

diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/HiiFont.h
index 629a817..c9568aa 100644
--- a/MdePkg/Include/Protocol/HiiFont.h
+++ b/MdePkg/Include/Protocol/HiiFont.h
@@ -15,6 +15,7 @@
 #ifndef __HII_FONT_H__

 #define __HII_FONT_H__

 

+#include <Protocol/GraphicsOutput.h>

 #include <Protocol/HiiImage.h>

 

 #error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."

@@ -24,6 +25,7 @@
 

 typedef struct _EFI_HII_FONT_PROTOCOL EFI_HII_FONT_PROTOCOL;

 

+typedef VOID    *EFI_FONT_HANDLE;

 

 //

 // EFI_HII_OUT_FLAGS

@@ -145,10 +147,10 @@ typedef struct {
   

 **/

 typedef struct _EFI_FONT_DISPLAY_INFO {

-  EFI_FONT_INFO                 FontInfo;

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor;

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor;

   EFI_FONT_INFO_MASK            FontInfoMask;

+  EFI_FONT_INFO                 FontInfo;  

 } EFI_FONT_DISPLAY_INFO;

 

 /**

@@ -493,8 +495,8 @@ EFI_STATUS
   IN CONST  EFI_HII_FONT_PROTOCOL *This,

   IN OUT    EFI_FONT_HANDLE       *FontHandle,

   IN CONST  EFI_FONT_DISPLAY_INFO *StringInfoIn,

-  OUT       EFI_FONT_DISPLAY_INFO *StringInfoOut,

-  IN CONST  EFI_STRING            *String OPTIONAL

+  OUT       EFI_FONT_DISPLAY_INFO **StringInfoOut,

+  IN CONST  EFI_STRING            String OPTIONAL

 );

 

 /**