From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: eric.jin@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Mon, 23 Sep 2019 19:49:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 19:49:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,542,1559545200"; d="scan'208";a="189232782" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga007.fm.intel.com with ESMTP; 23 Sep 2019 19:49:53 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 23 Sep 2019 19:49:53 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 23 Sep 2019 19:49:52 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.140]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.89]) with mapi id 14.03.0439.000; Tue, 24 Sep 2019 10:49:51 +0800 From: "Eric Jin" To: Heinrich Schuchardt , EDK II Development CC: Supreeth Venkatesh , Stephano Cetola Subject: Re: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Thread-Topic: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Thread-Index: AQHVb6OI3U3gRkdLcUq9AYCuRnm3zqc6JhjQ Date: Tue, 24 Sep 2019 02:49:50 +0000 Message-ID: References: <20190920110646.15282-1-xypron.glpk@gmx.de> In-Reply-To: <20190920110646.15282-1-xypron.glpk@gmx.de> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.jin@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Jin -----Original Message----- From: Heinrich Schuchardt =20 Sent: Friday, September 20, 2019 7:07 PM To: EDK II Development Cc: Jin, Eric ; Supreeth Venkatesh ; Stephano Cetola ; Heinrich Schuc= hardt Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION= _PROTOCOL2_GUID REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1802 The protocol identified by EFI_UNICODE_COLLATION_PROTOCOL_GUID is deprecate= d. Use the protocol identified by EFI_UNICODE_COLLATION_PROTOCOL2_GUID inst= ead. Both protocols only differ in the values for the SupportedLanguages fi= eld. Signed-off-by: Heinrich Schuchardt --- uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c | 2 +- uefi-sct/SctPkg/Library/SctLib/Guid.c | 2 +- uefi-sct/SctPkg/Library/SctLib/Init.c | 6 +++--- uefi-sct/SctPkg/Library/SctLib/SctLib.inf | 2 +- .../BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c b/uefi-sct/Sct= Pkg/Library/SctGuidLib/SctGuidLib.c index cb5a7c97..3265ac82 100644 --- a/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c +++ b/uefi-sct/SctPkg/Library/SctGuidLib/SctGuidLib.c @@ -38,7 +38,7 @@ EFI_GUID gEfiLoadFileProtocolGuid =3D { 0x56EC3091, 0x954= C, 0x11D2, { 0x8E, 0x3F, EFI_GUID gEfiDeviceIoProtocolGuid =3D { 0xAF6AC31= 1, 0x84C3, 0x11D2, { 0x8E, 0x3C, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI= _GUID gEfiFileInfoGuid =3D { 0x09576E92, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00= , 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileSystemInfoGuid =3D { 0x= 09576E93, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B = }};-EFI_GUID gEfiUnicodeCollationProtocolGuid =3D { 0x1D85CD7F, 0xF43D, 0x1= 1D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};+EFI_GUID gEfiUnic= odeCollation2ProtocolGuid =3D {0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9, 0x= 49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}; EFI_GUID gEfiSerialIoProtocolGuid =3D = { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0= xFD }}; EFI_GUID gEfiSimpleNetworkProtocolGuid =3D { 0xA19832B9, 0xAC25, 0x= 11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}; EFI_GUID gEfiNet= workInterfaceIdentifierProtocolGuid =3D { 0xE18541CD, 0xF755, 0x4F73, { 0x9= 2, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 }};diff --git a/uefi-sct/SctPkg= /Library/SctLib/Guid.c b/uefi-sct/SctPkg/Library/SctLib/Guid.c index d0391060..f318725b 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Guid.c +++ b/uefi-sct/SctPkg/Library/SctLib/Guid.c @@ -117,7 +117,7 @@ struct { { &gEfiFileInfoGuid, L"GenFileInfo" }, { &gEfiFileSy= stemInfoGuid, L"FileSysInfo" }, - { &gEfiUnicodeCollationProtoc= olGuid, L"UnicodeCollation" },+ { &gEfiUnicodeCollation2ProtocolGuid, L"U= nicodeCollation2" }, { &gEfiSerialIoProtocolGuid, L"serialio" },= { &gEfiSimpleNetworkProtocolGuid, L"net" }, { &gEfiNetworkInterfac= eIdentifierProtocolGuid, L"nii" },diff --git a/uefi-sct/SctPkg/Library/S= ctLib/Init.c b/uefi-sct/SctPkg/Library/SctLib/Init.c index 7e7618eb..704636e3 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Init.c +++ b/uefi-sct/SctPkg/Library/SctLib/Init.c @@ -81,7 +81,7 @@ InitializeUnicodeSupport ( // If we don't know it, lookup the current language code // - SctLoca= teHandle (ByProtocol, &gEfiUnicodeCollationProtocolGuid, NULL, &NoHandles, = &Handles);+ SctLocateHandle (ByProtocol, &gEfiUnicodeCollation2ProtocolGui= d, NULL, &NoHandles, &Handles); if (!LangCode || !NoHandles) { goto D= one; }@@ -91,7 +91,7 @@ InitializeUnicodeSupport ( // for (Index=3D0; Index < NoHandles; Index++) {- Status =3D tBS->= HandleProtocol (Handles[Index], &gEfiUnicodeCollationProtocolGuid, (VOID**)= &Ui);+ Status =3D tBS->HandleProtocol (Handles[Index], &gEfiUnicodeColla= tion2ProtocolGuid, (VOID**)&Ui); if (EFI_ERROR(Status)) { continu= e; }@@ -180,7 +180,7 @@ SctInitializeLib ( // // LangCode =3D LibGetVariable (VarLanguage, &EfiGlobalVariable= ); // InitializeUnicodeSupport (LangCode);- InitializeUnicodeSupport= ("eng");+ InitializeUnicodeSupport ("en"); if (LangCode) { Sc= tFreePool (LangCode); }diff --git a/uefi-sct/SctPkg/Library/SctLib/SctL= ib.inf b/uefi-sct/SctPkg/Library/SctLib/SctLib.inf index ff6ce579..cd354ffe 100644 --- a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf +++ b/uefi-sct/SctPkg/Library/SctLib/SctLib.inf @@ -108,7 +108,7 @@ gEfiSimpleNetworkProtocolGuid gEfiSimpleTextInProtocolGuid gEfiSimpl= eTextOutProtocolGuid- gEfiUnicodeCollationProtocolGuid+ gEfiUnicodeCollat= ion2ProtocolGuid gEfiDriverBindingProtocolGuid gEfiDriverConfigurationP= rotocolGuid gEfiDriverDiagnosticsProtocolGuiddiff --git a/uefi-sct/SctPkg= /TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlat= form_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackB= oxTest/EfiCompliantBBTestPlatform_uefi.c index b3f1b8c5..09d89772 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTes +++ t/EfiCompliantBBTestPlatform_uefi.c @@ -1180,7 +1180,7 @@ CheckBootFromDiskProtocols ( // Check the UNICODE_COLLATION protocol // Status =3D gtBS->LocatePr= otocol (- &gEfiUnicodeCollationProtocolGuid,+ = &gEfiUnicodeCollation2ProtocolGuid, NULL, = (VOID **) &Interface );@@ -3851,4 +3851,4 @@= CheckIPSecProtocols ( ); return EFI_SUCCESS;-} \ No newline at end of file +} -- 2.23.0