From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: eric.jin@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Tue, 24 Sep 2019 18:45:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Sep 2019 18:45:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,546,1559545200"; d="scan'208";a="340260034" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga004.jf.intel.com with ESMTP; 24 Sep 2019 18:45:09 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 24 Sep 2019 18:45:09 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 24 Sep 2019 18:45:09 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.140]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.23]) with mapi id 14.03.0439.000; Wed, 25 Sep 2019 09:45:07 +0800 From: "Eric Jin" To: "devel@edk2.groups.io" , "Jin, Eric" , Heinrich Schuchardt CC: Supreeth Venkatesh , Stephano Cetola Subject: Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Thread-Topic: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Thread-Index: AQHVb6OI3U3gRkdLcUq9AYCuRnm3zqc6JhjQgAGAR6A= Date: Wed, 25 Sep 2019 01:45:06 +0000 Message-ID: References: <20190920110646.15282-1-xypron.glpk@gmx.de> <15C740071DBF5F91.14164@groups.io> In-Reply-To: <15C740071DBF5F91.14164@groups.io> 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 Pushed at 992d2b554142f9aa1f63fca6b2c4408049011534 -----Original Message----- From: devel@edk2.groups.io On Behalf Of Eric Jin Sent: Tuesday, September 24, 2019 10:50 AM To: Heinrich Schuchardt ; EDK II Development Cc: Supreeth Venkatesh ; Stephano Cetola Subject: Re: [edk2-devel] [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI= _UNICODE_COLLATION_PROTOCOL2_GUID 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 Schu= chardt Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATIO= N_PROTOCOL2_GUID REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1802 The protocol identified by EFI_UNICODE_COLLATION_PROTOCOL_GUID is deprecat= ed. Use the protocol identified by EFI_UNICODE_COLLATION_PROTOCOL2_GUID ins= tead. Both protocols only differ in the values for the SupportedLanguages f= ield. 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/Sc= tPkg/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, 0x95= 4C, 0x11D2, { 0x8E, 0x3F, EFI_GUID gEfiDeviceIoProtocolGuid =3D { 0xAF6AC3= 11, 0x84C3, 0x11D2, { 0x8E, 0x3C, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EF= I_GUID gEfiFileInfoGuid =3D { 0x09576E92, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x0= 0, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileSystemInfoGuid =3D { 0= x09576E93, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B= }};-EFI_GUID gEfiUnicodeCollationProtocolGuid =3D { 0x1D85CD7F, 0xF43D, 0x= 11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};+EFI_GUID gEfiUni= codeCollation2ProtocolGuid =3D {0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9, 0= x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}; EFI_GUID gEfiSerialIoProtocolGuid =3D= { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, = 0xFD }}; EFI_GUID gEfiSimpleNetworkProtocolGuid =3D { 0xA19832B9, 0xAC25, 0= x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}; EFI_GUID gEfiNe= tworkInterfaceIdentifierProtocolGuid =3D { 0xE18541CD, 0xF755, 0x4F73, { 0x= 92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 }};diff --git a/uefi-sct/SctPk= g/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" }, { &gEfiFileS= ystemInfoGuid, L"FileSysInfo" }, - { &gEfiUnicodeCollationProto= colGuid, L"UnicodeCollation" },+ { &gEfiUnicodeCollation2ProtocolGuid, L"= UnicodeCollation2" }, { &gEfiSerialIoProtocolGuid, L"serialio" }= , { &gEfiSimpleNetworkProtocolGuid, L"net" }, { &gEfiNetworkInterfa= ceIdentifierProtocolGuid, L"nii" },diff --git a/uefi-sct/SctPkg/Library/= SctLib/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 // - SctLoc= ateHandle (ByProtocol, &gEfiUnicodeCollationProtocolGuid, NULL, &NoHandles,= &Handles);+ SctLocateHandle (ByProtocol, &gEfiUnicodeCollation2ProtocolGu= id, NULL, &NoHandles, &Handles); if (!LangCode || !NoHandles) { goto = Done; }@@ -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], &gEfiUnicodeColl= ation2ProtocolGuid, (VOID**)&Ui); if (EFI_ERROR(Status)) { contin= ue; }@@ -180,7 +180,7 @@ SctInitializeLib ( // // LangCode =3D LibGetVariable (VarLanguage, &EfiGlobalVariabl= e); // InitializeUnicodeSupport (LangCode);- InitializeUnicodeSuppor= t ("eng");+ InitializeUnicodeSupport ("en"); if (LangCode) { S= ctFreePool (LangCode); }diff --git a/uefi-sct/SctPkg/Library/SctLib/Sct= Lib.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 gEfiSimp= leTextOutProtocolGuid- gEfiUnicodeCollationProtocolGuid+ gEfiUnicodeColla= tion2ProtocolGuid gEfiDriverBindingProtocolGuid gEfiDriverConfiguration= ProtocolGuid gEfiDriverDiagnosticsProtocolGuiddiff --git a/uefi-sct/SctPk= g/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPla= tform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/Black= BoxTest/EfiCompliantBBTestPlatform_uefi.c index b3f1b8c5..09d89772 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/= EfiCompliantBBTestPlatform_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->LocateP= rotocol (- &gEfiUnicodeCollationProtocolGuid,+ = &gEfiUnicodeCollation2ProtocolGuid, NULL, = (VOID **) &Interface );@@ -3851,4 +3851,4 @= @ CheckIPSecProtocols ( ); return EFI_SUCCESS;-} \ No newline at end of file +} -- 2.23.0