Reviewed-by: Eric Jin <eric....@intel.com> -----Original Message----- From: Heinrich Schuchardt <xypron.g...@gmx.de> Sent: Friday, September 20, 2019 7:07 PM To: EDK II Development <devel@edk2.groups.io> Cc: Jin, Eric <eric....@intel.com>; Supreeth Venkatesh <supreeth.venkat...@arm.com>; Stephano Cetola <stephano.cet...@linux.intel.com>; Heinrich Schuchardt <xypron.g...@gmx.de> Subject: [edk2-test] [PATCH 1/1] uefi-sct/SctPkg: use EFI_UNICODE_COLLATION_PROTOCOL2_GUID
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1802 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 <xypron.g...@gmx.de> --- 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/SctPkg/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 = { 0x56EC3091, 0x954C, 0x11D2, { 0x8E, 0x3F, EFI_GUID gEfiDeviceIoProtocolGuid = { 0xAF6AC311, 0x84C3, 0x11D2, { 0x8E, 0x3C, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileInfoGuid = { 0x09576E92, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}; EFI_GUID gEfiFileSystemInfoGuid = { 0x09576E93, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};-EFI_GUID gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }};+EFI_GUID gEfiUnicodeCollation2ProtocolGuid = {0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }}; EFI_GUID gEfiSerialIoProtocolGuid = { 0xBB25CF6F, 0xF1D4, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD }}; EFI_GUID gEfiSimpleNetworkProtocolGuid = { 0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}; EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid = { 0xE18541CD, 0xF755, 0x4F73, { 0x92, 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" }, { &gEfiFileSystemInfoGuid, L"FileSysInfo" }, - { &gEfiUnicodeCollationProtocolGuid, L"UnicodeCollation" },+ { &gEfiUnicodeCollation2ProtocolGuid, L"UnicodeCollation2" }, { &gEfiSerialIoProtocolGuid, L"serialio" }, { &gEfiSimpleNetworkProtocolGuid, L"net" }, { &gEfiNetworkInterfaceIdentifierProtocolGuid, 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 // - SctLocateHandle (ByProtocol, &gEfiUnicodeCollationProtocolGuid, NULL, &NoHandles, &Handles);+ SctLocateHandle (ByProtocol, &gEfiUnicodeCollation2ProtocolGuid, NULL, &NoHandles, &Handles); if (!LangCode || !NoHandles) { goto Done; }@@ -91,7 +91,7 @@ InitializeUnicodeSupport ( // for (Index=0; Index < NoHandles; Index++) {- Status = tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollationProtocolGuid, (VOID**)&Ui);+ Status = tBS->HandleProtocol (Handles[Index], &gEfiUnicodeCollation2ProtocolGuid, (VOID**)&Ui); if (EFI_ERROR(Status)) { continue; }@@ -180,7 +180,7 @@ SctInitializeLib ( // // LangCode = LibGetVariable (VarLanguage, &EfiGlobalVariable); // InitializeUnicodeSupport (LangCode);- InitializeUnicodeSupport ("eng");+ InitializeUnicodeSupport ("en"); if (LangCode) { SctFreePool (LangCode); }diff --git a/uefi-sct/SctPkg/Library/SctLib/SctLib.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 gEfiSimpleTextOutProtocolGuid- gEfiUnicodeCollationProtocolGuid+ gEfiUnicodeCollation2ProtocolGuid gEfiDriverBindingProtocolGuid gEfiDriverConfigurationProtocolGuid gEfiDriverDiagnosticsProtocolGuiddiff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/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/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 = gtBS->LocateProtocol (- &gEfiUnicodeCollationProtocolGuid,+ &gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID **) &Interface );@@ -3851,4 +3851,4 @@ CheckIPSecProtocols ( ); return EFI_SUCCESS;-} \ No newline at end of file +} -- 2.23.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47906): https://edk2.groups.io/g/devel/message/47906 Mute This Topic: https://groups.io/mt/34229130/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
