UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / HiiDataBaseDxe / HiiDatabase.c

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
index f2d70915f52f56cc5ab8a741c6b3e683c4b19133..9f8fcb6f0ea3a6f7ffb4e0606c07f2e84e692f26 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
@@ -135,7 +135,7 @@ EFIAPI
 HiiFindHandles (\r
   IN     EFI_HII_PROTOCOL *This,\r
   IN OUT UINT16           *HandleBufferLength,\r
-  OUT    EFI_HII_HANDLE   Handle[1]\r
+  OUT    FRAMEWORK_EFI_HII_HANDLE    Handle[1]\r
   )\r
 /*++\r
 \r
@@ -171,31 +171,31 @@ Returns:
   //\r
   // Is there a sufficient buffer for the data being passed back?\r
   //\r
-  if (*HandleBufferLength >= (sizeof (EFI_HII_HANDLE) * HandleCount)) {\r
+  if (*HandleBufferLength >= (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount)) {\r
     Database = HiiData->DatabaseHead;\r
 \r
     //\r
     // Copy the Head information\r
     //\r
     if (Database->Handle != 0) {\r
-      CopyMem (&Handle[0], &Database->Handle, sizeof (EFI_HII_HANDLE));\r
+      CopyMem (&Handle[0], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));\r
       Database = Database->NextHandleDatabase;\r
     }\r
     //\r
     // Copy more data if appropriate\r
     //\r
     for (HandleCount = 1; Database != NULL; HandleCount++) {\r
-      CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (EFI_HII_HANDLE));\r
+      CopyMem (&Handle[HandleCount], &Database->Handle, sizeof (FRAMEWORK_EFI_HII_HANDLE ));\r
       Database = Database->NextHandleDatabase;\r
     }\r
 \r
-    *HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount);\r
+    *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);\r
     return EFI_SUCCESS;\r
   } else {\r
     //\r
     // Insufficient buffer length\r
     //\r
-    *HandleBufferLength = (UINT16) (sizeof (EFI_HII_HANDLE) * HandleCount);\r
+    *HandleBufferLength = (UINT16) (sizeof (FRAMEWORK_EFI_HII_HANDLE ) * HandleCount);\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 }\r
@@ -204,7 +204,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetPrimaryLanguages (\r
   IN  EFI_HII_PROTOCOL      *This,\r
-  IN  EFI_HII_HANDLE        Handle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
   OUT EFI_STRING            *LanguageString\r
   )\r
 /*++\r
@@ -301,7 +301,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetSecondaryLanguages (\r
   IN  EFI_HII_PROTOCOL      *This,\r
-  IN  EFI_HII_HANDLE        Handle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
   IN  CHAR16                *PrimaryLanguage,\r
   OUT EFI_STRING            *LanguageString\r
   )\r
@@ -399,3 +399,4 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+\r