sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntelFrameworkModulePkg: Replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr

Browse Source 
It is the follow up of 3ab41b7a32
to replace UnicodeStrToAsciiStr/AsciiStrToUnicodeStr with
UnicodeStrToAsciiStrS/AsciiStrToUnicodeStrS.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Star Zeng
2016-06-15 13:40:46 +08:00
parent 46213c8eb4
commit 9b82facd9c
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
BDS Lib functions which relate with create or process the boot option. BDS Lib functions which relate with create or process the boot option.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -330,7 +330,7 @@ BdsCreateLegacyBootOption (
// //
// Create new BBS device path node with description string // Create new BBS device path node with description string
// //
UnicodeStrToAsciiStr (BootDesc, HelpString); UnicodeStrToAsciiStrS (BootDesc, HelpString, sizeof (HelpString));
StringLen = AsciiStrLen (HelpString); StringLen = AsciiStrLen (HelpString);
NewBbsDevPathNode = AllocateZeroPool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen); NewBbsDevPathNode = AllocateZeroPool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen);

6
IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBm.c
View File

@ -3,7 +3,7 @@
and manage the legacy boot option, all legacy boot option is getting from and manage the legacy boot option, all legacy boot option is getting from
the legacy BBS table. the legacy BBS table.
Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -183,7 +183,7 @@ LegacyBmBuildLegacyDevNameString (
// //
CopyMem (StringBufferA, StringDesc, LEGACY_BM_BOOT_DESCRIPTION_LENGTH); CopyMem (StringBufferA, StringDesc, LEGACY_BM_BOOT_DESCRIPTION_LENGTH);
StringBufferA[LEGACY_BM_BOOT_DESCRIPTION_LENGTH] = 0; StringBufferA[LEGACY_BM_BOOT_DESCRIPTION_LENGTH] = 0;
AsciiStrToUnicodeStr (StringBufferA, StringBufferU); AsciiStrToUnicodeStrS (StringBufferA, StringBufferU, sizeof (StringBufferU) / sizeof (StringBufferU[0]));
Fmt = L"%s"; Fmt = L"%s";
Type = StringBufferU; Type = StringBufferU;
} }
@ -537,7 +537,7 @@ LegacyBmCreateLegacyBootOption (
// //
// Create the BBS device path with description string // Create the BBS device path with description string
// //
UnicodeStrToAsciiStr (Description, HelpString); UnicodeStrToAsciiStrS (Description, HelpString, sizeof (HelpString));
StringLen = AsciiStrLen (HelpString); StringLen = AsciiStrLen (HelpString);
DevicePath = AllocatePool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen + END_DEVICE_PATH_LENGTH); DevicePath = AllocatePool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen + END_DEVICE_PATH_LENGTH);
ASSERT (DevicePath != NULL); ASSERT (DevicePath != NULL);

10
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
FrontPage routines to handle the callbacks and browser calls FrontPage routines to handle the callbacks and browser calls
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -300,6 +300,7 @@ InitializeFrontPage (
EFI_STATUS Status; EFI_STATUS Status;
CHAR8 *LangCode; CHAR8 *LangCode;
CHAR8 *Lang; CHAR8 *Lang;
UINTN LangSize;
CHAR8 *CurrentLang; CHAR8 *CurrentLang;
UINTN OptionCount; UINTN OptionCount;
CHAR16 *StringBuffer; CHAR16 *StringBuffer;
@ -448,9 +449,10 @@ InitializeFrontPage (
} }
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
StringBuffer = AllocatePool (AsciiStrSize (Lang) * sizeof (CHAR16)); LangSize = AsciiStrSize (Lang);
StringBuffer = AllocatePool (LangSize * sizeof (CHAR16));
ASSERT (StringBuffer != NULL); ASSERT (StringBuffer != NULL);
AsciiStrToUnicodeStr (Lang, StringBuffer); AsciiStrToUnicodeStrS (Lang, StringBuffer, LangSize);
} }
ASSERT (StringBuffer != NULL); ASSERT (StringBuffer != NULL);
@ -702,7 +704,7 @@ GetOptionalStringByIndex (
*String = GetStringById (STRING_TOKEN (STR_MISSING_STRING)); *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));
} else { } else {
*String = AllocatePool (StrSize * sizeof (CHAR16)); *String = AllocatePool (StrSize * sizeof (CHAR16));
AsciiStrToUnicodeStr (OptionalStrStart, *String); AsciiStrToUnicodeStrS (OptionalStrStart, *String, StrSize);
} }
return EFI_SUCCESS; return EFI_SUCCESS;