From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.157.1587139576044158604 for ; Fri, 17 Apr 2020 09:06:16 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: linux.intel.com, ip: 192.55.52.93, mailfrom: maciej.rabeda@linux.intel.com) IronPort-SDR: e5oL4hRVhid4YPAA4ExO9BrzSg876UWvGQCmshbOc+pX+sJ3qUsfPzDOTfv/Yk/xk+kHR4dFTp INhZwH06dVBQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 09:06:15 -0700 IronPort-SDR: V69qYVS25/dnPiqYbuOXjdQW66la3Iedd4ImV02yRQ1sQs2i5omUh8ztP0gebXLNLm6PHQMw9I WY6hxXHZyfcA== X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="299651545" Received: from mrabeda-mobl.ger.corp.intel.com (HELO [10.213.30.64]) ([10.213.30.64]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 09:06:13 -0700 Subject: Re: [edk2-devel] [PATCH] NetworkPkg/TlsAuthConfigDxe: Use HiiPopUp() instead of CreatePopUp() To: devel@edk2.groups.io, siyuan.fu@intel.com, Keysound Chang Cc: "Wu, Jiaxin" References: From: "Maciej Rabeda" Message-ID: <4c44878b-2fb2-6eb7-5f69-f4bc26bb5060@linux.intel.com> Date: Fri, 17 Apr 2020 18:06:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 8bit Content-Language: pl Hi Chang, For any and all of your future patches, "Signed-off" should contain your name + email and maintainer should be in Cc :) Reviewed-by: Maciej Rabeda Thanks, Maciej On 17-Apr-20 04:38, Siyuan, Fu wrote: > Reviewed-by: Siyuan Fu > >> -----Original Message----- >> From: Keysound Chang >> Sent: 2020Äê4ÔÂ9ÈÕ 14:57 >> To: devel@edk2.groups.io >> Cc: Keysound Chang ; Wu, Jiaxin >> ; Fu, Siyuan ; Maciej Rabeda >> >> Subject: [PATCH] NetworkPkg/TlsAuthConfigDxe: Use HiiPopUp() instead of >> CreatePopUp() >> >> From: Keysound Chang >> >> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2635 >> >> According to EDK2 Driver Writer's Guide For UEFI 2.3.1, 4.2.18 Offer >> alternatives to function keys. Configuration of drivers should be >> accomplished via HII and via OS-present interfaces. >> >> Cc: Jiaxin Wu >> Cc: Siyuan Fu >> Signed-off-by: Maciej Rabeda >> --- >> .../TlsAuthConfigDxe/TlsAuthConfigDxe.inf | 1 + >> .../TlsAuthConfigDxeStrings.uni | 2 ++ >> .../TlsAuthConfigDxe/TlsAuthConfigImpl.c | 20 +++++++++++++------ >> .../TlsAuthConfigDxe/TlsAuthConfigImpl.h | 1 + >> 4 files changed, 18 insertions(+), 6 deletions(-) >> >> diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf >> b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf >> index 3fc924a1d4..0ada835252 100644 >> --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf >> +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf >> @@ -52,6 +52,7 @@ >> [Protocols] >> >> gEfiDevicePathProtocolGuid ## PRODUCES >> >> gEfiHiiConfigAccessProtocolGuid ## PRODUCES >> >> + gEfiHiiPopupProtocolGuid ## CONSUMES >> >> >> >> [Guids] >> >> gTlsAuthConfigGuid ## PRODUCES ## GUID >> >> diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni >> b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni >> index 973b8b7716..2b4a27d24e 100644 >> --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni >> +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni >> @@ -28,6 +28,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> #string STR_TLS_AUTH_CONFIG_SAVE_AND_EXIT #language en-US >> "Commit Changes and Exit" >> >> #string STR_TLS_AUTH_CONFIG_NO_SAVE_AND_EXIT #language en-US >> "Discard Changes and Exit" >> >> >> >> +#string STR_TLS_AUTH_ENROLL_CERT_FAILURE #language en-US >> "Enroll Cert Failure!" >> >> + >> >> #string STR_CERT_TYPE_PCKS_GUID #language en-US "GUID for >> CERT" >> >> >> >> #string STR_NULL #language en-US "" >> >> diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c >> b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c >> index 2481d1098f..0ef96dfaf2 100644 >> --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c >> +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c >> @@ -1383,7 +1383,6 @@ TlsAuthConfigAccessCallback ( >> OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest >> >> ) >> >> { >> >> - EFI_INPUT_KEY Key; >> >> EFI_STATUS Status; >> >> RETURN_STATUS RStatus; >> >> TLS_AUTH_CONFIG_PRIVATE_DATA *Private; >> >> @@ -1391,6 +1390,8 @@ TlsAuthConfigAccessCallback ( >> TLS_AUTH_CONFIG_IFR_NVDATA *IfrNvData; >> >> UINT16 LabelId; >> >> EFI_DEVICE_PATH_PROTOCOL *File; >> >> + EFI_HII_POPUP_PROTOCOL *HiiPopUp; >> >> + EFI_HII_POPUP_SELECTION PopUpSelect; >> >> >> >> Status = EFI_SUCCESS; >> >> File = NULL; >> >> @@ -1402,6 +1403,11 @@ TlsAuthConfigAccessCallback ( >> Private = TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This); >> >> >> >> mTlsAuthPrivateData = Private; >> >> + Status = gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, >> &HiiPopUp); >> >> + if (EFI_ERROR (Status)) { >> >> + DEBUG ((DEBUG_ERROR, "Can't find Form PopUp protocol. Exit (%r)\n", >> Status)); >> >> + return Status; >> >> + } >> >> >> >> // >> >> // Retrieve uncommitted data from Browser >> >> @@ -1460,11 +1466,13 @@ TlsAuthConfigAccessCallback ( >> if (EFI_ERROR (Status)) { >> >> CleanFileContext (Private); >> >> >> >> - CreatePopUp ( >> >> - EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, >> >> - &Key, >> >> - L"ERROR: Enroll Cert Failure!", >> >> - NULL >> >> + HiiPopUp->CreatePopup( >> >> + HiiPopUp, >> >> + EfiHiiPopupStyleError, >> >> + EfiHiiPopupTypeOk, >> >> + Private->RegisteredHandle, >> >> + STRING_TOKEN(STR_TLS_AUTH_ENROLL_CERT_FAILURE), >> >> + &PopUpSelect >> >> ); >> >> } >> >> break; >> >> diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h >> b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h >> index e9af492893..68c16845b3 100644 >> --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h >> +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h >> @@ -14,6 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> >> >> #include >> >> #include >> >> +#include >> >> >> >> // >> >> // Libraries >> >> -- >> 2.23.0.windows.1 > > >