UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / SetupBrowserDxe / Ui.h

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
index 0e92852c4ae2286b9cf2d1789b36fb79299f1754..eb3ef6ab0d76ee27d4ad722fd7a123e35eeb4e38 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -80,7 +80,7 @@ typedef struct {
 \r
   UINTN           IfrNumber;\r
   VOID            *FormBinary;\r
-  EFI_HII_HANDLE  Handle;\r
+  FRAMEWORK_EFI_HII_HANDLE   Handle;\r
   EFI_TAG         *Tags;\r
   UINTN           TagIndex;\r
   EFI_TAG         *ThisTag;\r
@@ -167,7 +167,7 @@ UiFreeMenu (
 VOID\r
 UiAddMenuOption (\r
   IN CHAR16         *String,\r
-  IN EFI_HII_HANDLE Handle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE  Handle,\r
   IN EFI_TAG        *Tag,\r
   IN VOID           *FormBinary,\r
   IN UINTN          IfrNumber\r
@@ -177,7 +177,7 @@ UiAddMenuOption (
 VOID\r
 UiAddSubMenuOption (\r
   IN CHAR16           *String,\r
-  IN EFI_HII_HANDLE   Handle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE    Handle,\r
   IN EFI_TAG          *Tag,\r
   IN UINTN            TagIndex,\r
   IN UINT16           FormId,\r
@@ -189,7 +189,7 @@ UI_MENU_OPTION      *
 UiDisplayMenu (\r
   IN  BOOLEAN                      SubMenu,\r
   IN  EFI_FILE_FORM_TAGS           *FileFormTagsHead,\r
-  OUT EFI_IFR_DATA_ARRAY           *PageData\r
+  OUT FRAMEWORK_EFI_IFR_DATA_ARRAY           *PageData\r
   )\r
 ;\r
 \r
@@ -245,7 +245,7 @@ ReadPassword (
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     PromptForPassword,\r
   IN  EFI_TAG                     *Tag,\r
-  IN  EFI_IFR_DATA_ARRAY          *PageData,\r
+  IN  FRAMEWORK_EFI_IFR_DATA_ARRAY          *PageData,\r
   IN  BOOLEAN                     SecondEntry,\r
   IN  EFI_FILE_FORM_TAGS          *FileFormTags,\r
   OUT CHAR16                      *StringPtr\r
@@ -302,7 +302,7 @@ ProcessOptions (
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     Selected,\r
   IN  EFI_FILE_FORM_TAGS          *FileFormTagsHead,\r
-  IN  EFI_IFR_DATA_ARRAY          *PageData,\r
+  IN  FRAMEWORK_EFI_IFR_DATA_ARRAY          *PageData,\r
   OUT CHAR16                      **OptionString\r
   )\r
 ;\r
@@ -368,7 +368,7 @@ GetLineByWidth (
 UINT16\r
 GetWidth (\r
   IN EFI_TAG                          *Tag,\r
-  IN EFI_HII_HANDLE                   Handle\r
+  IN FRAMEWORK_EFI_HII_HANDLE         Handle\r
   )\r
 ;\r
 \r