From nobody Mon Feb 9 19:25:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47416+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47416+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749839; cv=none; d=zoho.com; s=zohoarc; b=ipldDxTlNIac53xl3IgVMOKuOxz4OT9k7l1hhRgA8OEViJjxl3W26EuOYXE85EEKkeKBjka/AdTqGZ8IAk2t2zW0Oq3D+zrrcVn4wcp7MlrDNVLkxpYiPmV7FyGZbBZKXQ+0qh2so0RHdbyymJ1ulURxVeA/RVcgdG+Uat7riBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2fwKYYxEdKmsLmi+ZB4BOOvExZ+Cf4dci2YLdV4SArI=; b=RtXebnzxP/QDN1YKVmtZ5t1uYGj51RFqJtJvgKunEvDVtfzqLdQMW8bf41DYiwqmJhdvm2nXhYpna+dtVaXtqFynIvWaJavefMCTs9EISqw9LdwR4BQ2HOXjnCRqckZkMhfxcJ53OBHr96FjvM2gd19iCYoakfYDMrheva2CAU0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47416+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749839885796.5639597073128; Tue, 17 Sep 2019 12:50:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id mPwBYY1788612xPBNKGhgUTq; Tue, 17 Sep 2019 12:50:38 -0700 X-Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:37 -0700 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86280308424C; Tue, 17 Sep 2019 19:50:37 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17E33600C4; Tue, 17 Sep 2019 19:50:35 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Jaben Carsey , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 29/35] ShellPkg: stop using EFI_HANDLE in place of EFI_HII_HANDLE Date: Tue, 17 Sep 2019 21:49:29 +0200 Message-Id: <20190917194935.24322-30-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 17 Sep 2019 19:50:37 +0000 (UTC) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: JgAJDKKnDBURb0UYA2qzcA2Ix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749838; bh=ivyiJCEvFVS58DCZwxl3W5HJZ4eBwnLv8xx+8sjV5iY=; h=Cc:Date:From:Reply-To:Subject:To; b=Tq5de0QJqaWXLlB5lStXGWzKC7iN+QtleX9bFEldufT3w7RFqXhC8DnGuF5bo4P8xB/ ApRD0KHFfZR7YuZUnuSaFVBA1pkRA4lp27ybd6pHmEilxeKBURLw9IyLSqWMwOT8cXFdm s8c1criKybaOh8xWg6w8N4GFByY02H7E9hc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The UefiShell*CommandsLib instances have constructor functions that do something like: gHiiHandle =3D HiiAddPackages (...); ... ShellCommandRegisterCommandName (..., gHiiHandle, ...); and destructor functions that implement the following pattern: HiiRemovePackages (gHiiHandle); The -- semantic, not functional -- problem is that "gHiiHandle" is declared with type EFI_HANDLE, and not EFI_HII_HANDLE, in all of these library instances, even though HiiAddPackages() correctly returns EFI_HII_HANDLE, and HiiRemovePackages() takes EFI_HII_HANDLE. Once we fix the type of "gHiiHandle", it causes sort of a butterfly effect, because it is passed around widely. Track down and update all of those locations. The DynamicCommand lib instances use a similar pattern, so they are affected too. NOTE: in practice, this patch is a no-op, as both EFI_HII_HANDLE and EFI_HANDLE are typedefs to (VOID*). However, we shouldn't use EFI_HANDLE where semantically EFI_HII_HANDLE is passed around. Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Zhichao Gao --- Notes: tested with: - level 1: stall, exit - level 2: ls - level 3: pause - dynamic command: tftp - handle parsing: drivers, devices, dh ShellPkg/Include/Library/ShellCommandLib.h = | 2 +- ShellPkg/Include/Library/ShellLib.h = | 4 ++-- ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h = | 4 ++-- ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h = | 4 ++-- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h = | 2 +- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h= | 2 +- ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h = | 2 +- ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib= .h | 2 +- ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib= .h | 2 +- ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c = | 6 +++--- ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c = | 6 +++--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c = | 2 +- ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c = | 2 +- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c = | 2 +- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c= | 2 +- ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c = | 2 +- ShellPkg/Library/UefiShellLib/UefiShellLib.c = | 4 ++-- ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib= .c | 2 +- ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib= .c | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/= Library/ShellCommandLib.h index 287bc0eba7f9..63fcac82a2de 100644 --- a/ShellPkg/Include/Library/ShellCommandLib.h +++ b/ShellPkg/Include/Library/ShellCommandLib.h @@ -136,7 +136,7 @@ ShellCommandRegisterCommandName ( IN UINT32 ShellMinSupportLevel, IN CONST CHAR16 *ProfileName, IN CONST BOOLEAN CanAffectLE, - IN CONST EFI_HANDLE HiiHandle, + IN CONST EFI_HII_HANDLE HiiHandle, IN CONST EFI_STRING_ID ManFormatHelp ); =20 diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library= /ShellLib.h index 31594796cd21..1dc41f2cc11b 100644 --- a/ShellPkg/Include/Library/ShellLib.h +++ b/ShellPkg/Include/Library/ShellLib.h @@ -965,7 +965,7 @@ ShellPrintHiiEx( IN INT32 Row OPTIONAL, IN CONST CHAR8 *Language OPTIONAL, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, ... ); =20 @@ -1260,7 +1260,7 @@ EFIAPI ShellPromptForResponseHii ( IN SHELL_PROMPT_REQUEST_TYPE Type, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, IN OUT VOID **Response ); =20 diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h b/ShellPkg/Dynam= icCommand/DpDynamicCommand/Dp.h index 43aa4505ee37..e446cccde923 100644 --- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h +++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.h @@ -36,7 +36,7 @@ #include #include =20 -extern EFI_HANDLE mDpHiiHandle; +extern EFI_HII_HANDLE mDpHiiHandle; =20 #define DP_MAJOR_VERSION 2 #define DP_MINOR_VERSION 5 @@ -133,7 +133,7 @@ RunDp ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ); diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h b/ShellPkg/D= ynamicCommand/TftpDynamicCommand/Tftp.h index 7a9ed4724e1f..4cd778436813 100644 --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.h @@ -30,7 +30,7 @@ #include #include =20 -extern EFI_HANDLE mTftpHiiHandle; +extern EFI_HII_HANDLE mTftpHiiHandle; =20 typedef struct { UINTN FileSize; @@ -62,7 +62,7 @@ RunTftp ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ); diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h b/S= hellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h index 36fe628a8c68..8ecc2f6bf5a2 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h @@ -46,7 +46,7 @@ typedef struct{ SHELL_GET_MAN_FILENAME GetManFileName; SHELL_RUN_COMMAND CommandHandler; BOOLEAN LastError; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; EFI_STRING_ID ManFormatHelp; } SHELL_COMMAND_INTERNAL_LIST_ENTRY; =20 diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.h index 32a933b9f062..082d488cb283 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.h @@ -52,7 +52,7 @@ #include =20 =20 -extern EFI_HANDLE gShellDebug1HiiHandle; +extern EFI_HII_HANDLE gShellDebug1HiiHandle; =20 /** Function returns a system configuration table that is stored in the diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1C= ommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver= 1CommandsLib.h index 7e0b8b094057..ee795c4ce024 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.h +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.h @@ -58,7 +58,7 @@ #include =20 =20 -extern EFI_HANDLE gShellDriver1HiiHandle; +extern EFI_HII_HANDLE gShellDriver1HiiHandle; extern BOOLEAN gInReconnect; =20 /** diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.h index 55acdd2b1f95..f2f9cc5dcf3b 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.h @@ -33,7 +33,7 @@ #include #include =20 -extern EFI_HANDLE gShellLevel1HiiHandle; +extern EFI_HII_HANDLE gShellLevel1HiiHandle; =20 /** Function for 'stall' command. diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.h index 6d522d4bb4a1..77be6f1a12c7 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.h @@ -43,7 +43,7 @@ #include =20 extern CONST CHAR16 mFileName[]; -extern EFI_HANDLE gShellLevel2HiiHandle; +extern EFI_HII_HANDLE gShellLevel2HiiHandle; =20 /** Function for 'attrib' command. diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.h b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.h index 2d97ae4d3c91..c095b9275ed0 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.h +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.h @@ -32,7 +32,7 @@ #include #include =20 -extern EFI_HANDLE gShellLevel3HiiHandle; +extern EFI_HII_HANDLE gShellLevel3HiiHandle; =20 /** Function for 'type' command. diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork= 1CommandsLib.h b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNet= work1CommandsLib.h index d4ed8c04652d..fddada2efa48 100644 --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.h +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.h @@ -38,7 +38,7 @@ #include #include =20 -extern EFI_HANDLE gShellNetwork1HiiHandle; +extern EFI_HII_HANDLE gShellNetwork1HiiHandle; =20 /** Function for 'ping' command. diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork= 2CommandsLib.h b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNet= work2CommandsLib.h index 9a5db32f2b76..9ea42cf26d53 100644 --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.h +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.h @@ -27,7 +27,7 @@ #include #include =20 -extern EFI_HANDLE gShellNetwork2HiiHandle; +extern EFI_HII_HANDLE gShellNetwork2HiiHandle; =20 /** Function for 'ping6' command. diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c b/ShellPkg/Dynam= icCommand/DpDynamicCommand/Dp.c index 735cdcbcc018..4ec4c18348bd 100644 --- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c +++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c @@ -36,7 +36,7 @@ typedef struct { =20 #pragma pack() =20 -EFI_HANDLE mDpHiiHandle; +EFI_HII_HANDLE mDpHiiHandle; =20 typedef struct { EFI_HANDLE Handle; @@ -924,14 +924,14 @@ Done: =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ) { EFI_STATUS Status; EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; =20 // // Retrieve HII package list from ImageHandle diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c b/ShellPkg/D= ynamicCommand/TftpDynamicCommand/Tftp.c index 607899032e9d..f28da9af723c 100644 --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c @@ -11,7 +11,7 @@ #include "Tftp.h" =20 #define IP4_CONFIG2_INTERFACE_INFO_NAME_LENGTH 32 -EFI_HANDLE mTftpHiiHandle; +EFI_HII_HANDLE mTftpHiiHandle; =20 /* Constant strings and definitions related to the message indicating the = amount of @@ -1087,14 +1087,14 @@ CheckPacket ( =20 @return HII handle. **/ -EFI_HANDLE +EFI_HII_HANDLE InitializeHiiPackage ( EFI_HANDLE ImageHandle ) { EFI_STATUS Status; EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HANDLE HiiHandle; + EFI_HII_HANDLE HiiHandle; =20 // // Retrieve HII package list from ImageHandle diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index f179c4109223..f62d30ef677a 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -14,7 +14,7 @@ #include #include =20 -EFI_HANDLE mHandleParsingHiiHandle =3D NULL; +EFI_HII_HANDLE mHandleParsingHiiHandle =3D NULL; HANDLE_INDEX_LIST mHandleList =3D {{{NULL,NULL},0,0},0}; GUID_INFO_BLOCK *mGuidList; UINTN mGuidListCount; diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandL= ib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c index e8b48b4990dd..f8bcaebe46c8 100644 --- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c +++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c @@ -38,7 +38,7 @@ #include =20 STATIC CONST CHAR16 mFileName[] =3D L"ShellCommands"; -STATIC EFI_HANDLE gShellBcfgHiiHandle =3D NULL; +STATIC EFI_HII_HANDLE gShellBcfgHiiHandle =3D NULL; =20 typedef enum { BcfgTargetBootOrder =3D 0, diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/S= hellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c index 826ced30a8c8..4c48b65fbc1d 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c @@ -554,7 +554,7 @@ ShellCommandRegisterCommandName ( IN UINT32 ShellMinSupportLevel, IN CONST CHAR16 *ProfileName, IN CONST BOOLEAN CanAffectLE, - IN CONST EFI_HANDLE HiiHandle, + IN CONST EFI_HII_HANDLE HiiHandle, IN CONST EFI_STRING_ID ManFormatHelp ) { diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.c index ddce3bef5a30..f918867f47af 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.c @@ -10,7 +10,7 @@ #include =20 STATIC CONST CHAR16 mFileName[] =3D L"Debug1Commands"; -EFI_HANDLE gShellDebug1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellDebug1HiiHandle =3D NULL; =20 /** Gets the debug file name. This will be used if HII is not working. diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1C= ommandsLib.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver= 1CommandsLib.c index 4a05fa9942c4..e2219c62ec25 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Commands= Lib.c @@ -9,7 +9,7 @@ #include "UefiShellDriver1CommandsLib.h" =20 STATIC CONST CHAR16 mFileName[] =3D L"Driver1Commands"; -EFI_HANDLE gShellDriver1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellDriver1HiiHandle =3D NULL; BOOLEAN gInReconnect =3D FALSE; =20 /** diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Com= mandsLib.c index ecbee99e3b3d..88cddd88ddc4 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLi= b.c @@ -10,7 +10,7 @@ #include "UefiShellLevel1CommandsLib.h" =20 STATIC CONST CHAR16 mFileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel1HiiHandle =3D NULL; =20 /** Return the help text filename. Only used if no HII information found. diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Com= mandsLib.c index c2a0bb492fbb..69427637bb87 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLi= b.c @@ -29,7 +29,7 @@ #include "UefiShellLevel2CommandsLib.h" =20 CONST CHAR16 mFileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel2HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel2HiiHandle =3D NULL; =20 /** Get the filename to get help text from if not using HII. diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Com= mandsLib.c index 7d2cc4a48371..ce4afd117aa1 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.c +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLi= b.c @@ -9,7 +9,7 @@ #include "UefiShellLevel3CommandsLib.h" =20 CONST CHAR16 gShellLevel3FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellLevel3HiiHandle =3D NULL; +EFI_HII_HANDLE gShellLevel3HiiHandle =3D NULL; =20 /** return the filename to get help from is not using HII. diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Librar= y/UefiShellLib/UefiShellLib.c index 5be530092e1b..835d0f88ca74 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c @@ -2997,7 +2997,7 @@ ShellPrintHiiEx( IN INT32 Row OPTIONAL, IN CONST CHAR8 *Language OPTIONAL, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, ... ) { @@ -3609,7 +3609,7 @@ EFIAPI ShellPromptForResponseHii ( IN SHELL_PROMPT_REQUEST_TYPE Type, IN CONST EFI_STRING_ID HiiFormatStringId, - IN CONST EFI_HANDLE HiiFormatHandle, + IN CONST EFI_HII_HANDLE HiiFormatHandle, IN OUT VOID **Response ) { diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork= 1CommandsLib.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNet= work1CommandsLib.c index 7e823cabd2fe..9a2b23fdc5ba 100644 --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.c +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Comman= dsLib.c @@ -8,7 +8,7 @@ #include "UefiShellNetwork1CommandsLib.h" =20 CONST CHAR16 gShellNetwork1FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellNetwork1HiiHandle =3D NULL; +EFI_HII_HANDLE gShellNetwork1HiiHandle =3D NULL; =20 /** return the file name of the help text file if not using HII. diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork= 2CommandsLib.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNet= work2CommandsLib.c index 5a7ffbfa19eb..4aab4295c1ba 100644 --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.c +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Comman= dsLib.c @@ -8,7 +8,7 @@ #include "UefiShellNetwork2CommandsLib.h" =20 CONST CHAR16 gShellNetwork2FileName[] =3D L"ShellCommands"; -EFI_HANDLE gShellNetwork2HiiHandle =3D NULL; +EFI_HII_HANDLE gShellNetwork2HiiHandle =3D NULL; =20 /** return the file name of the help text file if not using HII. --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47416): https://edk2.groups.io/g/devel/message/47416 Mute This Topic: https://groups.io/mt/34180232/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-