UEFI HII: Merge UEFI HII support changes from branch.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4600 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -15,11 +15,12 @@
|
||||
#ifndef __HII_STRING_H__
|
||||
#define __HII_STRING_H__
|
||||
|
||||
#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."
|
||||
|
||||
#define EFI_HII_STRING_PROTOCOL_GUID \
|
||||
{ 0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a } }
|
||||
|
||||
#include <Protocol/HiiDatabase.h>
|
||||
#include <Protocol/HiiFont.h>
|
||||
|
||||
|
||||
typedef struct _EFI_HII_STRING_PROTOCOL EFI_HII_STRING_PROTOCOL;
|
||||
|
||||
@@ -59,11 +60,12 @@ typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_HII_NEW_STRING) (
|
||||
IN CONST EFI_HII_STRING_PROTOCOL *This,
|
||||
IN CONST EFI_HII_HANDLE PackageList,
|
||||
OUT EFI_STRING_ID *StringId
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
OUT EFI_STRING_ID *StringId,
|
||||
IN CONST CHAR8 *Language,
|
||||
IN CONST CHAR16 *LanguageName, OPTIONAL
|
||||
IN CONST EFI_STRING String,
|
||||
IN CONST EFI_FONT_INFO *StringFontInfo OPTIONAL,
|
||||
IN CONST EFI_FONT_INFO *StringFontInfo OPTIONAL
|
||||
);
|
||||
|
||||
|
||||
@@ -124,11 +126,11 @@ EFI_STATUS
|
||||
(EFIAPI *EFI_HII_GET_STRING) (
|
||||
IN CONST EFI_HII_STRING_PROTOCOL *This,
|
||||
IN CONST CHAR8 *Language,
|
||||
IN CONST EFI_HII_HANDLE PackageList,
|
||||
IN CONST EFI_STRING_ID StringId,
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
IN EFI_STRING_ID StringId,
|
||||
OUT EFI_STRING String,
|
||||
IN OUT UINTN StringSize,
|
||||
OUT EFI_FONT_INFO *StringFontInfo OPTIONAL
|
||||
IN OUT UINTN *StringSize,
|
||||
OUT EFI_FONT_INFO **StringFontInfo OPTIONAL
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -168,10 +170,10 @@ typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_HII_SET_STRING) (
|
||||
IN CONST EFI_HII_STRING_PROTOCOL *This,
|
||||
IN CONST EFI_HII_HANDLE PackageList,
|
||||
IN CONST EFI_STRING_ID StringId,
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
IN EFI_STRING_ID StringId,
|
||||
IN CONST CHAR8 *Language,
|
||||
IN CONST EFI_STRING String,
|
||||
IN EFI_STRING String,
|
||||
IN CONST EFI_FONT_INFO *StringFontInfo OPTIONAL
|
||||
);
|
||||
|
||||
@@ -208,10 +210,10 @@ EFI_STATUS
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_HII_GET_LANGUAGES) (
|
||||
IN CONST EFI_HII_DATABASE_PROTOCOL *This,
|
||||
IN CONST EFI_HII_HANDLE PackageList,
|
||||
IN CONST EFI_HII_STRING_PROTOCOL *This,
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
IN OUT CHAR8 *Languages,
|
||||
IN OUT UINTN LanguagesSize
|
||||
IN OUT UINTN *LanguagesSize
|
||||
);
|
||||
|
||||
|
||||
@@ -263,12 +265,12 @@ EFI_STATUS
|
||||
**/
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_GET_2ND_LANGUAGES) (
|
||||
IN CONST EFI_HII_DATABASE_PROTOCOL *This,
|
||||
IN CONST EFI_HII_HANDLE PackageList,
|
||||
IN CONST CHAR8 *FirstLanguage;
|
||||
(EFIAPI *EFI_HII_GET_2ND_LANGUAGES) (
|
||||
IN CONST EFI_HII_STRING_PROTOCOL *This,
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
IN CONST CHAR8 *FirstLanguage,
|
||||
IN OUT CHAR8 *SecondLanguages,
|
||||
IN OUT UINTN SecondLanguagesSize
|
||||
IN OUT UINTN *SecondLanguagesSize
|
||||
);
|
||||
|
||||
|
||||
@@ -301,3 +303,4 @@ extern EFI_GUID gEfiHiiStringProtocolGuid;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user