1) StrGather (Build.exe) in compatible mode add a Framework Package Header to replace...

[mirror_edk2.git] / MdeModulePkg / Library / UefiIfrSupportLib / UefiIfrForm.c

diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
index b6da34a6b344a93d954001741c89111f7018b28a..878898ffeab8e567e44926522db1c4ca21cebf00 100644 (file)
--- a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
+++ b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c
@@ -59,6 +59,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT16 mFakeConfigHdr[] = L"GUID=00000000000
 \r
   @param  NumberOfLines          The number of lines for the dialog box\r
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..\r
+  @param  String                 The first String to be displayed in the Pop-Up.\r
   @param  Marker                 A series of (quantity == NumberOfLines - 1) text\r
                                  strings which will be used to construct the dialog\r
                                  box\r
@@ -73,6 +74,7 @@ EFIAPI
 IfrLibCreatePopUp2 (\r
   IN  UINTN                       NumberOfLines,\r
   OUT EFI_INPUT_KEY               *KeyValue,\r
+  IN  CHAR16                      *String,\r
   IN  VA_LIST                     Marker\r
   )\r
 {\r
@@ -98,10 +100,7 @@ IfrLibCreatePopUp2 (
   EFI_EVENT                     WaitList[2];\r
   UINTN                         CurrentAttribute;\r
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *ConOut;\r
-  CHAR16                        *String;\r
 \r
-  String = VA_ARG (Marker, CHAR16 *);\r
-  \r
   if ((KeyValue == NULL) || (String == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -286,9 +285,9 @@ IfrLibCreatePopUp (
   EFI_STATUS                      Status;\r
   VA_LIST                         Marker;\r
 \r
-  VA_START (Marker, KeyValue);\r
+  VA_START (Marker, String);\r
 \r
-  Status = IfrLibCreatePopUp2 (NumberOfLines, KeyValue, Marker);\r
+  Status = IfrLibCreatePopUp2 (NumberOfLines, KeyValue, String, Marker);\r
 \r
   VA_END (Marker);\r
 \r