From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=DFty4XWc; spf=pass (domain: gmx.de, ip: 212.227.15.15, mailfrom: xypron.glpk@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by groups.io with SMTP; Fri, 20 Sep 2019 04:07:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1568977611; bh=+dtrS5wjZ5LBBmp9oeibiP6Bnvo/riOAKcfazadbaGg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=DFty4XWcb4UwDMxRfanGnAvhtQTyxPmScI5UyYJl4S3Pb9M6AC4IjE4eJD0VGHi7V be9jUmFxlHgLRvrXaOvWIGNj2Jcm0svnc5MQMXNXXvIg88mN8qkBdAWqeSIiTP5+gz agikdCEgotp7WAmQ84Ja6rNxL7UYXkaSMqnNUAGk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.145.122]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MmlT2-1hk9PR2LME-00jmn8; Fri, 20 Sep 2019 13:06:51 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , Supreeth Venkatesh , Stephano Cetola , Heinrich Schuchardt Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID Date: Fri, 20 Sep 2019 13:06:46 +0200 Message-Id: <20190920110646.15282-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:d8fPHsaXjh7/DuDhG13hjZ8AxglIMcfhhE6Pk7tHRqUPZtxsX8i q8eTIQ00G0xl5N4BcWoLLUjv9Ywoy2YxsGW3NvLBbC+TX4ZvkS10VlsHMcwxbiIJ0TfMa8C M5PCyY5Yv4pS/+hy+QfnHyQFDWbGf2weSxr8vKUCscDk6FWQazmIXIGb4XaWHQsHkA9MD7r 8vdTTEFKfHpYVQdx9hIqw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:xxfZv5tTXHw=:/rn7GkuTyEagjRWd3XqkkJ Zw+FneipTQlquhmkqmBk8juBMGN5HZeyVUXxkxnj2ldj8id0QQwX28gkscdem9APcBHKPmM1v YYAzQlmOIeUVxb9v6Zjq9J5Qj8GTojCc2pWh8i1X8wTFV/UyUeDEJoQQx+MUYzNx2JGhpTEqI UIAFxUihd2JUsAD7HrL9RmJlfsNbl6WyNLBfQeZhj7mWtTZ6fFqPjuCw+J728Qu8CvI5IVQ/y t3M9VXK3zJO62KNcI5ibQ+2+beUPjZOip/x8BnyjvKQnsXdkIOCIW1SNnSMVXAfscZ09vR0tU 7LzJU46JnQgmS9iz6dSwEoYtkzeRLlcJCi+8NjV9tmU15b2OAkvuyz5ECSAn3sTYZ3+oc7HgZ ATf4RJU6myrCPihKy7J6aXm0jBj9K6gLGozx0O3jnIr6jmj+pUZZjk0VvYx+2rc1OcwraDAOr 7bKGXLNGVJBPyQpixMbQrX03+WfTUXU+ew+IQQ52HZPK2538v5epTBiSDuH3U97J1BfB0kAQf amgAzYubyxs+imT4pNGNh3SZDtbz3sfAPNNaLWiUhDBZx2bPCfvRigza5zHLgTWw7zRQH1JYn cIGuqrzlRkV8hkPaWUlJAgfqf5i0eQzNeUz/N0/yumUDaWuwZj0e2HHVtZ9HTbN951Yk7J7RQ fnCpUpkRKcgNdasjhKzJnJXtq4sinRozi1mT8CjAhPzmqlit4z0eA9xvYlXVQSI0miZJgq2ya mMFt21acxuheDRbP1hnNwMzrExkkkXBxW1bT0HfZ1WJNILEMxTtuftrY29Mnod8RSlLtkQpmw tLXgIqq5Y1AoeQmP5wwFWxsu0F7eH2hFThDwF6WbYFYcdJiCUYZXX+PZiQFFuEGo1G2x6GI12 V0pw9bDtLLoVPgPMobEEvG5DrQMN+bX1zYurhM6zUYRYwU+85SUoKW96YS654sKdAbrKJ2jyK VI2BXUP+pxBaoif8/+c2a6qLYbqNDNp8lFbSjnjCoaJvXeUlIRePy71aOBla7onYRzI1SB/Rz DMpW3Gs1UGu5ZCaGBFRrru5ldUDTBqZsLyaVKu/m9Ws2P8+tDZnNMTCaNOBxQ60oMKK8lnvkR yQrJ4XU9dzZ9wkc6mGGVPMUXrV1mBuGssJZoUps+rMBd71/zhCOrRqTl19VkZCTCJPR5aTMou Q5sAScdxBLkx++GOqL0OpmhTHF6Ac1kOetd3E1QF+hYH+wDArPEZ9YUx71HzUgDw270FUOkFe rrSpXT7sPR5Ft2bBA1sjK/5g1F1gTgT7bcQ0fVDZjUOdOH+hVONp2fN2rtic= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1802 The protocol identified by EFI_UNICODE_COLLATION_PROTOCOL_GUID is deprecated. Use the protocol identified by EFI_UNICODE_COLLATION_PROTOCOL2_GUID instead. Both protocols only differ in the values for the SupportedLanguages field. 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 { 0xAF6AC311, 0x84C3, 0x11D2, { 0x8E= , 0x3C, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};=0D EFI_GUID gEfiFileInfoGuid =3D { 0x09576E92, 0x6D3F, 0x11D2, { 0x8E, 0x39, = 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};=0D EFI_GUID gEfiFileSystemInfoGuid =3D { 0x09576E93, 0x6D3F, 0x11D2, { 0x8E, = 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};=0D -EFI_GUID gEfiUnicodeCollationProtocolGuid =3D { 0x1D85CD7F, 0xF43D, 0x11D2= , { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};=0D +EFI_GUID gEfiUnicodeCollation2ProtocolGuid =3D {0xa4c751fc, 0x23ae, 0x4c3e= , { 0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }};=0D EFI_GUID gEfiSerialIoProtocolGuid =3D { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A= , 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }};=0D EFI_GUID gEfiSimpleNetworkProtocolGuid =3D { 0xA19832B9, 0xAC25, 0x11D3, {= 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};=0D EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid =3D { 0xE18541CD, 0xF7= 55, 0x4F73, { 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 }};=0D diff --git a/uefi-sct/SctPkg/Library/SctLib/Guid.c b/uefi-sct/SctPkg/Librar= y/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" },=0D { &gEfiFileSystemInfoGuid, L"FileSysInfo" },=0D =0D - { &gEfiUnicodeCollationProtocolGuid, L"UnicodeCollation" },=0D + { &gEfiUnicodeCollation2ProtocolGuid, L"UnicodeCollation2" },=0D { &gEfiSerialIoProtocolGuid, L"serialio" },=0D { &gEfiSimpleNetworkProtocolGuid, L"net" },=0D { &gEfiNetworkInterfaceIdentifierProtocolGuid, L"nii" },=0D diff --git a/uefi-sct/SctPkg/Library/SctLib/Init.c b/uefi-sct/SctPkg/Librar= y/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=0D //=0D =0D - SctLocateHandle (ByProtocol, &gEfiUnicodeCollationProtocolGuid, NULL, &N= oHandles, &Handles);=0D + SctLocateHandle (ByProtocol, &gEfiUnicodeCollation2ProtocolGuid, NULL, &= NoHandles, &Handles);=0D if (!LangCode || !NoHandles) {=0D goto Done;=0D }=0D @@ -91,7 +91,7 @@ InitializeUnicodeSupport ( //=0D =0D for (Index=3D0; Index < NoHandles; Index++) {=0D - Status =3D tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollationP= rotocolGuid, (VOID**)&Ui);=0D + Status =3D tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollation2= ProtocolGuid, (VOID**)&Ui);=0D if (EFI_ERROR(Status)) {=0D continue;=0D }=0D @@ -180,7 +180,7 @@ SctInitializeLib ( //=0D // LangCode =3D LibGetVariable (VarLanguage, &EfiGlobalVariable);=0D // InitializeUnicodeSupport (LangCode);=0D - InitializeUnicodeSupport ("eng");=0D + InitializeUnicodeSupport ("en");=0D if (LangCode) {=0D SctFreePool (LangCode);=0D }=0D diff --git a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf b/uefi-sct/SctPkg/Li= brary/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=0D gEfiSimpleTextInProtocolGuid=0D gEfiSimpleTextOutProtocolGuid=0D - gEfiUnicodeCollationProtocolGuid=0D + gEfiUnicodeCollation2ProtocolGuid=0D gEfiDriverBindingProtocolGuid=0D gEfiDriverConfigurationProtocolGuid=0D gEfiDriverDiagnosticsProtocolGuid=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBo= xTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI= /Generic/EfiCompliant/BlackBoxTest/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/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c @@ -1180,7 +1180,7 @@ CheckBootFromDiskProtocols ( // Check the UNICODE_COLLATION protocol=0D //=0D Status =3D gtBS->LocateProtocol (=0D - &gEfiUnicodeCollationProtocolGuid,=0D + &gEfiUnicodeCollation2ProtocolGuid,=0D NULL,=0D (VOID **) &Interface=0D );=0D @@ -3851,4 +3851,4 @@ CheckIPSecProtocols ( );=0D =0D return EFI_SUCCESS;=0D -} \ No newline at end of file +} --=20 2.23.0