From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676957803416.99290052495303; Tue, 21 Feb 2017 03:35:57 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9168082201; Tue, 21 Feb 2017 03:35:55 -0800 (PST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A0EDE821AC for ; Tue, 21 Feb 2017 03:35:54 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:35:54 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:35:53 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323535" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:28 +0800 Message-Id: <1487676934-12984-2-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 1/7] IntelFrameworkModulePkg: Replace [Ascii|Unicode]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Jiewen Yao , Jeff Fan MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is the follow up of commits 51f0ceb..9e32e97 to replace AsciiValueToString/UnicodeValueToString with AsciiValueToStringS/UnicodeValueToStringS. Cc: Jiewen Yao Cc: Jeff Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Jeff Fan Reviewed-by: Liming Gao --- IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c | 12 += ++++++++--- IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c | 20 += ++++++++++++++++--- IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c | 15 += ++++++++++---- IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c | 6 += ++--- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.= c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c index a2e38d2..bdf2614 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c @@ -1,7 +1,7 @@ /** @file Dynamically update the pages. =20 -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -844,11 +844,17 @@ UpdateConModePage ( // // Build mode string Column x Row // - UnicodeValueToString (ModeString, 0, Col, 0); + UnicodeValueToStringS (ModeString, sizeof (ModeString), 0, Col, 0); PStr =3D &ModeString[0]; StrCatS (PStr, ARRAY_SIZE (ModeString), L" x "); PStr =3D PStr + StrLen (PStr); - UnicodeValueToString (PStr , 0, Row, 0); + UnicodeValueToStringS ( + PStr, + sizeof (ModeString) - ((UINTN)PStr - (UINTN)&ModeString[0]), + 0, + Row, + 0 + ); =20 ModeToken[Index] =3D HiiSetString (CallbackData->BmmHiiHandle, 0, Mode= String, NULL); =20 diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceMana= ger.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index af2b18a..125c49d 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -1,7 +1,7 @@ /** @file The platform device manager reference implementation =20 -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -388,7 +388,14 @@ GetMacAddressString( // HwAddress =3D &MacAddressNode->MacAddress.Addr[0]; for (Index =3D 0; Index < HwAddressSize; Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(H= wAddress++), 2); + UnicodeValueToStringS ( + String, + BufferLen - ((UINTN)String - (UINTN)*PBuffer), + PREFIX_ZERO | RADIX_HEX, + *(HwAddress++), + 2 + ); + String +=3D StrnLenS (String, (BufferLen - ((UINTN)String - (UINTN)*PB= uffer)) / sizeof (CHAR16)); if (Index < HwAddressSize - 1) { *String++ =3D L':'; } @@ -408,7 +415,14 @@ GetMacAddressString( =20 if (VlanId !=3D 0) { *String++ =3D L'\\'; - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, Vla= nId, 4); + UnicodeValueToStringS ( + String, + BufferLen - ((UINTN)String - (UINTN)*PBuffer), + PREFIX_ZERO | RADIX_HEX, + VlanId, + 4 + ); + String +=3D StrnLenS (String, (BufferLen - ((UINTN)String - (UINTN)*PB= uffer)) / sizeof (CHAR16)); } =20 // diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFr= ameworkModulePkg/Universal/BdsDxe/FrontPage.c index c771974..ec91422 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c @@ -1,7 +1,7 @@ /** @file FrontPage routines to handle the callbacks and browser calls =20 -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -629,9 +629,16 @@ ConvertProcessorToString ( =20 StringBuffer =3D AllocateZeroPool (0x20); ASSERT (StringBuffer !=3D NULL); - Index =3D UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, FreqMhz / 10= 00, 3); + UnicodeValueToStringS (StringBuffer, 0x20, LEFT_JUSTIFY, FreqMhz / 1000,= 3); + Index =3D StrnLenS (StringBuffer, 0x20 / sizeof (CHAR16)); StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L"."); - UnicodeValueToString (StringBuffer + Index + 1, PREFIX_ZERO, (FreqMhz % = 1000) / 10, 2); + UnicodeValueToStringS ( + StringBuffer + Index + 1, + 0x20 - sizeof (CHAR16) * (Index + 1), + PREFIX_ZERO, + (FreqMhz % 1000) / 10, + 2 + ); StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L" GHz"); *String =3D (CHAR16 *) StringBuffer; return ; @@ -655,7 +662,7 @@ ConvertMemorySizeToString ( =20 StringBuffer =3D AllocateZeroPool (0x20); ASSERT (StringBuffer !=3D NULL); - UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, MemorySize, 6); + UnicodeValueToStringS (StringBuffer, 0x20, LEFT_JUSTIFY, MemorySize, 6); StrCatS (StringBuffer, 0x20 / sizeof (CHAR16), L" MB RAM"); =20 *String =3D (CHAR16 *) StringBuffer; diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelF= rameworkModulePkg/Universal/BdsDxe/MemoryTest.c index 700e3e6..1188082 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c @@ -1,7 +1,7 @@ /** @file Perform the platform memory test =20 -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -318,7 +318,7 @@ BdsMemoryTest ( TempData ); if (TestPercent !=3D PreviousValue) { - UnicodeValueToString (StrPercent, 0, TestPercent, 0); + UnicodeValueToStringS (StrPercent, sizeof (StrPercent), 0, TestPer= cent, 0); TmpStr =3D GetStringById (STRING_TOKEN (STR_MEMORY_TEST_PERCENT)); if (TmpStr !=3D NULL) { // @@ -386,7 +386,7 @@ BdsMemoryTest ( =20 Done: if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { - UnicodeValueToString (StrTotalMemory, COMMA_TYPE, TotalMemorySize, 0); + UnicodeValueToStringS (StrTotalMemory, StrTotalMemorySize, COMMA_TYPE,= TotalMemorySize, 0); if (StrTotalMemory[0] =3D=3D L',') { StrTotalMemory++; StrTotalMemorySize -=3D sizeof (CHAR16); --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676966009546.9877895755259; Tue, 21 Feb 2017 03:36:06 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CEF9A8221A; Tue, 21 Feb 2017 03:36:03 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0AB72821AC for ; Tue, 21 Feb 2017 03:36:03 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:02 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:01 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323570" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:29 +0800 Message-Id: <1487676934-12984-3-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 2/7] MdeModulePkg: Replace [Ascii|Unicode]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Feng Tian , Jiewen Yao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is the follow up of commits 51f0ceb..9e32e97 to replace AsciiValueToString/UnicodeValueToString with AsciiValueToStringS/UnicodeValueToStringS. Cc: Jiewen Yao Cc: Feng Tian Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao Reviewed-by: Star Zeng --- MdeModulePkg/Application/UiApp/FrontPage.c | 15 +++++-- MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c | 12 +++-- MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 20 +++++++= -- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c | 10 ++++- MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 24 +++++++= +-- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 29 +++++++= +++-- MdeModulePkg/Universal/CapsulePei/UefiCapsule.c | 18 ++++++-- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 10 ++++- MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | 37 +++++++= ++------ MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 29 +++++++= +++-- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 47 +++++++= ++++++++++--- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c | 14 ++++-- MdeModulePkg/Universal/SetupBrowserDxe/Expression.c | 11 ++++- MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c | 4 +- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 38 +++++++= ++++++--- 15 files changed, 258 insertions(+), 60 deletions(-) diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Appl= ication/UiApp/FrontPage.c index bda5ff9..ad5af2c 100644 --- a/MdeModulePkg/Application/UiApp/FrontPage.c +++ b/MdeModulePkg/Application/UiApp/FrontPage.c @@ -1,7 +1,7 @@ /** @file FrontPage routines to handle the callbacks and browser calls =20 -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -408,9 +408,16 @@ ConvertProcessorToString ( DestMax =3D 0x20 / sizeof (CHAR16); StringBuffer =3D AllocateZeroPool (0x20); ASSERT (StringBuffer !=3D NULL); - Index =3D UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, FreqMhz / 10= 00, 3); + UnicodeValueToStringS (StringBuffer, sizeof (CHAR16) * DestMax, LEFT_JUS= TIFY, FreqMhz / 1000, 3); + Index =3D StrnLenS (StringBuffer, DestMax); StrCatS (StringBuffer, DestMax, L"."); - UnicodeValueToString (StringBuffer + Index + 1, PREFIX_ZERO, (FreqMhz % = 1000) / 10, 2); + UnicodeValueToStringS ( + StringBuffer + Index + 1, + sizeof (CHAR16) * (DestMax - (Index + 1)), + PREFIX_ZERO, + (FreqMhz % 1000) / 10, + 2 + ); StrCatS (StringBuffer, DestMax, L" GHz"); *String =3D (CHAR16 *) StringBuffer; return ; @@ -434,7 +441,7 @@ ConvertMemorySizeToString ( =20 StringBuffer =3D AllocateZeroPool (0x24); ASSERT (StringBuffer !=3D NULL); - UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, MemorySize, 10); + UnicodeValueToStringS (StringBuffer, 0x24, LEFT_JUSTIFY, MemorySize, 10); StrCatS (StringBuffer, 0x24 / sizeof (CHAR16), L" MB RAM"); =20 *String =3D (CHAR16 *) StringBuffer; diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c = b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c index dede4b3..b3cc3c8 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c @@ -1,7 +1,7 @@ /** @file Dynamically update the pages. =20 -Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -734,11 +734,17 @@ UpdateConModePage ( // // Build mode string Column x Row // - UnicodeValueToString (ModeString, 0, Col, 0); + UnicodeValueToStringS (ModeString, sizeof (ModeString), 0, Col, 0); PStr =3D &ModeString[0]; StrnCatS (PStr, ARRAY_SIZE (ModeString), L" x ", StrLen(L" x ") + 1); PStr =3D PStr + StrLen (PStr); - UnicodeValueToString (PStr , 0, Row, 0); + UnicodeValueToStringS ( + PStr, + sizeof (ModeString) - ((UINTN)PStr - (UINTN)&ModeString[0]), + 0, + Row, + 0 + ); =20 ModeToken[Index] =3D HiiSetString (CallbackData->BmmHiiHandle, 0, Mode= String, NULL); =20 diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeM= odulePkg/Library/DeviceManagerUiLib/DeviceManager.c index 0de4e3c..5098b70 100644 --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c @@ -1,7 +1,7 @@ /** @file The device manager reference implementation =20 -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -148,7 +148,14 @@ GetMacAddressString( // HwAddress =3D &MacAddressNode->MacAddress.Addr[0]; for (Index =3D 0; Index < HwAddressSize; Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(H= wAddress++), 2); + UnicodeValueToStringS ( + String, + BufferLen - ((UINTN)String - (UINTN)*PBuffer), + PREFIX_ZERO | RADIX_HEX, + *(HwAddress++), + 2 + ); + String +=3D StrnLenS (String, (BufferLen - ((UINTN)String - (UINTN)*PB= uffer)) / sizeof (CHAR16)); if (Index < HwAddressSize - 1) { *String++ =3D L':'; } @@ -168,7 +175,14 @@ GetMacAddressString( =20 if (VlanId !=3D 0) { *String++ =3D L'\\'; - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, Vla= nId, 4); + UnicodeValueToStringS ( + String, + BufferLen - ((UINTN)String - (UINTN)*PBuffer), + PREFIX_ZERO | RADIX_HEX, + VlanId, + 4 + ); + String +=3D StrnLenS (String, (BufferLen - ((UINTN)String - (UINTN)*PB= uffer)) / sizeof (CHAR16)); } =20 // diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c b/= MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c index 3a9bb6e..fc0f869 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c @@ -1,7 +1,7 @@ /** @file DXE capsule report related function. =20 - Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -377,7 +377,13 @@ InitCapsuleUpdateVariable ( Index =3D 0; while (TRUE) { if (Index > 0) { - UnicodeValueToString (TempVarName, 0, Index, 0); + UnicodeValueToStringS ( + TempVarName, + sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVarN= ame), + 0, + Index, + 0 + ); } Status =3D gRT->SetVariable ( CapsuleVarName, diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Libr= ary/DxeNetLib/DxeNetLib.c index 0a7117c..84e113d 100644 --- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c +++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c @@ -1,7 +1,7 @@ /** @file Network library. =20 -Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License @@ -2225,6 +2225,7 @@ NetLibGetMacString ( UINT16 VlanId; CHAR16 *String; UINTN Index; + UINTN BufferSize; =20 ASSERT (MacString !=3D NULL); =20 @@ -2241,7 +2242,8 @@ NetLibGetMacString ( // If VLAN is configured, it will need extra 5 characters like "\0005". // Plus one unicode character for the null-terminator. // - String =3D AllocateZeroPool ((2 * HwAddressSize + 5 + 1) * sizeof (CHAR1= 6)); + BufferSize =3D (2 * HwAddressSize + 5 + 1) * sizeof (CHAR16); + String =3D AllocateZeroPool (BufferSize); if (String =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; } @@ -2252,7 +2254,14 @@ NetLibGetMacString ( // HwAddress =3D &MacAddress.Addr[0]; for (Index =3D 0; Index < HwAddressSize; Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(H= wAddress++), 2); + UnicodeValueToStringS ( + String, + BufferSize - ((UINTN)String - (UINTN)*MacString), + PREFIX_ZERO | RADIX_HEX, + *(HwAddress++), + 2 + ); + String +=3D StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*M= acString)) / sizeof (CHAR16)); } =20 // @@ -2261,7 +2270,14 @@ NetLibGetMacString ( VlanId =3D NetLibGetVlanId (ServiceHandle); if (VlanId !=3D 0) { *String++ =3D L'\\'; - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, Vla= nId, 4); + UnicodeValueToStringS ( + String, + BufferSize - ((UINTN)String - (UINTN)*MacString), + PREFIX_ZERO | RADIX_HEX, + VlanId, + 4 + ); + String +=3D StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*M= acString)) / sizeof (CHAR16)); } =20 // diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Librar= y/UefiHiiLib/HiiLib.c index 8579501..b740d43 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -1,7 +1,7 @@ /** @file HII Library implementation that uses DXE protocols and services. =20 - Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -776,7 +776,14 @@ HiiConstructConfigHdr ( // Append Guid converted to 32 // for (Index =3D 0, Buffer =3D (UINT8 *)Guid; Index < sizeof (EFI_GUID);= Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *= (Buffer++), 2); + UnicodeValueToStringS ( + String, + MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *(Buffer++), + 2 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)Retur= nString) / sizeof (CHAR16)); } } =20 @@ -791,7 +798,14 @@ HiiConstructConfigHdr ( // Append Name converted to NameLength // for (; *Name !=3D L'\0'; Name++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *= Name, 4); + UnicodeValueToStringS ( + String, + sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *Name, + 4 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)Retur= nString) / sizeof (CHAR16)); } } =20 @@ -805,7 +819,14 @@ HiiConstructConfigHdr ( // Append the device path associated with DriverHandle converted to DevicePathSize // for (Index =3D 0, Buffer =3D (UINT8 *)DevicePath; Index < DevicePathSize= ; Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(B= uffer++), 2); + UnicodeValueToStringS ( + String, + sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *(Buffer++), + 2 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnS= tring) / sizeof (CHAR16)); } =20 // diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg= /Universal/CapsulePei/UefiCapsule.c index 9ac9d22..53fe13f 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -1,7 +1,7 @@ /** @file Capsule update PEIM for UEFI2.0 =20 -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions @@ -768,7 +768,13 @@ GetCapsuleDescriptors ( return EFI_SUCCESS; } } else { - UnicodeValueToString (TempVarName, 0, Index, 0); + UnicodeValueToStringS ( + TempVarName, + sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVa= rName), + 0, + Index, + 0 + ); Status =3D PPIVariableServices->GetVariable ( PPIVariableServices, CapsuleVarName, @@ -891,7 +897,13 @@ CapsuleCoalesce ( TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); while (TRUE) { if (Index > 0) { - UnicodeValueToString (TempVarName, 0, Index, 0); + UnicodeValueToStringS ( + TempVarName, + sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVarN= ame), + 0, + Index, + 0 + ); } Status =3D PPIVariableServices->GetVariable ( PPIVariableServices, diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/Md= eModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c index ed8820a..216798d 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -4,7 +4,7 @@ It installs the Capsule Architectural Protocol defined in PI1.0a to sign= ify=20 the capsule runtime services are ready. =20 -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -205,7 +205,13 @@ UpdateCapsule ( StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CHAR16), EFI_CAPS= ULE_VARIABLE_NAME); TempVarName =3D CapsuleVarName + StrLen (CapsuleVarName); if (mTimes > 0) { - UnicodeValueToString (TempVarName, 0, mTimes, 0); + UnicodeValueToStringS ( + TempVarName, + sizeof (CapsuleVarName) - ((UINTN)TempVarName - (UINTN)CapsuleVarNam= e), + 0, + mTimes, + 0 + ); } =20 // diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeMod= ulePkg/Universal/DriverSampleDxe/DriverSample.c index 67a40b7..f103b9c 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c @@ -725,12 +725,14 @@ ExtractConfig ( =20 BackupChar =3D Value[ValueStrLen]; *Value++ =3D L'=3D'; - Value +=3D UnicodeValueToString ( - Value,=20 - PREFIX_ZERO | RADIX_HEX,=20 - PrivateData->Configuration.NameValueVar0,=20 - sizeof (PrivateData->Configuration.NameValueVar0) * 2 - ); + UnicodeValueToStringS ( + Value, + BufferSize - ((UINTN)Value - (UINTN)*Results), + PREFIX_ZERO | RADIX_HEX, + PrivateData->Configuration.NameValueVar0, + sizeof (PrivateData->Configuration.NameValueVar0) * 2 + ); + Value +=3D StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Re= sults)) / sizeof (CHAR16)); *Value =3D BackupChar; } =20 @@ -744,12 +746,14 @@ ExtractConfig ( =20 BackupChar =3D Value[ValueStrLen]; *Value++ =3D L'=3D'; - Value +=3D UnicodeValueToString ( - Value,=20 - PREFIX_ZERO | RADIX_HEX,=20 - PrivateData->Configuration.NameValueVar1,=20 - sizeof (PrivateData->Configuration.NameValueVar1) * 2 - ); + UnicodeValueToStringS ( + Value, + BufferSize - ((UINTN)Value - (UINTN)*Results), + PREFIX_ZERO | RADIX_HEX, + PrivateData->Configuration.NameValueVar1, + sizeof (PrivateData->Configuration.NameValueVar1) * 2 + ); + Value +=3D StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Re= sults)) / sizeof (CHAR16)); *Value =3D BackupChar; } =20 @@ -767,7 +771,14 @@ ExtractConfig ( // StrPointer =3D (CHAR16 *) PrivateData->Configuration.NameValueVar2; for (; *StrPointer !=3D L'\0'; StrPointer++) { - Value +=3D UnicodeValueToString (Value, PREFIX_ZERO | RADIX_HEX, *= StrPointer, 4); + UnicodeValueToStringS ( + Value, + BufferSize - ((UINTN)Value - (UINTN)*Results), + PREFIX_ZERO | RADIX_HEX, + *StrPointer, + 4 + ); + Value +=3D StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*= Results)) / sizeof (CHAR16)); } } =20 diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b= /MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index 8e23a51..1b48c1c 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -1,7 +1,7 @@ /** @file Implementation of interfaces function for EFI_CONFIG_KEYWORD_HANDLER_PROTO= COL. =20 -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -1763,7 +1763,14 @@ ConstructConfigHdr ( // Append Guid converted to 32 // for (Index =3D 0, Buffer =3D (UINT8 *)Guid; Index < sizeof (EFI_GUID);= Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *= (Buffer++), 2); + UnicodeValueToStringS ( + String, + MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *(Buffer++), + 2 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)Retur= nString) / sizeof (CHAR16)); } } =20 @@ -1778,7 +1785,14 @@ ConstructConfigHdr ( // Append Name converted to NameLength // for (; *Name !=3D L'\0'; Name++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *= Name, 4); + UnicodeValueToStringS ( + String, + MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *Name, + 4 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)Retur= nString) / sizeof (CHAR16)); } } =20 @@ -1792,7 +1806,14 @@ ConstructConfigHdr ( // Append the device path associated with DriverHandle converted to DevicePathSize // for (Index =3D 0, Buffer =3D (UINT8 *)DevicePath; Index < DevicePathSize= ; Index++) { - String +=3D UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(B= uffer++), 2); + UnicodeValueToStringS ( + String, + MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString), + PREFIX_ZERO | RADIX_HEX, + *(Buffer++), + 2 + ); + String +=3D StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnS= tring) / sizeof (CHAR16)); } =20 // diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeMod= ulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index d547f42..eafc037 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -1,7 +1,7 @@ /** @file Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -264,7 +264,14 @@ GenerateSubStr ( // TemBuffer =3D ((UINT8 *) Buffer); for (Index =3D 0; Index < BufferLen; Index ++, TemBuffer ++) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_= HEX, *TemBuffer, 2); + UnicodeValueToStringS ( + TemString, + sizeof (CHAR16) * (Length - StrnLenS (Str, Length)), + PREFIX_ZERO | RADIX_HEX, + *TemBuffer, + 2 + ); + TemString +=3D StrnLenS (TemString, Length - StrnLenS (Str, Length)); } break; case 2: @@ -277,7 +284,14 @@ GenerateSubStr ( // Convert Unicode String to Config String, e.g. "ABCD" =3D> "00410042= 00430044" // for (; *TemName !=3D L'\0'; TemName++) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_= HEX, *TemName, 4); + UnicodeValueToStringS ( + TemString, + sizeof (CHAR16) * (Length - StrnLenS (Str, Length)), + PREFIX_ZERO | RADIX_HEX, + *TemName, + 4 + ); + TemString +=3D StrnLenS (TemString, Length - StrnLenS (Str, Length)); } break; case 3: @@ -286,7 +300,14 @@ GenerateSubStr ( // TemBuffer =3D ((UINT8 *) Buffer) + BufferLen - 1; for (Index =3D 0; Index < BufferLen; Index ++, TemBuffer --) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_= HEX, *TemBuffer, 2); + UnicodeValueToStringS ( + TemString, + sizeof (CHAR16) * (Length - StrnLenS (Str, Length)), + PREFIX_ZERO | RADIX_HEX, + *TemBuffer, + 2 + ); + TemString +=3D StrnLenS (TemString, Length - StrnLenS (Str, Length)); } break; default: @@ -3703,7 +3724,14 @@ GenerateAltConfigResp ( TmpBuffer =3D (UINT8 *) &(DefaultValueData->Value); } for (; Width > 0 && (TmpBuffer !=3D NULL); Width--) { - StringPtr +=3D UnicodeValueToString (StringPtr, PREFIX_ZERO | RA= DIX_HEX, TmpBuffer[Width - 1], 2); + UnicodeValueToStringS ( + StringPtr, + Length * sizeof (CHAR16) - ((UINTN)StringPtr - (UINTN)*Default= AltCfgResp), + PREFIX_ZERO | RADIX_HEX, + TmpBuffer[Width - 1], + 2 + ); + StringPtr +=3D StrnLenS (StringPtr, Length - ((UINTN)StringPtr -= (UINTN)*DefaultAltCfgResp) / sizeof (CHAR16)); } if (DefaultString !=3D NULL){ FreePool(DefaultString); @@ -5390,7 +5418,14 @@ HiiBlockToConfig ( TemString =3D ValueStr; TemBuffer =3D Value + Width - 1; for (Index =3D 0; Index < Width; Index ++, TemBuffer --) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_= HEX, *TemBuffer, 2); + UnicodeValueToStringS ( + TemString, + Length * sizeof (CHAR16) - ((UINTN)TemString - (UINTN)ValueStr), + PREFIX_ZERO | RADIX_HEX, + *TemBuffer, + 2 + ); + TemString +=3D StrnLenS (TemString, Length - ((UINTN)TemString - (UI= NTN)ValueStr) / sizeof (CHAR16)); } =20 FreePool (Value); diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c = b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c index 5e0fe42..f035706 100644 --- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c +++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c @@ -1,7 +1,7 @@ /** @file HII Config Access protocol implementation of VLAN configuration module. =20 -Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full @@ -417,14 +417,22 @@ VlanUpdateForm ( // // Pad VlanId string up to 4 characters with space // - DigitalCount =3D UnicodeValueToString (VlanIdStr, 0, VlanData[Index].V= lanId, 5); + UnicodeValueToStringS (VlanIdStr, sizeof (VlanIdStr), 0, VlanData[Inde= x].VlanId, 5); + DigitalCount =3D StrnLenS (VlanIdStr, ARRAY_SIZE (VlanIdStr)); SetMem16 (String, (4 - DigitalCount) * sizeof (CHAR16), L' '); StrCpyS (String + 4 - DigitalCount, (sizeof (VlanStr) /sizeof (CHAR16)= ) - 10 - (4 - DigitalCount), VlanIdStr); String +=3D 4; =20 StrCpyS (String, (sizeof (VlanStr) /sizeof (CHAR16)) - 10 - (4 - Digi= talCount) - 4, L", Priority:"); String +=3D 11; - String +=3D UnicodeValueToString (String, 0, VlanData[Index].Priority,= 4); + UnicodeValueToStringS ( + String, + sizeof (VlanStr) - ((UINTN)String - (UINTN)VlanStr), + 0, + VlanData[Index].Priority, + 4 + ); + String +=3D StrnLenS (String, ARRAY_SIZE (VlanStr) - ((UINTN)String - = (UINTN)VlanStr) / sizeof (CHAR16)); *String =3D 0; =20 StringId =3D HiiSetString (PrivateData->HiiHandle, 0, VlanStr, NULL); diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModul= ePkg/Universal/SetupBrowserDxe/Expression.c index ec4d285..901b35c 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c @@ -1,7 +1,7 @@ /** @file Utility functions for expression evaluation. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -3143,7 +3143,14 @@ EvaluateExpression ( TempBuffer =3D (UINT8 *) &Value->Value + OpCode->ValueWidth - = 1; StrPtr =3D NameValue; for (Index =3D 0; Index < OpCode->ValueWidth; Index ++, TempBu= ffer --) { - StrPtr +=3D UnicodeValueToString (StrPtr, PREFIX_ZERO | RADI= X_HEX, *TempBuffer, 2); + UnicodeValueToStringS ( + StrPtr, + (OpCode->ValueWidth * 2 + 1) * sizeof (CHAR16) - ((UINTN)S= trPtr - (UINTN)NameValue), + PREFIX_ZERO | RADIX_HEX, + *TempBuffer, + 2 + ); + StrPtr +=3D StrnLenS (StrPtr, OpCode->ValueWidth * 2 + 1 - (= (UINTN)StrPtr - (UINTN)NameValue) / sizeof (CHAR16)); } Status =3D SetValueByName (OpCode->VarStorage, OpCode->ValueNa= me, NameValue, GetSetValueWithEditBuffer, NULL); FreePool (NameValue); diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModuleP= kg/Universal/SetupBrowserDxe/IfrParse.c index 61ba0b5..6b3e5e0 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c @@ -1,7 +1,7 @@ /** @file Parser for IFR binary encoding. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -116,7 +116,7 @@ UpdateCheckBoxStringToken ( ASSERT (Statement !=3D NULL); ASSERT (Statement->Operand =3D=3D EFI_IFR_NUMERIC_OP); =20 - UnicodeValueToString (Str, 0, Statement->VarStoreInfo.VarName, MAXIMUM_V= ALUE_CHARACTERS - 1); + UnicodeValueToStringS (Str, sizeof (Str), 0, Statement->VarStoreInfo.Var= Name, MAXIMUM_VALUE_CHARACTERS - 1); =20 Id =3D HiiSetString (FormSet->HiiHandle, 0, Str, NULL); if (Id =3D=3D 0) { diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/= Universal/SetupBrowserDxe/Setup.c index 06e682a..83dc2b8 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -1,7 +1,7 @@ /** @file Entry and initialization module for the browser. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -1972,7 +1972,14 @@ SetQuestionValue ( TemName =3D (CHAR16 *) Src; TemString =3D Value; for (; *TemName !=3D L'\0'; TemName++) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RA= DIX_HEX, *TemName, 4); + UnicodeValueToStringS ( + TemString, + BufferLen - ((UINTN)TemString - (UINTN)Value), + PREFIX_ZERO | RADIX_HEX, + *TemName, + 4 + ); + TemString +=3D StrnLenS (TemString, (BufferLen - ((UINTN)TemStri= ng - (UINTN)Value)) / sizeof (CHAR16)); } } else { BufferLen =3D StorageWidth * 2 + 1; @@ -1984,7 +1991,14 @@ SetQuestionValue ( TemBuffer =3D Src + StorageWidth - 1; TemString =3D Value; for (Index =3D 0; Index < StorageWidth; Index ++, TemBuffer --) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RA= DIX_HEX, *TemBuffer, 2); + UnicodeValueToStringS ( + TemString, + BufferLen * sizeof (CHAR16) - ((UINTN)TemString - (UINTN)Value= ), + PREFIX_ZERO | RADIX_HEX, + *TemBuffer, + 2 + ); + TemString +=3D StrnLenS (TemString, BufferLen - ((UINTN)TemStrin= g - (UINTN)Value) / sizeof (CHAR16)); } } =20 @@ -2034,7 +2048,14 @@ SetQuestionValue ( TemName =3D (CHAR16 *) Src; TemString =3D Value; for (; *TemName !=3D L'\0'; TemName++) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADI= X_HEX, *TemName, 4); + UnicodeValueToStringS ( + TemString, + MaxLen * sizeof (CHAR16) - ((UINTN)TemString - (UINTN)ConfigResp= ), + PREFIX_ZERO | RADIX_HEX, + *TemName, + 4 + ); + TemString +=3D StrnLenS (TemString, MaxLen - ((UINTN)TemString - (= UINTN)ConfigResp) / sizeof (CHAR16)); } } else { // @@ -2043,7 +2064,14 @@ SetQuestionValue ( TemBuffer =3D Src + StorageWidth - 1; TemString =3D Value; for (Index =3D 0; Index < StorageWidth; Index ++, TemBuffer --) { - TemString +=3D UnicodeValueToString (TemString, PREFIX_ZERO | RADI= X_HEX, *TemBuffer, 2); + UnicodeValueToStringS ( + TemString, + MaxLen * sizeof (CHAR16) - ((UINTN)TemString - (UINTN)ConfigResp= ), + PREFIX_ZERO | RADIX_HEX, + *TemBuffer, + 2 + ); + TemString +=3D StrnLenS (TemString, MaxLen - ((UINTN)TemString - (= UINTN)ConfigResp) / sizeof (CHAR16)); } } =20 --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676968418515.7351511122472; Tue, 21 Feb 2017 03:36:08 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3172C82224; Tue, 21 Feb 2017 03:36:07 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 87A6B821C2 for ; Tue, 21 Feb 2017 03:36:05 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:05 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:04 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323599" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:30 +0800 Message-Id: <1487676934-12984-4-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 3/7] Nt32Pkg: Replace [Ascii|Unicode]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Ruiyu Ni , Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is the follow up of commits 51f0ceb..9e32e97 to replace AsciiValueToString/UnicodeValueToString with AsciiValueToStringS/UnicodeValueToStringS. Cc: Jiewen Yao Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao Reviewed-by: Ruiyu Ni --- Nt32Pkg/Library/PlatformBootManagerLib/MemoryTest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/MemoryTest.c b/Nt32Pkg/= Library/PlatformBootManagerLib/MemoryTest.c index 93ecc7d..53e9ff4 100644 --- a/Nt32Pkg/Library/PlatformBootManagerLib/MemoryTest.c +++ b/Nt32Pkg/Library/PlatformBootManagerLib/MemoryTest.c @@ -1,7 +1,7 @@ /** @file Perform the platform memory test =20 -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -155,7 +155,7 @@ PlatformBootManagerMemoryTest ( TempData ); if (TestPercent !=3D PreviousValue) { - UnicodeValueToString (StrPercent, 0, TestPercent, 0); + UnicodeValueToStringS (StrPercent, sizeof (StrPercent), 0, TestPer= cent, 0); TmpStr =3D HiiGetString (gStringPackHandle, STRING_TOKEN (STR_MEMO= RY_TEST_PERCENT), NULL); if (TmpStr !=3D NULL) { // @@ -223,7 +223,7 @@ PlatformBootManagerMemoryTest ( =20 Done: if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) { - UnicodeValueToString (StrTotalMemory, COMMA_TYPE, TotalMemorySize, 0); + UnicodeValueToStringS (StrTotalMemory, StrTotalMemorySize, COMMA_TYPE,= TotalMemorySize, 0); if (StrTotalMemory[0] =3D=3D L',') { StrTotalMemory++; StrTotalMemorySize -=3D sizeof (CHAR16); --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676970925574.1376764444732; Tue, 21 Feb 2017 03:36:10 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6A7C282227; Tue, 21 Feb 2017 03:36:09 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A98F482226 for ; Tue, 21 Feb 2017 03:36:07 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:07 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:06 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323607" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:31 +0800 Message-Id: <1487676934-12984-5-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 4/7] SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is the follow up of commits 51f0ceb..9e32e97 to replace AsciiValueToString/UnicodeValueToString with AsciiValueToStringS/UnicodeValueToStringS. Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Jiewen.yao@intel.com Reviewed-by: Liming Gao --- SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c | 10= ++++++++-- SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c | 10= ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigPr= ofile.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfi= le.c index fef1daf..204fd53 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c @@ -2,7 +2,7 @@ Parse the INI configuration file and pass the information to the recover= y driver so that the driver can perform recovery accordingly. =20 - Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions @@ -85,7 +85,13 @@ ParseRecoveryDataFile ( // Get the section name of each update // AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Recovery"); - AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0); + AsciiValueToStringS ( + Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH), + MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH), + 0, + Index, + 0 + ); Status =3D GetStringFromDataFile( Context, "Head", diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigPro= file.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile= .c index dcad762..67584c6 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c @@ -2,7 +2,7 @@ Parse the INI configuration file and pass the information to the update = driver so that the driver can perform update accordingly. =20 - Copyright (c) 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions @@ -86,7 +86,13 @@ ParseUpdateDataFile ( // Get the section name of each update // AsciiStrCpyS (Entry, MAX_LINE_LENGTH, "Update"); - AsciiValueToString(Entry + AsciiStrLen(Entry), 0, Index, 0); + AsciiValueToStringS ( + Entry + AsciiStrnLenS (Entry, MAX_LINE_LENGTH), + MAX_LINE_LENGTH - AsciiStrnLenS (Entry, MAX_LINE_LENGTH), + 0, + Index, + 0 + ); Status =3D GetStringFromDataFile( Context, "Head", --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676974530287.92869105025727; Tue, 21 Feb 2017 03:36:14 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9E5A78222A; Tue, 21 Feb 2017 03:36:10 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E0BED82223 for ; Tue, 21 Feb 2017 03:36:09 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:09 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:08 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323622" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:32 +0800 Message-Id: <1487676934-12984-6-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 5/7] MdeModulePkg/PrintDxe: Handle the deprecation of [A|U]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Michael Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" To handle the deprecation of PrintLib APIs UnicodeValueToString and AsciiValueToString by subsequent commits, the commit refines the logic for the implemetation of the UnicodeValueToString and AsciiValueToString services in EFI_PRINT2_PROTOCOL. When the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined (indicating the deprecation of the PrintLib APIs), the above two services will ASSERT and will return zero to reflect not being supported. Cc: Jiewen Yao Cc: Liming Gao Cc: Michael Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao --- MdeModulePkg/Universal/PrintDxe/Print.c | 92 +++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/PrintDxe/Print.c b/MdeModulePkg/Univers= al/PrintDxe/Print.c index 85bc724..8029836 100644 --- a/MdeModulePkg/Universal/PrintDxe/Print.c +++ b/MdeModulePkg/Universal/PrintDxe/Print.c @@ -20,6 +20,94 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHE= R EXPRESS OR IMPLIED. #include #include =20 +/** + Implementaion of the UnicodeValueToString service in EFI_PRINT2_PROTOCOL. + + If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then ASSERT(). + + @param Buffer The pointer to the output buffer for the produced + Null-terminated Unicode string. + @param Flags The bitmask of flags that specify left justification, ze= ro + pad, and commas. + @param Value The 64-bit signed value to convert to a string. + @param Width The maximum number of Unicode characters to place in Buf= fer, + not including the Null-terminator. + + @return If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, retur= n 0. + Otherwise, return the number of Unicode characters in Buffer not + including the Null-terminator. + +**/ +UINTN +EFIAPI +PrintDxeUnicodeValueToString ( + IN OUT CHAR16 *Buffer, + IN UINTN Flags, + IN INT64 Value, + IN UINTN Width + ) +{ +#ifdef DISABLE_NEW_DEPRECATED_INTERFACES + // + // If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then the + // PrintLib API UnicodeValueToString is already deprecated. + // In this case, ASSERT will be triggered and zero will be returned for = the + // implementation of the UnicodeValueToString service in EFI_PRINT2_PROT= OCOL + // to indicate that the service is no longer supported. + // + DEBUG ((DEBUG_ERROR, "PrintDxe: The UnicodeValueToString service in EFI_= PRINT2_PROTOCOL is no longer supported for security reason.\n")); + DEBUG ((DEBUG_ERROR, "PrintDxe: Please consider using the UnicodeValueTo= StringS service in EFI_PRINT2S_PROTOCOL.\n")); + ASSERT (FALSE); + return 0; +#else + return UnicodeValueToString (Buffer, Flags, Value, Width); +#endif +} + +/** + Implementaion of the AsciiValueToString service in EFI_PRINT2_PROTOCOL. + + If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then ASSERT(). + + @param Buffer A pointer to the output buffer for the produced + Null-terminated ASCII string. + @param Flags The bitmask of flags that specify left justification, ze= ro + pad, and commas. + @param Value The 64-bit signed value to convert to a string. + @param Width The maximum number of ASCII characters to place in Buffe= r, + not including the Null-terminator. + + @return If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, retur= n 0. + Otherwise, return the number of ASCII characters in Buffer not + including the Null-terminator. + +**/ +UINTN +EFIAPI +PrintDxeAsciiValueToString ( + OUT CHAR8 *Buffer, + IN UINTN Flags, + IN INT64 Value, + IN UINTN Width + ) +{ +#ifdef DISABLE_NEW_DEPRECATED_INTERFACES + // + // If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then the + // PrintLib API AsciiValueToString is already deprecated. + // In this case, ASSERT will be triggered and zero will be returned for = the + // implementation of the AsciiValueToString service in EFI_PRINT2_PROTOC= OL + // to indicate that the service is no longer supported. + // + DEBUG ((DEBUG_ERROR, "PrintDxe: The AsciiValueToString service in EFI_PR= INT2_PROTOCOL is no longer supported for security reason.\n")); + DEBUG ((DEBUG_ERROR, "PrintDxe: Please consider using the AsciiValueToSt= ringS service in EFI_PRINT2S_PROTOCOL.\n")); + ASSERT (FALSE); + return 0; +#else + return AsciiValueToString (Buffer, Flags, Value, Width); +#endif +} + EFI_HANDLE mPrintThunkHandle =3D NULL; =20 CONST EFI_PRINT2_PROTOCOL mPrint2Protocol =3D { @@ -27,12 +115,12 @@ CONST EFI_PRINT2_PROTOCOL mPrint2Protocol =3D { UnicodeSPrint, UnicodeBSPrintAsciiFormat, UnicodeSPrintAsciiFormat, - UnicodeValueToString, + PrintDxeUnicodeValueToString, AsciiBSPrint, AsciiSPrint, AsciiBSPrintUnicodeFormat, AsciiSPrintUnicodeFormat, - AsciiValueToString + PrintDxeAsciiValueToString }; =20 CONST EFI_PRINT2S_PROTOCOL mPrint2SProtocol =3D { --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676976125120.48105628956819; Tue, 21 Feb 2017 03:36:16 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D4A5482223; Tue, 21 Feb 2017 03:36:12 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2C69582226 for ; Tue, 21 Feb 2017 03:36:12 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:11 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:10 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323641" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:33 +0800 Message-Id: <1487676934-12984-7-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 6/7] MdeModulePkg/PrintLib: Add deprecated flag for APIs [A|U]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Michael Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Jiewen Yao Cc: Liming Gao Cc: Michael Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao --- MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/Md= eModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c index 589d4db..434736f 100644 --- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c +++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c @@ -598,7 +598,11 @@ UnicodeSPrintAsciiFormat ( return NumberOfPrinted; } =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated Unicode string. =20 Converts the decimal number specified by Value to a Null-terminated Unic= ode=20 @@ -665,6 +669,8 @@ UnicodeValueToString ( return StrnLenS (Buffer, BufferSize / sizeof (CHAR16)); } =20 +#endif + /** Converts a decimal value to a Null-terminated Unicode string. =20 @@ -1071,7 +1077,11 @@ AsciiSPrintUnicodeFormat ( } =20 =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated ASCII string. =20 Converts the decimal number specified by Value to a Null-terminated ASCI= I string=20 @@ -1137,6 +1147,8 @@ AsciiValueToString ( return AsciiStrnLenS (Buffer, BufferSize / sizeof (CHAR8)); } =20 +#endif + /** Converts a decimal value to a Null-terminated Ascii string. =20 --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 12:20:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487676979812406.95296217773125; Tue, 21 Feb 2017 03:36:19 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 16A388222E; Tue, 21 Feb 2017 03:36:15 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 225BC8222E for ; Tue, 21 Feb 2017 03:36:14 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 03:36:14 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga006.fm.intel.com with ESMTP; 21 Feb 2017 03:36:12 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="68323655" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 21 Feb 2017 19:35:34 +0800 Message-Id: <1487676934-12984-8-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> References: <1487676934-12984-1-git-send-email-hao.a.wu@intel.com> Subject: [edk2] [PATCH 7/7] MdePkg/BasePrintLib: Add deprecated flag for APIs [A|U]ValueToString X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Michael Kinney , Jiewen Yao , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Jiewen Yao Cc: Liming Gao Cc: Michael Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao --- MdePkg/Include/Library/PrintLib.h | 12 ++++++++++++ MdePkg/Library/BasePrintLib/PrintLib.c | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/MdePkg/Include/Library/PrintLib.h b/MdePkg/Include/Library/Pri= ntLib.h index 8c11dab..9fe3609 100644 --- a/MdePkg/Include/Library/PrintLib.h +++ b/MdePkg/Include/Library/PrintLib.h @@ -491,7 +491,11 @@ UnicodeSPrintAsciiFormat ( ... ); =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated Unicode string. =20 Converts the decimal number specified by Value to a Null-terminated Unic= ode=20 @@ -541,6 +545,8 @@ UnicodeValueToString ( IN UINTN Width ); =20 +#endif + /** Converts a decimal value to a Null-terminated Unicode string. =20 @@ -882,7 +888,11 @@ AsciiSPrintUnicodeFormat ( ... ); =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated ASCII string. =20 Converts the decimal number specified by Value to a Null-terminated ASCI= I string=20 @@ -931,6 +941,8 @@ AsciiValueToString ( IN UINTN Width ); =20 +#endif + /** Converts a decimal value to a Null-terminated Ascii string. =20 diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/MdePkg/Library/BasePr= intLib/PrintLib.c index 221b52e..7453e95 100644 --- a/MdePkg/Library/BasePrintLib/PrintLib.c +++ b/MdePkg/Library/BasePrintLib/PrintLib.c @@ -349,7 +349,11 @@ UnicodeSPrintAsciiFormat ( return NumberOfPrinted; } =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated Unicode string. =20 Converts the decimal number specified by Value to a Null-terminated Unic= ode=20 @@ -403,6 +407,8 @@ UnicodeValueToString ( return BasePrintLibConvertValueToString ((CHAR8 *)Buffer, Flags, Value, = Width, 2); } =20 +#endif + /** Converts a decimal value to a Null-terminated Unicode string. =20 @@ -781,7 +787,11 @@ AsciiSPrintUnicodeFormat ( } =20 =20 +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES + /** + [ATTENTION] This function is deprecated for security reason. + Converts a decimal value to a Null-terminated ASCII string. =20 Converts the decimal number specified by Value to a Null-terminated ASCI= I string=20 @@ -833,6 +843,8 @@ AsciiValueToString ( return BasePrintLibConvertValueToString (Buffer, Flags, Value, Width, 1); } =20 +#endif + /** Converts a decimal value to a Null-terminated Ascii string. =20 --=20 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel