From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by mx.groups.io with SMTP id smtpd.web08.39.1617116938258538591 for ; Tue, 30 Mar 2021 08:08:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=grKL+Fk8; spf=pass (domain: gmx.de, ip: 212.227.15.18, mailfrom: xypron.glpk@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617116926; bh=cf4rHQyKEivedKWWxysgcnMjU/quz8IPRqc1XQOx+WU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=grKL+Fk85gxgA2zUUBZuusZPuC+3/N5oay0s7RNET3UlmMjJWbvupSrWg9i+xrWca Ndc9blHSFtLFll9vH0CMEPipZdvjtP4S1yZE/ZNbncpQVbcqEtXdJ5yuh79TOdueuG ZrYnwdXARCVIZmF8wG/XUrkeGGoeiCjLMeYZbGKU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N8ob6-1lf9YZ3JW2-015twE; Tue, 30 Mar 2021 17:08:45 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , G Edhaya Chandran , Barton Gao , Arvin Chen , Samer El-Haj-Mahmoud , Heinrich Schuchardt , G Edhaya Chandran Subject: [PATCH edk2-test 1/1] uefi-sct/SctPkg: IHV: type mismatch in SimpleTextOut test Date: Tue, 30 Mar 2021 17:08:31 +0200 Message-Id: <20210330150831.91846-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:r0xNhdic8AlylSwmMJ7VEV798HOLmb09HBnz9FwVebypmH5iahz VF3ShAKm8gHRZe84Wbt9mHtcPPaKkOQkYIh/PovePfhvy2oGTR6dGaYIskp/KzBx3RmBJjg j7+ivO84pvPk/zqCylnT+JhgPKiCLxQ0mDsXsdoQVc1i8DYY3l1PgJAgCemKgGNRtZskpQ5 GLIYPyEIEVpCGR0+0/2MA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:lPxjPtQ60I8=:taEVlw/k9hnol+OHEFEpvk RGy3rjBWNtnrR5s1oPHfWIBCIQaZPgZtiDL62C58NnhUj8kvXYTbHNBetxn/zlk5HqM4qizgX dOB9+GfsSveBhFC2WzfvlBdtPGnN1iJT8j8P41eIU706SH3ZanVlMLRLmYl/0Ow+fYRBq1Sap HjRD3ICqmQdYC/hzakOApt5S8WXxXpWLRe8523t9t2ZaB0Z5RM4Twq+64IkjsggGI3sQt7Rwq AOpscVa8T3NzwwSr+RTaU+eeEuuahHFcXsm1cgsxfGP4Lkpo2ANuwc6ZPlr6WvXqhwggAlE4j /Va48TYU19vKNMYCsZgb/tKV9S9OxV4VBaDhBQYN912gu4j5NI3gWbZLHzofU/GPONslDmqge cRa12Xp0AaPkTXLw9CW7F909Cch3JxpRlAgkKYxHeiIiGmXGr1hMa8R+y/LXqk/V39YBXTcYu DxEj7PMHd0+SjEFBvWiP3U3L1mUaXYg7FVJjMZZc2sLP9tkN46EXHDqZCOuZOkKFXcIPeZjdQ +70H1wfbHuE2k8vvjWYGiYanQ+RRd7DemzDUBLRCKbLUtoZI2IJIiSNINiVJNrPqHpOMg0ESE yFNrcBFYp1VlGBDz42JPhAlf6Y9nqvIswlGrfROdDTH7wDXu2YOraDmmgpb/FrWL/kStULTkU 0i/Cs9aTjfPtoBSdoKEuVbLTEBoLXeK9gPTx8RW17zPSpkJgZUlfhjgA0vsO5DEkhtf6juTEP 5u1vVQoiJ1LfcTbu4tvDAl8uzIzpfziYXel+1H0kTt9TM8z3fcWi2g4VL4jpJCjb3NPi51gGp 4B3WKZKMbnacdx1bfpCYTPtnbUZsfFLq+Iu5VweOBbcTNOV8Q+sW/UeDvuYMiZYgN+HHGELPD 5ZLzJ3RvjpnNXtZWdY1OXvi5UGu6rdbOz5KrO9kg1j2B4BPSmc+ph76afRPVBaaEWsyG0fyMv PK7vgQejizAZYe0fxIFKJIRaYsKr6BjJV7Z1KmJel4h7OvVrfChg3NQWoPPNLsLgdEx99oCWi uNkANHwbsTmQgCsXqNZEX/rAYaI/6P+tbsLvXxLvOS1K4lOzfPLWn9NI9o8FcitMu1TUbIsXN HWU6vAzjIUgfYQeLG69LofwoidTIbQiBjxUekEsh0frmheHGiSH/IpJar3z8uR1mXi9k0Jpkx JpBDX9++geTD5mKUMrJcqlyfRsA8k35H7GirsGWvpyoSamJRAqFoLdtMNKiamxgpUOV30= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3253 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=3D-549755813885, -549755813885 is 0x0xFFFFFF8000000003. So MaxMode actually is an INT32 with value 3 in this example. Convert the parameters to UINTN. Signed-off-by: Heinrich Schuchardt Reviewed-by: G Edhaya Chandran =2D-- .../SimpleTextOutBBTestFunction_uefi.c | 624 +++++++++--------- 1 file changed, 312 insertions(+), 312 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/Blac= kBoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEF= I/IHV/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi= .c index 2bc9bcdb51f9..a833498c2816 100644 =2D-- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxT= est/SimpleTextOutBBTestFunction_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextOut/BlackBoxTes= t/SimpleTextOutBBTestFunction_uefi.c @@ -176,12 +176,12 @@ BBTestResetFunctionManualTest ( L" Expected:Cursor Position(%d x %d), MaxMode=3D%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=3D%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=3D%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=3D%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=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -987,18 +987,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1094,18 +1094,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1217,18 +1217,18 @@ BBTestOutputStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1469,18 +1469,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1626,18 +1626,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1754,18 +1754,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -1897,18 +1897,18 @@ BBTestOutputStringFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2240,18 +2240,18 @@ BBTestTestStringFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMode= =3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2433,18 +2433,18 @@ BBTestQueryModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->Mode, - SimpleOut->Mode->MaxMode, - SimpleOut->Mode->Attribute, - SimpleOut->Mode->CursorVisible, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.Mode, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); if ( EFI_UNSUPPORTED =3D=3D Status && 1 =3D=3D Index ) { @@ -2720,18 +2720,18 @@ BBTestSetModeFunctionManualTest ( __FILE__, (UINTN)__LINE__, Index, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->Mode, - SimpleOut->Mode->MaxMode, - SimpleOut->Mode->Attribute, - SimpleOut->Mode->CursorVisible, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.Mode, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -2968,18 +2968,18 @@ BBTestSetModeFunctionAutoTest ( __FILE__, (UINTN)__LINE__, Index, - SimpleOut->Mode->CursorColumn, - SimpleOut->Mode->CursorRow, - SimpleOut->Mode->Mode, - SimpleOut->Mode->MaxMode, - SimpleOut->Mode->Attribute, - SimpleOut->Mode->CursorVisible, - ModeExpected.CursorColumn, - ModeExpected.CursorRow, - ModeExpected.Mode, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3193,18 +3193,18 @@ BBTestSetAttributeFunctionManualTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, M= axMode=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); Result =3D FALSE; } @@ -3451,18 +3451,18 @@ BBTestSetAttributeFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d,= MaxMode=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); Result =3D FALSE; } @@ -3653,18 +3653,18 @@ BBTestClearScreenFunctionManualTest ( L" Expected: Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -3896,18 +3896,18 @@ BBTestClearScreenFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -4143,18 +4143,18 @@ BBTestSetCursorPositionFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, Ma= xMode=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); Result =3D FALSE; } @@ -4434,18 +4434,18 @@ BBTestSetCursorPositionFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, = MaxMode=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); Result =3D FALSE; } @@ -4669,18 +4669,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -4739,18 +4739,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -4803,18 +4803,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); // @@ -4888,18 +4888,18 @@ BBTestEnableCursorFunctionManualTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); } else { // @@ -5128,18 +5128,18 @@ BBTestEnableCursorFunctionAutoTest ( L"Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMod= e=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -5212,18 +5212,18 @@ BBTestEnableCursorFunctionAutoTest ( L" Expected:Cursor Position(%d x %d), Mode=3D%d, MaxMo= de=3D%d, Attribute=3D%d, CursorVisible=3D%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, - ModeExpected.MaxMode, - ModeExpected.Attribute, - ModeExpected.CursorVisible + (UINTN)SimpleOut->Mode->CursorColumn, + (UINTN)SimpleOut->Mode->CursorRow, + (UINTN)SimpleOut->Mode->Mode, + (UINTN)SimpleOut->Mode->MaxMode, + (UINTN)SimpleOut->Mode->Attribute, + (UINTN)SimpleOut->Mode->CursorVisible, + (UINTN)ModeExpected.CursorColumn, + (UINTN)ModeExpected.CursorRow, + (UINTN)ModeExpected.Mode, + (UINTN)ModeExpected.MaxMode, + (UINTN)ModeExpected.Attribute, + (UINTN)ModeExpected.CursorVisible ); =2D- 2.30.2