From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by mx.groups.io with SMTP id smtpd.web12.13324.1615312905299639957 for ; Tue, 09 Mar 2021 10:01:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=VMOHO1wg; spf=pass (domain: gmx.de, ip: 212.227.17.20, mailfrom: xypron.glpk@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1615312878; bh=7VQlV8VIwEBI00jdRKKgfoHNhpuBQgrYyNQWB25q9OM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=VMOHO1wgtH/EUjM3F1OBlUA1NGInJyr6Ctz00YDg00hNqIinKhb9WvayLnVVX/uL6 cse1hk7FNizZ2mflu1P++pNCYLLxBmB/mFfTOdXnq0901s2WiM9PjSxIVEOgPT/23+ ERZ83stjEVWkuWt77txXJLe65Z8ZIv/CjpRgkWFc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MGyxX-1lW0T83hZb-00E3sd; Tue, 09 Mar 2021 19:01:18 +0100 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , G Edhaya Chandran , Barton Gao , Arvin Chen , Samer El-Haj-Mahmoud , Heinrich Schuchardt Subject: [PATCH edk2-test 1/1] uefi-sct/SctPkg: type mismatch in SimpleTextOut test Date: Tue, 9 Mar 2021 19:01:06 +0100 Message-Id: <20210309180106.138778-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:GX67l086oaZCJvVPLOdO+FDzEzNw9damykZT5PEp2UkkLI/5o9y fIZC4DHIKNxpVUCRt5o9k/Onc4fgyxIIxtvsGDQ7XAB26XD9qUntTa9QrimP4prlggOcGSN cu3iOVDLPyIWTDzXDCjUBC4lF9XDZ4DGPG5Wk/aVG7l78MlKInprs+NdfLKj/DuGgdyJBmM tnRJciAvbgoMTQYyDFTnQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:3vLSLDQX/LI=:7vbAB3ancc3AqzvVjj+bsw n1+TnxRE0I9ew3yseqkooh+6P7cFWRrj86XI7jv3Bv0cFqAJ5RHafeEoMMMnYq+4uIHfjcvON sCWlA6zPYqvYn2ieowU26v7NGr6cXeWDQbqAPQn0G5hmj4pZrJ2OfZTB9dEkBtb3IiokOjwT1 iWWV3ZqdWT31poViYLeDvqPLR3Y97in7Q6EfNglm59KOy9+ht6miF03PaFCrjb4NJYaBb8o48 q0vIXrKysEzal357jIS9wuXiSHLjStEkD5EVOCCPFl+oQAr4sdcUUjz6+P7C4ctiPJSO72Ju7 EL5WLsL6IuTPqkT9XcEbIZrA0ZXxhi2yBzMkhaI8IkFlMpbg8eP4eB2a8rLVmTa5+bVGUG6AN DAbuiUHtu7K2EFXo+yRgN2WsFvpjnArljtYsvK8fyEFzhEJvxapbEe7EUthCMYDoLh9g6CgbB i1ylbuaYARz3bY7M1Gdmg/kUV8ZIEx1PBsdyaFBVc9A2IwmZ7aaHactPVHWv6pyQfTTqqbFIv mbb1G8hQyo4bkyTGkEFrBicXgjAch0KneDPTpqNXG9vEo6EXL6CxRq5d7ctFlQl3icHKY3lgK +ACN1kZkibRJHOkVNy2S9FoyC9HQRW2XSiDtZgSUmCOKuO1ofYOBiioyOpJmlPryXde/HV0qm 7qfbKy0cS2NvWQ/AoDSjfTKWrSdFiynU1T4+efROHqz30pTg6A+yEZQcG5TvXus/YAnjJC7L5 xFRi3eZ/I3QZ0VdHxUZcc3wn63uk+YwG5XmKHyIVrKOKmkjJGWnVBg+eAh2kno9ntip3q+pBv O83L10xIxYBzea6ZVIUjTFp68iOrKzlWnsJ1G51UTa1c3nJthBW629BxsoWnvOnwaQD4uW1SX rdxs48ENC3C6qa9/csww== 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 =2D-- .../SimpleTextOutBBTestFunction_uefi.c | 624 +++++++++--------- 1 file changed, 312 insertions(+), 312 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/Blac= kBoxTest/SimpleTextOutBBTestFunction_uefi.c b/uefi-sct/SctPkg/TestCase/UEF= I/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTestFunction_uefi= .c index 9b0ae233ce5f..bbe3f4e27077 100644 =2D-- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxT= est/SimpleTextOutBBTestFunction_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/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.1