From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.10245.1678672139931719069 for ; Sun, 12 Mar 2023 18:49:00 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=XIFp/sUu; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678672139; x=1710208139; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=oPoq05nVvBItOCrNsr+xsM0p4OQaP2ahEOPPx6ap/LE=; b=XIFp/sUu84h58D2W2XgaHOJ2Jcs1HwYfUF+S94r8UNjbYocHoK/HpzuO 4snkrsD2Ty1txKbK63Q/jmyPqydkB48UrjwBX1962Q0wlbMyLBG75BMr1 naxr2qBj3ZrZLL4RW115GblSuibjC6+M6MToMs1t+9G5exClYZLL+lgxh G+lCMpN4Og+LM86qcuaID9C35lOlZPp5lowTXZ5PC4R8h/C+Y2M6jWgaw 5k91PlZ3Jk1nF7VOD7xj7CMUUMazl2SN6hMZOn9UG35HOssP4+DeEW56m FXQMB5UA/2n73eyf2znWsth1/PFmVUNusQV0yqnsfhrqmvg9/81LND483 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="364702900" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="364702900" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2023 18:48:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="671728190" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="671728190" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga007.jf.intel.com with ESMTP; 12 Mar 2023 18:48:59 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sun, 12 Mar 2023 18:48:58 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Sun, 12 Mar 2023 18:48:58 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Sun, 12 Mar 2023 18:48:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E5873WVatePkurbVfZ8owPAIX6Yqlo/BVbw7nsaj1e9bqrxFxNJOOHPPj5/6muADLK4ejLE9UHJ1L8QH038LbLqNIyi6yKhwqEYQdE5MHNTpfAvHBAhDggKOTCZZ8pAe13AO+cfiMRfi0hYqupWqNMyl3AGDHCMpD/cQk/QLvLNpelsPhRcTbJ8pFNBrUzR6WRFriEAdSHzua9lTOmb/gMFY30j7TQTDXYlRgoWhq3y13u+vk6ZjAhtZtwibDgcxZSoy5OpPMCHg5uABLm03iphQhJMGctMGGkyU/Gfe2WGXJCwY8FO9/2qVVciB7/n4z/9NYWKjWlal4COQnQDKEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IZYg3LRo786itAJMEkkXhej9vQYtBCkhUGxMCD2INLU=; b=EilLcV+oFg6beZlH3G8MrrE7Qj8im3oe1FxL8uT416G+EV9j12Y5VVR6Pi+NbGJUhwd0OzNnOWmMNLFBSSlmXjYi/XYazKZIJDWDIL7RxNcSORPw8RiTcWq9UIlzQR74N94JKZnBdtZK0EAXlafm/mhiNP7JZqBdpiBuKxNOtyyD9ScM9QlaIZZR5ZyfQoUWe8AroDsDcSP9vf6ZfIH73lITHmtWtN4Rsx2mWn80+XHZEIIGL0ZPdxrb6xfqqm0W+lGbnBqQk1Uow1CZwdORRdf+B0w1w8+DtmB8Bug0ZURzv1/xyPIqSGnp1gnF+urBnRoqe/5ZEGXkH4wwKrIKoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by MN2PR11MB4693.namprd11.prod.outlook.com (2603:10b6:208:261::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 01:48:56 +0000 Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::ae07:e96a:4a24:8a69]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::ae07:e96a:4a24:8a69%7]) with mapi id 15.20.6178.024; Mon, 13 Mar 2023 01:48:56 +0000 From: "Ni, Ray" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Gao, Zhichao" , "Anadani, Ahmad" Subject: Re: [Patch 1/1] ShellPkg/Library: Fix 32-bit truncation of pointer values Thread-Topic: [Patch 1/1] ShellPkg/Library: Fix 32-bit truncation of pointer values Thread-Index: AQHZVFXU7WECwbGePUudk/wc8r9vAa7380KA Date: Mon, 13 Mar 2023 01:48:56 +0000 Message-ID: References: <20230311201216.1856-1-michael.d.kinney@intel.com> In-Reply-To: <20230311201216.1856-1-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|MN2PR11MB4693:EE_ x-ms-office365-filtering-correlation-id: e1ea6be1-b7d8-4429-281b-08db23651b68 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: NUEmr/zAlAaT+KvPISXmhclayS9H8tDeWdI1SK92/mAY0wlk8jkuWYawKNvrJwE+ns6CO0iEkyd2vVE0fawwmV/zGqd/PF7oekwhYn/DUAoT0lKryQ7x1C240CmGvDHCmVC/PYg59EeDb+6qv9lAiP8G6bn5Rt1+x/3wk9ihW/XYlxwzAuLW1rrFrjdusR7fbiHpZ8FoKZzJFxX74evbxD/yNX6Dml6QXGIs+z3/RUC/KugwojOymB548nvrVZDtvEHWrnxjwEJ2w6vypB30fg5l3iZGUOl9EucHC5QBm/Mow09tjvv49pTRApvwg3MMiBGI5mHL7QNG1oCNsiwJeXcJc/tTwNO1Vbx0OH5IHr7xPN63pzgp9SIf/BYH6o6ZJafCtlkNkrapwrL77JOiha6GpTuKvgPelEUxQlCDtaEbbe4+oMCI6VbtGvxYQ/RvlZqtnLGzWqo69TU97kZtspQXMnD7A/6NtDm0mneI3REF8H8DPcnFVPE/t7p7nMc9zEfptM+ae8JJwaTpWqwZCmpkf6EGSIp5Hx2kkjCRKZ35i8GfLRrxt/2WgJryQlgErtUhevJ7lsYPVDPVxu/F0pYdmYh3Mrb+0pt62CLvEXZfOa2aBKB/f0zLP8YYZXVR8tdVJ73jWGpO3d5pBj6wzHKlBiTg6IG2DOZcyUhlKJju3tOSJSEL2EPi08IfHGth x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN6PR11MB8244.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(396003)(136003)(366004)(346002)(376002)(39860400002)(451199018)(52536014)(5660300002)(8936002)(2906002)(41300700001)(82960400001)(86362001)(33656002)(38070700005)(38100700002)(122000001)(7696005)(66946007)(66556008)(66476007)(64756008)(478600001)(66446008)(8676002)(966005)(71200400001)(76116006)(4326008)(55016003)(110136005)(54906003)(19627235002)(107886003)(316002)(186003)(83380400001)(9686003)(26005)(6506007)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?QRDdNGz4fMswmaUPWCIFse/A1jFW9R2WThLVukdM/92Vf+HMkxmL6L8aUlEY?= =?us-ascii?Q?94ZgCiRXAVD6MqMp1t++Q3SZKy/siQ0TyhjErsMXtJpPUisK1IguUoJFYtIn?= =?us-ascii?Q?9DMgLavokSZVUkU30zQFKmossTxTLIhqFU4mQQO92q131LAhJHnToTPnSs53?= =?us-ascii?Q?C3cKF7T6Z1HOIBRf714SYMfMQ+6Xqxiya294KSv70UY/tWyGQQpNqxGSa8n1?= =?us-ascii?Q?Ivur80NCO+hu+wEpxal7SQxPQQv6yZKqriAirEO2N+kKyyoB01KVjh5fvQhs?= =?us-ascii?Q?HDLrnej94n6FW53/QuXFlnr0hnfBBow5MGgdseXW7DZEU7G6EG6hpItBYnhp?= =?us-ascii?Q?aEaPGd+x/WN3itqGBtkswB0CBYUUTAAPQEGzoijSnBeZntVLvfuM4p4qHZSt?= =?us-ascii?Q?8sDyvk7XTWtGc3DRWwVF4VVHIwHI2X0Lsmnkjk7RjNNRvTJ+bELNlFjb/dzR?= =?us-ascii?Q?LCeSCtiAFb/jx89il5PDY+xJ9aGpuBjPuLz1ykI6ws5C81xJRkuLenfi/vDU?= =?us-ascii?Q?G9kruuq3gJCiwivGq1KhRRhB5u3faKXzsn0xQVkL+WhCyuEcymBZ8K5Fd+j6?= =?us-ascii?Q?X1kjdi3m2EcvTiuD3Z9F7kUdyRSRDZfUSzHPwmT7bZWe9oIyxk+/2i9RhPWY?= =?us-ascii?Q?OdvVSRWiP5n9lOwArHsGHNN/nzXgexSlyafzvEaBP3gcF4XVrxQT6qJGqKLn?= =?us-ascii?Q?YI7N66EYxNXYQFIUljPgK1VWQ5OokwQkxkBnr53GIIEUKY1ggFvQRag/PhTE?= =?us-ascii?Q?4wDTMPgIerlsB6Sn8e2dd5e/pGTL9KI7d/uWgDuPQ62nY9G3w0qkPc0JSYMW?= =?us-ascii?Q?wkooih54cGC5IxHGS6jki42ZwEX+G+LEoYgxua3KQWaHA9vzsSA+6N/fBvse?= =?us-ascii?Q?N88GrLsN1ZGXG0zYir5JI25D3wqB63VjcurscoecSrB/ZfbIKIp+ASlxR2hk?= =?us-ascii?Q?lbGiOnFzBA5MRVzLxTAmap0QhLsGpZCb+SNR0YiWPbkgm2ntmGOlP9vk770t?= =?us-ascii?Q?0rjQU8d20hIHkLcqmeSMJEfq5U/t0HZ232YjqJd1meBNeabNrGs2RODq7QAE?= =?us-ascii?Q?2GtfoCnp7rGNZEWK0EoNl9VsJ2oMzCMQ8tM5GPQ//ZYk1vOCtJN87RI3F4hz?= =?us-ascii?Q?BrHTTfmxEvj8oXYIwSEdIL0WsdS0i4esee318txmVQxqFhm5ub+8acaceM73?= =?us-ascii?Q?g93SsHKbQ7QI7YCQQpAAkT8FBJMUkDm2oqG/YP7bffIko13XzU9kQZIvv5bk?= =?us-ascii?Q?jacfjLbyZuiOt3ClnESzbjnuzRQUpnsJ2BbaHxboO7L1nLK7kQbOmYPIaQqU?= =?us-ascii?Q?FBj2jePBr2DB5Ujhn0POEi4LFy0OxhpPcKwFx7FHlhTLMvdjqBw7leT0LaiJ?= =?us-ascii?Q?EvRYiam7UOx0tWyoM9SBA2B/SrfZiPquRiFUXksiRQAknRp3BN84thC6uAdD?= =?us-ascii?Q?RLsBGKenK86UC1xAytLGiYVRjzxmBkUFvgxaZGVuvqNfmWC0CwG9vcJFaG8w?= =?us-ascii?Q?9MyJoOAzBcPPHjo2WpxUmwWtMhQ+8VJosVqbHcb8Oa9tkzoIxfM/zEkNMOpG?= =?us-ascii?Q?H+2PBp58xd3pE2WAAyM=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1ea6be1-b7d8-4429-281b-08db23651b68 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2023 01:48:56.1224 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: T4YoWZCZBx+bd8PLkBfbPTVQeVMTjAb2CHbWDdLGtwHPVt19UIZsaNlphyf1Dr43vog7/PtiNBlkV2ZndGoAiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4693 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Kinney, Michael D > Sent: Sunday, March 12, 2023 4:12 AM > To: devel@edk2.groups.io > Cc: Ni, Ray ; Gao, Zhichao > Subject: [Patch 1/1] ShellPkg/Library: Fix 32-bit truncation of pointer v= alues >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4366 >=20 > Update C and UNI files that are incorrectly using %x or %08x > instead of %p for pointer values. On 64-bit systems, this is > truncating pointer values above 4GB. >=20 > In reviewing ShellPkg for this issue some unused UNI strings > with incorrect format specifiers were removed instead of being > fixed. >=20 > Cc: Ray Ni > Cc: Zhichao Gao > Signed-off-by: Michael D Kinney > --- > .../UefiHandleParsingLib.uni | 18 +++++------ > .../UefiShellDebug1CommandsLib.uni | 2 -- > .../Library/UefiShellDriver1CommandsLib/Dh.c | 2 +- > .../UefiShellDriver1CommandsLib.uni | 31 +------------------ > .../UefiShellLevel2CommandsLib.uni | 3 +- > 5 files changed, 12 insertions(+), 44 deletions(-) >=20 > diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.u= ni > b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni > index aa3396cea94d..6bcb3cd9e461 100644 > --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni > +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni > @@ -173,7 +173,7 @@ > #string STR_HII #language en-US "HII" > #string STR_HII_FORM_CALLBACK #language en-US "HIICallback" >=20 > -#string STR_TXT_OUT_DUMP_HEADER #language en-US " > Address: %%H%X%%N Attrib %02x" > +#string STR_TXT_OUT_DUMP_HEADER #language en-US " > Address: %%H%p%%N Attrib %02x" > #string STR_TXT_OUT_DUMP_LINE #language en-US "\r\n %c mode %d: > Col %d Row %d" >=20 > #string STR_DRIVER_FAM_OVERRIDE #language en-US > "DriverFamilyOverride" > @@ -361,7 +361,7 @@ > #string STR_DEBUGSUPPORT_INFO #language en-US " Isa =3D %s" > #string STR_DEBUGSUPPORT_UNKNOWN #language en-US " Unknown > (%%H%s%%N)" >=20 > -#string STR_PCIRB_DUMP_PH #language en-US " > ParentHandle..: %%H%x%%N\r\n" > +#string STR_PCIRB_DUMP_PH #language en-US " > ParentHandle..: %%H%p%%N\r\n" > #string STR_PCIRB_DUMP_SEG #language en-US " Segment > #.....: %%H%x%%N\r\n" > #string STR_PCIRB_DUMP_ATT #language en-US " > Attributes....: %%H%x%%N\r\n" > #string STR_PCIRB_DUMP_SUPPORTS #language en-US " > Supports......: %%H%x%%N\r\n" > @@ -375,7 +375,7 @@ > " Device #......: %02= x\r\n" > " Function #....: %02= x\r\n" > " ROM Size......: %lx= \r\n" > - " ROM Location..: %08= x\r\n" > + " ROM Location..: %p\= r\n" > " Vendor ID.....: %04= x\r\n" > " Device ID.....: %04= x\r\n" > " Class Code....: %02= x %02x %02x\r\n" > @@ -388,18 +388,18 @@ > #string STR_LI_DUMP_NAME #language en-US " > Name..........: %%H%s%%N\r\n" >=20 > #string STR_LI_DUMP_MAIN #language en-US " > Revision......: %%H0x%08x%%N\r\n" > - " ParentHandle..: %%H= %x%%N\r\n" > - " SystemTable...: %%H= %x%%N\r\n" > - " DeviceHandle..: %%H= %x%%N\r\n" > + " ParentHandle..: %%H= %p%%N\r\n" > + " SystemTable...: %%H= %p%%N\r\n" > + " DeviceHandle..: %%H= %p%%N\r\n" > " FilePath......: %%H= %s%%N\r\n" > " PdbFileName...: %%H= %a%%N\r\n" > " OptionsSize...: %%H= %x%%N\r\n" > - " LoadOptions...: %%H= %x%%N\r\n" > - " ImageBase.....: %%H= %x%%N\r\n" > + " LoadOptions...: %%H= %p%%N\r\n" > + " ImageBase.....: %%H= %p%%N\r\n" > " ImageSize.....: %%H= %Lx%%N\r\n" > " CodeType......: %%H= %s%%N\r\n" > " DataType......: %%H= %s%%N\r\n" > - " Unload........: %%H= %x%%N" > + " Unload........: %%H= %p%%N" >=20 > #string STR_GOP_DUMP_MAIN #language en-US " Max > Mode..............: %%H0x%08x%%N\r\n" > " Current Mode.......= ...: %%H0x%08x%%N\r\n" > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > index b1d239ed37ea..4fedc0d1493c 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > @@ -103,7 +103,6 @@ >=20 > #string STR_DMEM_HEADER_ROW #language en-US "Memory > Address %016LX %X Bytes\r\n" > #string STR_DMEM_MMIO_HEADER_ROW #language en-US "Memory > Mapped IO Address %016LX %X Bytes\r\n" > -#string STR_DMEM_DATA_ROW #language en-US > "%08X: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x > %02x %02x %02x %02x *%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c*\r\n" > #string STR_DMEM_SYSTEM_TABLE #language en-US "\r\nValid EFI > Header at Address %016Lx\r\n" > "---------------------= ------------------------\r\n" > "System: Table Structu= re size %08x > revision %08x\r\n" > @@ -1171,4 +1170,3 @@ > " \r\n" > " * To edit memory region starting at address 0x00000000 with size of 2 > bytes:\r\n" > " fs0:\> hexedit -m 0 2\r\n" > - > diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c > b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c > index dd9aba50d754..d17d50fe13fa 100644 > --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c > +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c > @@ -325,7 +325,7 @@ GetProtocolInfoString ( > Status =3D gBS->HandleProtocol (TheHandle, > ProtocolGuidArray[ProtocolIndex], &Instance); > if (!EFI_ERROR (Status)) { > StrnCatGrow (&RetVal, &Size, L"(%H", 0); > - UnicodeSPrint (InstanceStr, sizeof (InstanceStr), L"%x", Insta= nce); > + UnicodeSPrint (InstanceStr, sizeof (InstanceStr), L"%p", Insta= nce); > StrnCatGrow (&RetVal, &Size, InstanceStr, 0); > StrnCatGrow (&RetVal, &Size, L"%N)", 0); > } > diff --git > a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Command > sLib.uni > b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Comman > dsLib.uni > index fc4986c8c62f..230779a4b30d 100644 > --- > a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Command > sLib.uni > +++ > b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Comman > dsLib.uni > @@ -101,7 +101,7 @@ > #string STR_DH_OUTPUT_GUID_HEADER #language en-US "Handle dump by > protocol '%g'\r\n" > #string STR_DH_OUTPUT_NAME_HEADER #language en-US "Handle dump > by protocol '%s'\r\n" > #string STR_DH_OUTPUT_SINGLE_D #language en-US > "%H%02x%N: %s\r\n" > -#string STR_DH_OUTPUT_SINGLE #language en-US > "%H%02x%N: %x\r\n%s" > +#string STR_DH_OUTPUT_SINGLE #language en-US > "%H%02x%N: %p\r\n%s" > #string STR_DH_OUTPUT_SFO #language en-US > "%s, %s, %s, %H%02x%N, %s, %s\r\n" > #string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller > Name : %H%s%N\r\n" > #string STR_DH_OUTPUT_DRIVER2 #language en-US " Device > Path : %H%s%N\r\n" > @@ -128,18 +128,6 @@ > #string STR_DEV_TREE_OUTPUT #language en-US > "Ctrl[%H%02x%N] %s\r\n" >=20 > #string STR_UNLOAD_CONF #language en-US "%HUnload%N - Handle > [%H%02x%N]. [y/n]?\r\n" > -#string STR_UNLOAD_VERBOSE #language en-US "" > -"Handle [%H%02x%N] (%08x)\r\n" > -" Image (%08x)\r\n" > -" ParentHandle..: %08x\r\n" > -" SystemTable...: %08x\r\n" > -" DeviceHandle..: %08x\r\n" > -" FilePath......: %s\r\n" > -" PDBFileName...: %a\r\n" > -" ImageBase.....: %08x\r\n" > -" ImageSize.....: %Ld\r\n" > -" CodeType......: %s\r\n" > -" DataType......: %s\r\n" >=20 > #string STR_OPENINFO_HEADER_LINE #language en-US > "Handle %H%02x%N (%H%0p%N)\r\n" > #string STR_OPENINFO_LINE #language en-US " Drv[%H%02x%N] > Ctrl[%H%02x%N] Cnt(%H%02x%N) %H%s Image%N(%s)\r\n" > @@ -734,20 +722,3 @@ > " violation.\r\n" > " SHELL_INVALID_PARAMETER One of the passed in parameters was > incorrectly\r\n" > " formatted or its value was out of bounds.\= r\n" > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > diff --git > a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands > Lib.uni > b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands > Lib.uni > index 8ce015746f7c..0a0cd3090e0f 100644 > --- > a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands > Lib.uni > +++ > b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands > Lib.uni > @@ -134,7 +134,7 @@ >=20 > #string STR_LOAD_NOT_IMAGE #language en-US "Image '%s' is not an > image.\r\n" > #string STR_LOAD_NOT_DRIVER #language en-US "Image '%s' is not a > driver.\r\n" > -#string STR_LOAD_LOADED #language en-US "Image '%s' loaded at = %x > - %r\r\n" > +#string STR_LOAD_LOADED #language en-US "Image '%s' loaded at = %p > - %r\r\n" > #string STR_LOAD_ERROR #language en-US "Image '%s' error in > StartImage: %r\r\n" >=20 > #string STR_LS_LINE_START_ALL #language en-US "%t %5s %1c % ,L11d " > @@ -1076,4 +1076,3 @@ > " SHELL_SECURITY_VIOLATION This function was not performed due to a > security\r\n" > " violation.\r\n" > " SHELL_NOT_FOUND The target file-system was not found.\r\n" > - > -- > 2.39.1.windows.1