Re: [edk2-devel] [PATCH edk2-test 1/1] uefi-sct/SctPkg: type mismatch in SimpleTextOut test
Reviewed-by: G Edhaya Chandran > -Original Message- > From: Heinrich Schuchardt > Sent: 09 March 2021 23:31 > To: EDK II Development > Cc: Eric Jin ; G Edhaya Chandran > ; Barton Gao ; Arvin > Chen ; Samer El-Haj-Mahmoud mahm...@arm.com>; Heinrich Schuchardt > Subject: [PATCH edk2-test 1/1] uefi-sct/SctPkg: type mismatch in SimpleTextOut > test > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3253 > > SctPrint() requires that %d refers to an UINTN parameter. > > SimpleTextOutBBTestFunction_uefi.c has a lot of > StandardLib->RecordAssertion() calls where an INT32 is passed > as argument for a '%d' print code. > > This leads to incorrect output like: > > MaxMode=-549755813885, > > -549755813885 is 0x0xFF83. So MaxMode actually is an INT32 > with value 3 in this example. > > Convert the parameters to UINTN. > > Signed-off-by: Heinrich Schuchardt > --- > .../SimpleTextOutBBTestFunction_uefi.c| 624 +- > 1 file changed, 312 insertions(+), 312 deletions(-) > > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTex > tOutBBTestFunction_uefi.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTex > tOutBBTestFunction_uefi.c > index 9b0ae233ce5f..bbe3f4e27077 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTex > tOutBBTestFunction_uefi.c > +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxT > +++ est/SimpleTextOutBBTestFunction_uefi.c > @@ -176,12 +176,12 @@ BBTestResetFunctionManualTest ( > L" Expected:Cursor Position(%d x %d), MaxMode=%d.", > __FILE__, > (UINTN)__LINE__, > - SimpleOut->Mode->CursorColumn, > - SimpleOut->Mode->CursorRow, > - SimpleOut->Mode->MaxMode, > - ModeExpected.CursorColumn, > - ModeExpected.CursorRow, > - ModeExpected.MaxMode > + (UINTN)SimpleOut->Mode->CursorColumn, > + (UINTN)SimpleOut->Mode->CursorRow, > + (UINTN)SimpleOut->Mode->MaxMode, > + (UINTN)ModeExpected.CursorColumn, > + (UINTN)ModeExpected.CursorRow, > + (UINTN)ModeExpected.MaxMode > ); > >// > @@ -272,12 +272,12 @@ BBTestResetFunctionManualTest ( > L" Expected:Cursor Position(%d x %d), MaxMode=%d.", > __FILE__, > (UINTN)__LINE__, > - SimpleOut->Mode->CursorColumn, > - SimpleOut->Mode->CursorRow, > - SimpleOut->Mode->MaxMode, > - ModeExpected.CursorColumn, > - ModeExpected.CursorRow, > - ModeExpected.MaxMode > + (UINTN)SimpleOut->Mode->CursorColumn, > + (UINTN)SimpleOut->Mode->CursorRow, > + (UINTN)SimpleOut->Mode->MaxMode, > + (UINTN)ModeExpected.CursorColumn, > + (UINTN)ModeExpected.CursorRow, > + (UINTN)ModeExpected.MaxMode > ); > >// > @@ -505,12 +505,12 @@ BBTestResetFunctionAutoTest ( > L"Expected:Cursor Position(%d x %d), MaxMode=%d.", > __FILE__, > (UINTN)__LINE__, > - SimpleOut->Mode->CursorColumn, > - SimpleOut->Mode->CursorRow, > - SimpleOut->Mode->MaxMode, > - ModeExpected.CursorColumn, > - ModeExpected.CursorRow, > - ModeExpected.MaxMode > + (UINTN)SimpleOut->Mode->CursorColumn, > + (UINTN)SimpleOut->Mode->CursorRow, > + (UINTN)SimpleOut->Mode->MaxMode, > + (UINTN)ModeExpected.CursorColumn, > + (UINTN)ModeExpected.CursorRow, > + (UINTN)ModeExpected.MaxMode > ); > > // > @@ -582,12 +582,12 @@ BBTestResetFunctionAutoTest ( > L" Expected:Cursor Position(%d x %d), MaxMode=%d.", > __FILE__, > (UINTN)__LINE__, > - SimpleOut->Mode->CursorColumn, > - SimpleOut->Mode->CursorRow, > - SimpleOut->Mode->MaxMode, > - ModeExpected.CursorColumn, > - ModeExpected.CursorRow, > - ModeExpected.MaxMode > + (UINTN)SimpleOut->Mode->CursorColumn, > + (UINTN)SimpleOut->Mode->CursorRow, > + (UINTN)SimpleOut->Mode->MaxMode, > + (UINTN)ModeExpected.CursorColumn, > + (UINTN)ModeExpected.CursorRow, > + (UINTN)ModeExpected.MaxMode > ); > > // > @@ -850,18 +850,18 @@ BBTestOutputStringFunctionAutoTest ( > L"
[edk2-devel] [PATCH edk2-test 1/1] uefi-sct/SctPkg: type mismatch in SimpleTextOut test
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3253 SctPrint() requires that %d refers to an UINTN parameter. SimpleTextOutBBTestFunction_uefi.c has a lot of StandardLib->RecordAssertion() calls where an INT32 is passed as argument for a '%d' print code. This leads to incorrect output like: MaxMode=-549755813885, -549755813885 is 0x0xFF83. So MaxMode actually is an INT32 with value 3 in this example. Convert the parameters to UINTN. Signed-off-by: Heinrich Schuchardt --- .../SimpleTextOutBBTestFunction_uefi.c| 624 +- 1 file changed, 312 insertions(+), 312 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c index 9b0ae233ce5f..bbe3f4e27077 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi.c @@ -176,12 +176,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=%d.", __FILE__, (UINTN)__LINE__, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->MaxMode, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -272,12 +272,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=%d.", __FILE__, (UINTN)__LINE__, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->MaxMode, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -505,12 +505,12 @@ BBTestResetFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), MaxMode=%d.", __FILE__, (UINTN)__LINE__, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->MaxMode, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -582,12 +582,12 @@ BBTestResetFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), MaxMode=%d.", __FILE__, (UINTN)__LINE__, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->MaxMode, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.MaxMode + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.MaxMode ); // @@ -850,18 +850,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=%d, MaxMode=%d, Attribute=%d, CursorVisible=%d.", __FILE__, (UINTN)__LINE__, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->Mode, - SimpleOut->Mode->MaxMode, - SimpleOut->Mode->Attribute, - SimpleOut->Mode->CursorVisible, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.Mode, -
