From 35d59af39ea1a475342bc709bfd9396d576336f3 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Fri, 21 Nov 2008 15:08:07 +0000 Subject: [PATCH] =?utf8?q?1)=20StrGather=20(Build.exe)=20in=20compatible?= =?utf8?q?=20mode=20add=20a=20Framework=20Package=20Header=20to=20replace?= =?utf8?q?=20the=20original=20=E2=80=9CArrayLength=E2=80=9D=20generated=20?= =?utf8?q?in=20the=20output.=202)=20VfrCompiler=20in=20compatible=20mode?= =?utf8?q?=20add=20a=20Framework=20Package=20Header=20to=20replace=20the?= =?utf8?q?=20original=20=E2=80=9CArrayLength=E2=80=9D=20generated=20in=20t?= =?utf8?q?he=20output.=203)=20HII=20Thunk=20module=20nows=20support=20Narr?= =?utf8?q?ow=20Font=20registered=20using=20Framework=20New=20Pack=20HII=20?= =?utf8?q?interface.=204)=20Fix=20a=20bug=20in=20IfrLibCreatePopUp2=20by?= =?utf8?q?=20updating=20the=20prototype.=20The=20previous=20way=20of=20usi?= =?utf8?q?ng=20VA=5FSTART=20to=20get=20the=20address=20of=20parameter=20in?= =?utf8?q?=20the=20argument=20list=20and=20expecting=20the=20parameters=20?= =?utf8?q?that=20follows=20will=20be=20found=20using=20VA=5FARG=20macro=20?= =?utf8?q?is=20wrong.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6673 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Library/IfrSupportLib.h | 2 ++ MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Include/Library/IfrSupportLib.h b/MdeModulePkg/Include/Library/IfrSupportLib.h index 3f686bd49c..73ddcaab78 100644 --- a/MdeModulePkg/Include/Library/IfrSupportLib.h +++ b/MdeModulePkg/Include/Library/IfrSupportLib.h @@ -744,6 +744,7 @@ IfrLibCreatePopUp ( @param NumberOfLines The number of lines for the dialog box @param KeyValue The EFI_KEY value returned if HotKey is TRUE.. + @param String The first String to be displayed in the Pop-Up. @param Args VA_LIST marker for the variable argument list. A series of (quantity == NumberOfLines - 1) text strings which will be used to construct the dialog @@ -758,6 +759,7 @@ EFIAPI IfrLibCreatePopUp2 ( IN UINTN NumberOfLines, OUT EFI_INPUT_KEY *KeyValue, + IN CHAR16 *String, IN VA_LIST Args ) ; diff --git a/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c b/MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrForm.c index b6da34a6b3..878898ffea 100644 --- 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 @param NumberOfLines The number of lines for the dialog box @param KeyValue The EFI_KEY value returned if HotKey is TRUE.. + @param String The first String to be displayed in the Pop-Up. @param Marker A series of (quantity == NumberOfLines - 1) text strings which will be used to construct the dialog box @@ -73,6 +74,7 @@ EFIAPI IfrLibCreatePopUp2 ( IN UINTN NumberOfLines, OUT EFI_INPUT_KEY *KeyValue, + IN CHAR16 *String, IN VA_LIST Marker ) { @@ -98,10 +100,7 @@ IfrLibCreatePopUp2 ( EFI_EVENT WaitList[2]; UINTN CurrentAttribute; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut; - CHAR16 *String; - String = VA_ARG (Marker, CHAR16 *); - if ((KeyValue == NULL) || (String == NULL)) { return EFI_INVALID_PARAMETER; } @@ -286,9 +285,9 @@ IfrLibCreatePopUp ( EFI_STATUS Status; VA_LIST Marker; - VA_START (Marker, KeyValue); + VA_START (Marker, String); - Status = IfrLibCreatePopUp2 (NumberOfLines, KeyValue, Marker); + Status = IfrLibCreatePopUp2 (NumberOfLines, KeyValue, String, Marker); VA_END (Marker); -- 2.39.5