mirror of https://github.com/acidanthera/audk.git
Add 2 functions to UefiLib library class: CatSPrint and CatVSPrint.
Implement these functions in the UefiLib instance. Add 2 functions to PrintLib library class: SPrintLengthAsciiFormat and SPrintLength. Implement these functions in the BasePrintLib instance and the DxePrintLib2Protocol instance. Signed-off-by: jcarsey Reviewed-by: jljusten Reviewed-by: geekboy15a git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12081 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
274402de46
commit
f405c0674a
|
@ -6,7 +6,7 @@
|
|||
protocol related to this implementation, not in the public spec. So, this
|
||||
library instance is only for this code base.
|
||||
|
||||
Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
|
@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
**/
|
||||
|
||||
#include <Uefi.h>
|
||||
|
||||
#include <Base.h>
|
||||
#include <Protocol/Print2.h>
|
||||
|
||||
#include <Library/PrintLib.h>
|
||||
|
@ -921,3 +921,885 @@ AsciiValueToString (
|
|||
{
|
||||
return mPrint2Protocol->AsciiValueToString (Buffer, Flags, Value, Width);
|
||||
}
|
||||
|
||||
#define PREFIX_SIGN BIT1
|
||||
#define PREFIX_BLANK BIT2
|
||||
#define LONG_TYPE BIT4
|
||||
#define OUTPUT_UNICODE BIT6
|
||||
#define FORMAT_UNICODE BIT8
|
||||
#define PAD_TO_WIDTH BIT9
|
||||
#define ARGUMENT_UNICODE BIT10
|
||||
#define PRECISION BIT11
|
||||
#define ARGUMENT_REVERSED BIT12
|
||||
#define COUNT_ONLY_NO_PRINT BIT13
|
||||
|
||||
//
|
||||
// Record date and time information
|
||||
//
|
||||
typedef struct {
|
||||
UINT16 Year;
|
||||
UINT8 Month;
|
||||
UINT8 Day;
|
||||
UINT8 Hour;
|
||||
UINT8 Minute;
|
||||
UINT8 Second;
|
||||
UINT8 Pad1;
|
||||
UINT32 Nanosecond;
|
||||
INT16 TimeZone;
|
||||
UINT8 Daylight;
|
||||
UINT8 Pad2;
|
||||
} TIME;
|
||||
|
||||
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
|
||||
|
||||
/**
|
||||
Internal function that convert a number to a string in Buffer.
|
||||
|
||||
Print worker function that converts a decimal or hexadecimal number to an ASCII string in Buffer.
|
||||
|
||||
@param Buffer Location to place the ASCII string of Value.
|
||||
@param Value The value to convert to a Decimal or Hexadecimal string in Buffer.
|
||||
@param Radix Radix of the value
|
||||
|
||||
@return A pointer to the end of buffer filled with ASCII string.
|
||||
|
||||
**/
|
||||
CHAR8 *
|
||||
InternalPrintLibValueToString (
|
||||
IN OUT CHAR8 *Buffer,
|
||||
IN INT64 Value,
|
||||
IN UINTN Radix
|
||||
)
|
||||
{
|
||||
UINT32 Remainder;
|
||||
|
||||
//
|
||||
// Loop to convert one digit at a time in reverse order
|
||||
//
|
||||
*Buffer = 0;
|
||||
do {
|
||||
Value = (INT64)DivU64x32Remainder ((UINT64)Value, (UINT32)Radix, &Remainder);
|
||||
*(++Buffer) = mHexStr[Remainder];
|
||||
} while (Value != 0);
|
||||
|
||||
//
|
||||
// Return pointer of the end of filled buffer.
|
||||
//
|
||||
return Buffer;
|
||||
}
|
||||
|
||||
/**
|
||||
Worker function that produces a Null-terminated string in an output buffer
|
||||
based on a Null-terminated format string and a VA_LIST argument list.
|
||||
|
||||
VSPrint function to process format and place the results in Buffer. Since a
|
||||
VA_LIST is used this routine allows the nesting of Vararg routines. Thus
|
||||
this is the main print working routine.
|
||||
|
||||
If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.
|
||||
|
||||
@param[out] Buffer The character buffer to print the results of the
|
||||
parsing of Format into.
|
||||
@param[in] BufferSize The maximum number of characters to put into
|
||||
buffer.
|
||||
@param[in] Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE, OUTPUT_UNICODE,
|
||||
and COUNT_ONLY_NO_PRINT set.
|
||||
@param[in] Format A Null-terminated format string.
|
||||
@param[in] VaListMarker VA_LIST style variable argument list consumed by
|
||||
processing Format.
|
||||
@param[in] BaseListMarker BASE_LIST style variable argument list consumed
|
||||
by processing Format.
|
||||
|
||||
@return The number of characters printed not including the Null-terminator.
|
||||
If COUNT_ONLY_NO_PRINT was set returns the same, but without any
|
||||
modification to Buffer.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
InternalPrintLibSPrintMarker (
|
||||
OUT CHAR8 *Buffer,
|
||||
IN UINTN BufferSize,
|
||||
IN UINTN Flags,
|
||||
IN CONST CHAR8 *Format,
|
||||
IN VA_LIST VaListMarker, OPTIONAL
|
||||
IN BASE_LIST BaseListMarker OPTIONAL
|
||||
);
|
||||
|
||||
/**
|
||||
Worker function that produces a Null-terminated string in an output buffer
|
||||
based on a Null-terminated format string and variable argument list.
|
||||
|
||||
VSPrint function to process format and place the results in Buffer. Since a
|
||||
VA_LIST is used this routine allows the nesting of Vararg routines. Thus
|
||||
this is the main print working routine
|
||||
|
||||
@param StartOfBuffer The character buffer to print the results of the parsing
|
||||
of Format into.
|
||||
@param BufferSize The maximum number of characters to put into buffer.
|
||||
Zero means no limit.
|
||||
@param Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE and OUTPUT_UNICODE set
|
||||
@param FormatString A Null-terminated format string.
|
||||
@param ... The variable argument list.
|
||||
|
||||
@return The number of characters printed.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
InternalPrintLibSPrint (
|
||||
OUT CHAR8 *StartOfBuffer,
|
||||
IN UINTN BufferSize,
|
||||
IN UINTN Flags,
|
||||
IN CONST CHAR8 *FormatString,
|
||||
...
|
||||
)
|
||||
{
|
||||
VA_LIST Marker;
|
||||
|
||||
VA_START (Marker, FormatString);
|
||||
return InternalPrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);
|
||||
}
|
||||
|
||||
#define WARNING_STATUS_NUMBER 4
|
||||
#define ERROR_STATUS_NUMBER 24
|
||||
|
||||
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mStatusString[] = {
|
||||
"Success", // RETURN_SUCCESS = 0
|
||||
"Warning Unknown Glyph", // RETURN_WARN_UNKNOWN_GLYPH = 1
|
||||
"Warning Delete Failure", // RETURN_WARN_DELETE_FAILURE = 2
|
||||
"Warning Write Failure", // RETURN_WARN_WRITE_FAILURE = 3
|
||||
"Warning Buffer Too Small", // RETURN_WARN_BUFFER_TOO_SMALL = 4
|
||||
"Load Error", // RETURN_LOAD_ERROR = 1 | MAX_BIT
|
||||
"Invalid Parameter", // RETURN_INVALID_PARAMETER = 2 | MAX_BIT
|
||||
"Unsupported", // RETURN_UNSUPPORTED = 3 | MAX_BIT
|
||||
"Bad Buffer Size", // RETURN_BAD_BUFFER_SIZE = 4 | MAX_BIT
|
||||
"Buffer Too Small", // RETURN_BUFFER_TOO_SMALL, = 5 | MAX_BIT
|
||||
"Not Ready", // RETURN_NOT_READY = 6 | MAX_BIT
|
||||
"Device Error", // RETURN_DEVICE_ERROR = 7 | MAX_BIT
|
||||
"Write Protected", // RETURN_WRITE_PROTECTED = 8 | MAX_BIT
|
||||
"Out of Resources", // RETURN_OUT_OF_RESOURCES = 9 | MAX_BIT
|
||||
"Volume Corrupt", // RETURN_VOLUME_CORRUPTED = 10 | MAX_BIT
|
||||
"Volume Full", // RETURN_VOLUME_FULL = 11 | MAX_BIT
|
||||
"No Media", // RETURN_NO_MEDIA = 12 | MAX_BIT
|
||||
"Media changed", // RETURN_MEDIA_CHANGED = 13 | MAX_BIT
|
||||
"Not Found", // RETURN_NOT_FOUND = 14 | MAX_BIT
|
||||
"Access Denied", // RETURN_ACCESS_DENIED = 15 | MAX_BIT
|
||||
"No Response", // RETURN_NO_RESPONSE = 16 | MAX_BIT
|
||||
"No mapping", // RETURN_NO_MAPPING = 17 | MAX_BIT
|
||||
"Time out", // RETURN_TIMEOUT = 18 | MAX_BIT
|
||||
"Not started", // RETURN_NOT_STARTED = 19 | MAX_BIT
|
||||
"Already started", // RETURN_ALREADY_STARTED = 20 | MAX_BIT
|
||||
"Aborted", // RETURN_ABORTED = 21 | MAX_BIT
|
||||
"ICMP Error", // RETURN_ICMP_ERROR = 22 | MAX_BIT
|
||||
"TFTP Error", // RETURN_TFTP_ERROR = 23 | MAX_BIT
|
||||
"Protocol Error" // RETURN_PROTOCOL_ERROR = 24 | MAX_BIT
|
||||
};
|
||||
|
||||
/**
|
||||
Worker function that produces a Null-terminated string in an output buffer
|
||||
based on a Null-terminated format string and a VA_LIST argument list.
|
||||
|
||||
VSPrint function to process format and place the results in Buffer. Since a
|
||||
VA_LIST is used this routine allows the nesting of Vararg routines. Thus
|
||||
this is the main print working routine.
|
||||
|
||||
If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.
|
||||
|
||||
@param[out] Buffer The character buffer to print the results of the
|
||||
parsing of Format into.
|
||||
@param[in] BufferSize The maximum number of characters to put into
|
||||
buffer.
|
||||
@param[in] Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE, OUTPUT_UNICODE,
|
||||
and COUNT_ONLY_NO_PRINT set.
|
||||
@param[in] Format A Null-terminated format string.
|
||||
@param[in] VaListMarker VA_LIST style variable argument list consumed by
|
||||
processing Format.
|
||||
@param[in] BaseListMarker BASE_LIST style variable argument list consumed
|
||||
by processing Format.
|
||||
|
||||
@return The number of characters printed not including the Null-terminator.
|
||||
If COUNT_ONLY_NO_PRINT was set returns the same, but without any
|
||||
modification to Buffer.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
InternalPrintLibSPrintMarker (
|
||||
OUT CHAR8 *Buffer,
|
||||
IN UINTN BufferSize,
|
||||
IN UINTN Flags,
|
||||
IN CONST CHAR8 *Format,
|
||||
IN VA_LIST VaListMarker, OPTIONAL
|
||||
IN BASE_LIST BaseListMarker OPTIONAL
|
||||
)
|
||||
{
|
||||
CHAR8 *OriginalBuffer;
|
||||
CHAR8 *EndBuffer;
|
||||
CHAR8 ValueBuffer[MAXIMUM_VALUE_CHARACTERS];
|
||||
UINT32 BytesPerOutputCharacter;
|
||||
UINTN BytesPerFormatCharacter;
|
||||
UINTN FormatMask;
|
||||
UINTN FormatCharacter;
|
||||
UINTN Width;
|
||||
UINTN Precision;
|
||||
INT64 Value;
|
||||
CONST CHAR8 *ArgumentString;
|
||||
UINTN Character;
|
||||
GUID *TmpGuid;
|
||||
TIME *TmpTime;
|
||||
UINTN Count;
|
||||
UINTN ArgumentMask;
|
||||
INTN BytesPerArgumentCharacter;
|
||||
UINTN ArgumentCharacter;
|
||||
BOOLEAN Done;
|
||||
UINTN Index;
|
||||
CHAR8 Prefix;
|
||||
BOOLEAN ZeroPad;
|
||||
BOOLEAN Comma;
|
||||
UINTN Digits;
|
||||
UINTN Radix;
|
||||
RETURN_STATUS Status;
|
||||
UINT32 GuidData1;
|
||||
UINT16 GuidData2;
|
||||
UINT16 GuidData3;
|
||||
UINT32 LengthToReturn;
|
||||
|
||||
//
|
||||
// If you change this code be sure to match the 2 versions of this function.
|
||||
// Nearly identical logic is found in the BasePrintLib and
|
||||
// DxePrintLibPrint2Protocol (both PrintLib instances).
|
||||
//
|
||||
|
||||
ASSERT(Flags & COUNT_ONLY_NO_PRINT);
|
||||
|
||||
if (Flags & OUTPUT_UNICODE) {
|
||||
BytesPerOutputCharacter = 2;
|
||||
} else {
|
||||
BytesPerOutputCharacter = 1;
|
||||
}
|
||||
|
||||
LengthToReturn = 0;
|
||||
|
||||
//
|
||||
// Reserve space for the Null terminator.
|
||||
//
|
||||
BufferSize--;
|
||||
OriginalBuffer = Buffer;
|
||||
|
||||
//
|
||||
// Set the tag for the end of the input Buffer.
|
||||
//
|
||||
EndBuffer = Buffer + BufferSize * BytesPerOutputCharacter;
|
||||
|
||||
if ((Flags & FORMAT_UNICODE) != 0) {
|
||||
//
|
||||
// Make sure format string cannot contain more than PcdMaximumUnicodeStringLength
|
||||
// Unicode characters if PcdMaximumUnicodeStringLength is not zero.
|
||||
//
|
||||
ASSERT (StrSize ((CHAR16 *) Format) != 0);
|
||||
BytesPerFormatCharacter = 2;
|
||||
FormatMask = 0xffff;
|
||||
} else {
|
||||
//
|
||||
// Make sure format string cannot contain more than PcdMaximumAsciiStringLength
|
||||
// Ascii characters if PcdMaximumAsciiStringLength is not zero.
|
||||
//
|
||||
ASSERT (AsciiStrSize (Format) != 0);
|
||||
BytesPerFormatCharacter = 1;
|
||||
FormatMask = 0xff;
|
||||
}
|
||||
|
||||
//
|
||||
// Get the first character from the format string
|
||||
//
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
|
||||
//
|
||||
// Loop until the end of the format string is reached or the output buffer is full
|
||||
//
|
||||
while (FormatCharacter != 0 && Buffer < EndBuffer) {
|
||||
//
|
||||
// Clear all the flag bits except those that may have been passed in
|
||||
//
|
||||
Flags &= (OUTPUT_UNICODE | FORMAT_UNICODE | COUNT_ONLY_NO_PRINT);
|
||||
|
||||
//
|
||||
// Set the default width to zero, and the default precision to 1
|
||||
//
|
||||
Width = 0;
|
||||
Precision = 1;
|
||||
Prefix = 0;
|
||||
Comma = FALSE;
|
||||
ZeroPad = FALSE;
|
||||
Count = 0;
|
||||
Digits = 0;
|
||||
|
||||
switch (FormatCharacter) {
|
||||
case '%':
|
||||
//
|
||||
// Parse Flags and Width
|
||||
//
|
||||
for (Done = FALSE; !Done; ) {
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
switch (FormatCharacter) {
|
||||
case '.':
|
||||
Flags |= PRECISION;
|
||||
break;
|
||||
case '-':
|
||||
Flags |= LEFT_JUSTIFY;
|
||||
break;
|
||||
case '+':
|
||||
Flags |= PREFIX_SIGN;
|
||||
break;
|
||||
case ' ':
|
||||
Flags |= PREFIX_BLANK;
|
||||
break;
|
||||
case ',':
|
||||
Flags |= COMMA_TYPE;
|
||||
break;
|
||||
case 'L':
|
||||
case 'l':
|
||||
Flags |= LONG_TYPE;
|
||||
break;
|
||||
case '*':
|
||||
if ((Flags & PRECISION) == 0) {
|
||||
Flags |= PAD_TO_WIDTH;
|
||||
if (BaseListMarker == NULL) {
|
||||
Width = VA_ARG (VaListMarker, UINTN);
|
||||
} else {
|
||||
Width = BASE_ARG (BaseListMarker, UINTN);
|
||||
}
|
||||
} else {
|
||||
if (BaseListMarker == NULL) {
|
||||
Precision = VA_ARG (VaListMarker, UINTN);
|
||||
} else {
|
||||
Precision = BASE_ARG (BaseListMarker, UINTN);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case '0':
|
||||
if ((Flags & PRECISION) == 0) {
|
||||
Flags |= PREFIX_ZERO;
|
||||
}
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
for (Count = 0; ((FormatCharacter >= '0') && (FormatCharacter <= '9')); ){
|
||||
Count = (Count * 10) + FormatCharacter - '0';
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
}
|
||||
Format -= BytesPerFormatCharacter;
|
||||
if ((Flags & PRECISION) == 0) {
|
||||
Flags |= PAD_TO_WIDTH;
|
||||
Width = Count;
|
||||
} else {
|
||||
Precision = Count;
|
||||
}
|
||||
break;
|
||||
|
||||
case '\0':
|
||||
//
|
||||
// Make no output if Format string terminates unexpectedly when
|
||||
// looking up for flag, width, precision and type.
|
||||
//
|
||||
Format -= BytesPerFormatCharacter;
|
||||
Precision = 0;
|
||||
//
|
||||
// break skipped on purpose.
|
||||
//
|
||||
default:
|
||||
Done = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Handle each argument type
|
||||
//
|
||||
switch (FormatCharacter) {
|
||||
case 'p':
|
||||
//
|
||||
// Flag space, +, 0, L & l are invalid for type p.
|
||||
//
|
||||
Flags &= ~(PREFIX_BLANK | PREFIX_SIGN | PREFIX_ZERO | LONG_TYPE);
|
||||
if (sizeof (VOID *) > 4) {
|
||||
Flags |= LONG_TYPE;
|
||||
}
|
||||
case 'X':
|
||||
Flags |= PREFIX_ZERO;
|
||||
//
|
||||
// break skipped on purpose
|
||||
//
|
||||
case 'x':
|
||||
Flags |= RADIX_HEX;
|
||||
//
|
||||
// break skipped on purpose
|
||||
//
|
||||
case 'd':
|
||||
if ((Flags & LONG_TYPE) == 0) {
|
||||
//
|
||||
// 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".
|
||||
// This assumption is made so the format string definition is compatible with the ANSI C
|
||||
// Specification for formatted strings. It is recommended that the Base Types be used
|
||||
// everywhere, but in this one case, compliance with ANSI C is more important, and
|
||||
// provides an implementation that is compatible with that largest possible set of CPU
|
||||
// architectures. This is why the type "int" is used in this one case.
|
||||
//
|
||||
if (BaseListMarker == NULL) {
|
||||
Value = VA_ARG (VaListMarker, int);
|
||||
} else {
|
||||
Value = BASE_ARG (BaseListMarker, int);
|
||||
}
|
||||
} else {
|
||||
if (BaseListMarker == NULL) {
|
||||
Value = VA_ARG (VaListMarker, INT64);
|
||||
} else {
|
||||
Value = BASE_ARG (BaseListMarker, INT64);
|
||||
}
|
||||
}
|
||||
if ((Flags & PREFIX_BLANK) != 0) {
|
||||
Prefix = ' ';
|
||||
}
|
||||
if ((Flags & PREFIX_SIGN) != 0) {
|
||||
Prefix = '+';
|
||||
}
|
||||
if ((Flags & COMMA_TYPE) != 0) {
|
||||
Comma = TRUE;
|
||||
}
|
||||
if ((Flags & RADIX_HEX) == 0) {
|
||||
Radix = 10;
|
||||
if (Comma) {
|
||||
Flags &= (~PREFIX_ZERO);
|
||||
Precision = 1;
|
||||
}
|
||||
if (Value < 0) {
|
||||
Flags |= PREFIX_SIGN;
|
||||
Prefix = '-';
|
||||
Value = -Value;
|
||||
}
|
||||
} else {
|
||||
Radix = 16;
|
||||
Comma = FALSE;
|
||||
if ((Flags & LONG_TYPE) == 0 && Value < 0) {
|
||||
//
|
||||
// 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".
|
||||
// This assumption is made so the format string definition is compatible with the ANSI C
|
||||
// Specification for formatted strings. It is recommended that the Base Types be used
|
||||
// everywhere, but in this one case, compliance with ANSI C is more important, and
|
||||
// provides an implementation that is compatible with that largest possible set of CPU
|
||||
// architectures. This is why the type "unsigned int" is used in this one case.
|
||||
//
|
||||
Value = (unsigned int)Value;
|
||||
}
|
||||
}
|
||||
//
|
||||
// Convert Value to a reversed string
|
||||
//
|
||||
Count = InternalPrintLibValueToString (ValueBuffer, Value, Radix) - ValueBuffer;
|
||||
if (Value == 0 && Precision == 0) {
|
||||
Count = 0;
|
||||
}
|
||||
ArgumentString = (CHAR8 *)ValueBuffer + Count;
|
||||
|
||||
Digits = Count % 3;
|
||||
if (Digits != 0) {
|
||||
Digits = 3 - Digits;
|
||||
}
|
||||
if (Comma && Count != 0) {
|
||||
Count += ((Count - 1) / 3);
|
||||
}
|
||||
if (Prefix != 0) {
|
||||
Count++;
|
||||
Precision++;
|
||||
}
|
||||
Flags |= ARGUMENT_REVERSED;
|
||||
ZeroPad = TRUE;
|
||||
if ((Flags & PREFIX_ZERO) != 0) {
|
||||
if ((Flags & LEFT_JUSTIFY) == 0) {
|
||||
if ((Flags & PAD_TO_WIDTH) != 0) {
|
||||
if ((Flags & PRECISION) == 0) {
|
||||
Precision = Width;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 's':
|
||||
case 'S':
|
||||
Flags |= ARGUMENT_UNICODE;
|
||||
//
|
||||
// break skipped on purpose
|
||||
//
|
||||
case 'a':
|
||||
if (BaseListMarker == NULL) {
|
||||
ArgumentString = VA_ARG (VaListMarker, CHAR8 *);
|
||||
} else {
|
||||
ArgumentString = BASE_ARG (BaseListMarker, CHAR8 *);
|
||||
}
|
||||
if (ArgumentString == NULL) {
|
||||
Flags &= (~ARGUMENT_UNICODE);
|
||||
ArgumentString = "<null string>";
|
||||
}
|
||||
//
|
||||
// Set the default precision for string to be zero if not specified.
|
||||
//
|
||||
if ((Flags & PRECISION) == 0) {
|
||||
Precision = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
if (BaseListMarker == NULL) {
|
||||
Character = VA_ARG (VaListMarker, UINTN) & 0xffff;
|
||||
} else {
|
||||
Character = BASE_ARG (BaseListMarker, UINTN) & 0xffff;
|
||||
}
|
||||
ArgumentString = (CHAR8 *)&Character;
|
||||
Flags |= ARGUMENT_UNICODE;
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
if (BaseListMarker == NULL) {
|
||||
TmpGuid = VA_ARG (VaListMarker, GUID *);
|
||||
} else {
|
||||
TmpGuid = BASE_ARG (BaseListMarker, GUID *);
|
||||
}
|
||||
if (TmpGuid == NULL) {
|
||||
ArgumentString = "<null guid>";
|
||||
} else {
|
||||
GuidData1 = ReadUnaligned32 (&(TmpGuid->Data1));
|
||||
GuidData2 = ReadUnaligned16 (&(TmpGuid->Data2));
|
||||
GuidData3 = ReadUnaligned16 (&(TmpGuid->Data3));
|
||||
InternalPrintLibSPrint (
|
||||
ValueBuffer,
|
||||
MAXIMUM_VALUE_CHARACTERS,
|
||||
0,
|
||||
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
GuidData1,
|
||||
GuidData2,
|
||||
GuidData3,
|
||||
TmpGuid->Data4[0],
|
||||
TmpGuid->Data4[1],
|
||||
TmpGuid->Data4[2],
|
||||
TmpGuid->Data4[3],
|
||||
TmpGuid->Data4[4],
|
||||
TmpGuid->Data4[5],
|
||||
TmpGuid->Data4[6],
|
||||
TmpGuid->Data4[7]
|
||||
);
|
||||
ArgumentString = ValueBuffer;
|
||||
}
|
||||
break;
|
||||
|
||||
case 't':
|
||||
if (BaseListMarker == NULL) {
|
||||
TmpTime = VA_ARG (VaListMarker, TIME *);
|
||||
} else {
|
||||
TmpTime = BASE_ARG (BaseListMarker, TIME *);
|
||||
}
|
||||
if (TmpTime == NULL) {
|
||||
ArgumentString = "<null time>";
|
||||
} else {
|
||||
InternalPrintLibSPrint (
|
||||
ValueBuffer,
|
||||
MAXIMUM_VALUE_CHARACTERS,
|
||||
0,
|
||||
"%02d/%02d/%04d %02d:%02d",
|
||||
TmpTime->Month,
|
||||
TmpTime->Day,
|
||||
TmpTime->Year,
|
||||
TmpTime->Hour,
|
||||
TmpTime->Minute
|
||||
);
|
||||
ArgumentString = ValueBuffer;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'r':
|
||||
if (BaseListMarker == NULL) {
|
||||
Status = VA_ARG (VaListMarker, RETURN_STATUS);
|
||||
} else {
|
||||
Status = BASE_ARG (BaseListMarker, RETURN_STATUS);
|
||||
}
|
||||
ArgumentString = ValueBuffer;
|
||||
if (RETURN_ERROR (Status)) {
|
||||
//
|
||||
// Clear error bit
|
||||
//
|
||||
Index = Status & ~MAX_BIT;
|
||||
if (Index > 0 && Index <= ERROR_STATUS_NUMBER) {
|
||||
ArgumentString = mStatusString [Index + WARNING_STATUS_NUMBER];
|
||||
}
|
||||
} else {
|
||||
Index = Status;
|
||||
if (Index <= WARNING_STATUS_NUMBER) {
|
||||
ArgumentString = mStatusString [Index];
|
||||
}
|
||||
}
|
||||
if (ArgumentString == ValueBuffer) {
|
||||
InternalPrintLibSPrint ((CHAR8 *) ValueBuffer, MAXIMUM_VALUE_CHARACTERS, 0, "%08X", Status);
|
||||
}
|
||||
break;
|
||||
|
||||
case '\r':
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
if (FormatCharacter == '\n') {
|
||||
//
|
||||
// Translate '\r\n' to '\r\n'
|
||||
//
|
||||
ArgumentString = "\r\n";
|
||||
} else {
|
||||
//
|
||||
// Translate '\r' to '\r'
|
||||
//
|
||||
ArgumentString = "\r";
|
||||
Format -= BytesPerFormatCharacter;
|
||||
}
|
||||
break;
|
||||
|
||||
case '\n':
|
||||
//
|
||||
// Translate '\n' to '\r\n' and '\n\r' to '\r\n'
|
||||
//
|
||||
ArgumentString = "\r\n";
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
if (FormatCharacter != '\r') {
|
||||
Format -= BytesPerFormatCharacter;
|
||||
}
|
||||
break;
|
||||
|
||||
case '%':
|
||||
default:
|
||||
//
|
||||
// if the type is '%' or unknown, then print it to the screen
|
||||
//
|
||||
ArgumentString = (CHAR8 *)&FormatCharacter;
|
||||
Flags |= ARGUMENT_UNICODE;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case '\r':
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
if (FormatCharacter == '\n') {
|
||||
//
|
||||
// Translate '\r\n' to '\r\n'
|
||||
//
|
||||
ArgumentString = "\r\n";
|
||||
} else {
|
||||
//
|
||||
// Translate '\r' to '\r'
|
||||
//
|
||||
ArgumentString = "\r";
|
||||
Format -= BytesPerFormatCharacter;
|
||||
}
|
||||
break;
|
||||
|
||||
case '\n':
|
||||
//
|
||||
// Translate '\n' to '\r\n' and '\n\r' to '\r\n'
|
||||
//
|
||||
ArgumentString = "\r\n";
|
||||
Format += BytesPerFormatCharacter;
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
if (FormatCharacter != '\r') {
|
||||
Format -= BytesPerFormatCharacter;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
ArgumentString = (CHAR8 *)&FormatCharacter;
|
||||
Flags |= ARGUMENT_UNICODE;
|
||||
break;
|
||||
}
|
||||
|
||||
//
|
||||
// Retrieve the ArgumentString attriubutes
|
||||
//
|
||||
if ((Flags & ARGUMENT_UNICODE) != 0) {
|
||||
ArgumentMask = 0xffff;
|
||||
BytesPerArgumentCharacter = 2;
|
||||
} else {
|
||||
ArgumentMask = 0xff;
|
||||
BytesPerArgumentCharacter = 1;
|
||||
}
|
||||
if ((Flags & ARGUMENT_REVERSED) != 0) {
|
||||
BytesPerArgumentCharacter = -BytesPerArgumentCharacter;
|
||||
} else {
|
||||
//
|
||||
// Compute the number of characters in ArgumentString and store it in Count
|
||||
// ArgumentString is either null-terminated, or it contains Precision characters
|
||||
//
|
||||
for (Count = 0; Count < Precision || ((Flags & PRECISION) == 0); Count++) {
|
||||
ArgumentCharacter = ((ArgumentString[Count * BytesPerArgumentCharacter] & 0xff) | ((ArgumentString[Count * BytesPerArgumentCharacter + 1]) << 8)) & ArgumentMask;
|
||||
if (ArgumentCharacter == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Precision < Count) {
|
||||
Precision = Count;
|
||||
}
|
||||
|
||||
//
|
||||
// Pad before the string
|
||||
//
|
||||
if ((Flags & (PAD_TO_WIDTH | LEFT_JUSTIFY)) == (PAD_TO_WIDTH)) {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Width - Precision) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
|
||||
if (ZeroPad) {
|
||||
if (Prefix != 0) {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Precision - Count) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, '0', BytesPerOutputCharacter);
|
||||
}
|
||||
} else {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Precision - Count) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
if (Prefix != 0) {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Output the Prefix character if it is present
|
||||
//
|
||||
Index = 0;
|
||||
if (Prefix != 0) {
|
||||
Index++;
|
||||
}
|
||||
|
||||
//
|
||||
// Copy the string into the output buffer performing the required type conversions
|
||||
//
|
||||
while (Index < Count) {
|
||||
ArgumentCharacter = ((*ArgumentString & 0xff) | (*(ArgumentString + 1) << 8)) & ArgumentMask;
|
||||
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ArgumentCharacter, BytesPerOutputCharacter);
|
||||
}
|
||||
ArgumentString += BytesPerArgumentCharacter;
|
||||
Index++;
|
||||
if (Comma) {
|
||||
Digits++;
|
||||
if (Digits == 3) {
|
||||
Digits = 0;
|
||||
Index++;
|
||||
if (Index < Count) {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ',', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Pad after the string
|
||||
//
|
||||
if ((Flags & (PAD_TO_WIDTH | LEFT_JUSTIFY)) == (PAD_TO_WIDTH | LEFT_JUSTIFY)) {
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Width - Precision) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
// Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Get the next character from the format string
|
||||
//
|
||||
Format += BytesPerFormatCharacter;
|
||||
|
||||
//
|
||||
// Get the next character from the format string
|
||||
//
|
||||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
}
|
||||
|
||||
return (LengthToReturn / BytesPerOutputCharacter);
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLength (
|
||||
IN CONST CHAR16 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
)
|
||||
{
|
||||
ASSERT(FormatString != NULL);
|
||||
return InternalPrintLibSPrintMarker (NULL, 0, FORMAT_UNICODE | OUTPUT_UNICODE | COUNT_ONLY_NO_PRINT, (CHAR8 *)FormatString, Marker, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If FormatString is NULL, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated ASCII format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLengthAsciiFormat (
|
||||
IN CONST CHAR8 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
)
|
||||
{
|
||||
ASSERT(FormatString != NULL);
|
||||
return InternalPrintLibSPrintMarker (NULL, 0, OUTPUT_UNICODE | COUNT_ONLY_NO_PRINT, (CHAR8 *)FormatString, Marker, NULL);
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
Provides services to print a formatted string to a buffer. All combinations of
|
||||
Unicode and ASCII strings are supported.
|
||||
|
||||
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials are licensed and made available under
|
||||
the terms and conditions of the BSD License that accompanies this distribution.
|
||||
The full text of the license may be found at
|
||||
|
@ -806,4 +806,43 @@ AsciiValueToString (
|
|||
IN UINTN Width
|
||||
);
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If Format is NULL, then ASSERT().
|
||||
If Format is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLength (
|
||||
IN CONST CHAR16 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
);
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If Format is NULL, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated ASCII format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLengthAsciiFormat (
|
||||
IN CONST CHAR8 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is
|
||||
defined, then debug and assert related macros wrapped by it are the NULL implementations.
|
||||
|
||||
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials are licensed and made available under
|
||||
the terms and conditions of the BSD License that accompanies this distribution.
|
||||
The full text of the license may be found at
|
||||
|
@ -1334,4 +1334,64 @@ EfiLibInstallAllDriverProtocols2 (
|
|||
IN CONST EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL
|
||||
);
|
||||
|
||||
/**
|
||||
Appends a formatted Unicode string to a Null-terminated Unicode string
|
||||
|
||||
This function appends a formatted Unicode string to the Null-terminated
|
||||
Unicode string specified by String. String is optional and may be NULL.
|
||||
Storage for the formatted Unicode string returned is allocated using
|
||||
AllocatePool(). The pointer to the appended string is returned. The caller
|
||||
is responsible for freeing the returned string.
|
||||
|
||||
If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] String A Null-terminated Unicode string.
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@retval NULL There was not enough available memory.
|
||||
@return Null-terminated Unicode string is that is the formatted
|
||||
string appended to String.
|
||||
**/
|
||||
CHAR16*
|
||||
EFIAPI
|
||||
CatVSPrint (
|
||||
IN CHAR16 *String, OPTIONAL
|
||||
IN CONST CHAR16 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
);
|
||||
|
||||
/**
|
||||
Appends a formatted Unicode string to a Null-terminated Unicode string
|
||||
|
||||
This function appends a formatted Unicode string to the Null-terminated
|
||||
Unicode string specified by String. String is optional and may be NULL.
|
||||
Storage for the formatted Unicode string returned is allocated using
|
||||
AllocatePool(). The pointer to the appended string is returned. The caller
|
||||
is responsible for freeing the returned string.
|
||||
|
||||
If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] String A Null-terminated Unicode string.
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] ... The variable argument list whose contents are
|
||||
accessed based on the format string specified by
|
||||
FormatString.
|
||||
|
||||
@retval NULL There was not enough available memory.
|
||||
@return Null-terminated Unicode string is that is the formatted
|
||||
string appended to String.
|
||||
**/
|
||||
CHAR16 *
|
||||
EFIAPI
|
||||
CatSPrint (
|
||||
IN CHAR16 *String, OPTIONAL
|
||||
IN CONST CHAR16 *FormatString,
|
||||
...
|
||||
);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/** @file
|
||||
Base Print Library instance implementation.
|
||||
|
||||
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -694,3 +694,51 @@ AsciiValueToString (
|
|||
{
|
||||
return BasePrintLibConvertValueToString (Buffer, Flags, Value, Width, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLength (
|
||||
IN CONST CHAR16 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
)
|
||||
{
|
||||
ASSERT(FormatString != NULL);
|
||||
ASSERT_UNICODE_BUFFER (FormatString);
|
||||
return BasePrintLibSPrintMarker (NULL, 0, FORMAT_UNICODE | OUTPUT_UNICODE | COUNT_ONLY_NO_PRINT, (CHAR8 *)FormatString, Marker, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the number of characters that would be produced by if the formatted
|
||||
output were produced not including the Null-terminator.
|
||||
|
||||
If FormatString is NULL, then ASSERT().
|
||||
|
||||
@param[in] FormatString A Null-terminated ASCII format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@return The number of characters that would be produced, not including the
|
||||
Null-terminator.
|
||||
**/
|
||||
UINTN
|
||||
EFIAPI
|
||||
SPrintLengthAsciiFormat (
|
||||
IN CONST CHAR8 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
)
|
||||
{
|
||||
ASSERT(FormatString != NULL);
|
||||
return BasePrintLibSPrintMarker (NULL, 0, OUTPUT_UNICODE | COUNT_ONLY_NO_PRINT, (CHAR8 *)FormatString, Marker, NULL);
|
||||
}
|
||||
|
|
|
@ -275,16 +275,24 @@ BasePrintLibConvertValueToString (
|
|||
VA_LIST is used this routine allows the nesting of Vararg routines. Thus
|
||||
this is the main print working routine.
|
||||
|
||||
@param Buffer The character buffer to print the results of the parsing
|
||||
of Format into.
|
||||
@param BufferSize The maximum number of characters to put into buffer.
|
||||
@param Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE and OUTPUT_UNICODE set.
|
||||
@param Format A Null-terminated format string.
|
||||
@param VaListMarker VA_LIST style variable argument list consumed by processing Format.
|
||||
@param BaseListMarker BASE_LIST style variable argument list consumed by processing Format.
|
||||
If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.
|
||||
|
||||
@param[out] Buffer The character buffer to print the results of the
|
||||
parsing of Format into.
|
||||
@param[in] BufferSize The maximum number of characters to put into
|
||||
buffer.
|
||||
@param[in] Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE, OUTPUT_UNICODE,
|
||||
and COUNT_ONLY_NO_PRINT set.
|
||||
@param[in] Format A Null-terminated format string.
|
||||
@param[in] VaListMarker VA_LIST style variable argument list consumed by
|
||||
processing Format.
|
||||
@param[in] BaseListMarker BASE_LIST style variable argument list consumed
|
||||
by processing Format.
|
||||
|
||||
@return The number of characters printed not including the Null-terminator.
|
||||
If COUNT_ONLY_NO_PRINT was set returns the same, but without any
|
||||
modification to Buffer.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
|
@ -300,7 +308,7 @@ BasePrintLibSPrintMarker (
|
|||
CHAR8 *OriginalBuffer;
|
||||
CHAR8 *EndBuffer;
|
||||
CHAR8 ValueBuffer[MAXIMUM_VALUE_CHARACTERS];
|
||||
UINTN BytesPerOutputCharacter;
|
||||
UINT32 BytesPerOutputCharacter;
|
||||
UINTN BytesPerFormatCharacter;
|
||||
UINTN FormatMask;
|
||||
UINTN FormatCharacter;
|
||||
|
@ -326,18 +334,36 @@ BasePrintLibSPrintMarker (
|
|||
UINT32 GuidData1;
|
||||
UINT16 GuidData2;
|
||||
UINT16 GuidData3;
|
||||
UINT32 LengthToReturn;
|
||||
|
||||
if (BufferSize == 0) {
|
||||
return 0;
|
||||
//
|
||||
// If you change this code be sure to match the 2 versions of this function.
|
||||
// Nearly identical logic is found in the BasePrintLib and
|
||||
// DxePrintLibPrint2Protocol (both PrintLib instances).
|
||||
//
|
||||
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
if (BufferSize == 0) {
|
||||
Buffer = NULL;
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// We can run without a Buffer for counting only.
|
||||
//
|
||||
if (BufferSize == 0) {
|
||||
return 0;
|
||||
}
|
||||
ASSERT (Buffer != NULL);
|
||||
}
|
||||
ASSERT (Buffer != NULL);
|
||||
|
||||
if ((Flags & OUTPUT_UNICODE) != 0) {
|
||||
if (Flags & OUTPUT_UNICODE) {
|
||||
BytesPerOutputCharacter = 2;
|
||||
} else {
|
||||
BytesPerOutputCharacter = 1;
|
||||
}
|
||||
|
||||
LengthToReturn = 0;
|
||||
|
||||
//
|
||||
// Reserve space for the Null terminator.
|
||||
//
|
||||
|
@ -379,7 +405,7 @@ BasePrintLibSPrintMarker (
|
|||
//
|
||||
// Clear all the flag bits except those that may have been passed in
|
||||
//
|
||||
Flags &= (OUTPUT_UNICODE | FORMAT_UNICODE);
|
||||
Flags &= (OUTPUT_UNICODE | FORMAT_UNICODE | COUNT_ONLY_NO_PRINT);
|
||||
|
||||
//
|
||||
// Set the default width to zero, and the default precision to 1
|
||||
|
@ -816,18 +842,38 @@ BasePrintLibSPrintMarker (
|
|||
// Pad before the string
|
||||
//
|
||||
if ((Flags & (PAD_TO_WIDTH | LEFT_JUSTIFY)) == (PAD_TO_WIDTH)) {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Width - Precision) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
|
||||
if (ZeroPad) {
|
||||
if (Prefix != 0) {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Precision - Count) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, '0', BytesPerOutputCharacter);
|
||||
}
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, '0', BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, ' ', BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Precision - Count) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Precision - Count, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
if (Prefix != 0) {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, Prefix, BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -845,7 +891,11 @@ BasePrintLibSPrintMarker (
|
|||
while (Index < Count) {
|
||||
ArgumentCharacter = ((*ArgumentString & 0xff) | (*(ArgumentString + 1) << 8)) & ArgumentMask;
|
||||
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ArgumentCharacter, BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ArgumentCharacter, BytesPerOutputCharacter);
|
||||
}
|
||||
ArgumentString += BytesPerArgumentCharacter;
|
||||
Index++;
|
||||
if (Comma) {
|
||||
|
@ -854,7 +904,11 @@ BasePrintLibSPrintMarker (
|
|||
Digits = 0;
|
||||
Index++;
|
||||
if (Index < Count) {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ',', BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += (1 * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ',', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -864,7 +918,11 @@ BasePrintLibSPrintMarker (
|
|||
// Pad after the string
|
||||
//
|
||||
if ((Flags & (PAD_TO_WIDTH | LEFT_JUSTIFY)) == (PAD_TO_WIDTH | LEFT_JUSTIFY)) {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
LengthToReturn += ((Width - Precision) * BytesPerOutputCharacter);
|
||||
} else {
|
||||
Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Precision, ' ', BytesPerOutputCharacter);
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -878,6 +936,10 @@ BasePrintLibSPrintMarker (
|
|||
FormatCharacter = ((*Format & 0xff) | (*(Format + 1) << 8)) & FormatMask;
|
||||
}
|
||||
|
||||
if (Flags & COUNT_ONLY_NO_PRINT) {
|
||||
return (LengthToReturn / BytesPerOutputCharacter);
|
||||
}
|
||||
|
||||
//
|
||||
// Null terminate the Unicode or ASCII string
|
||||
//
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/** @file
|
||||
Base Print Library instance Internal Functions definition.
|
||||
|
||||
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
|
@ -24,15 +24,16 @@
|
|||
//
|
||||
// Print primitives
|
||||
//
|
||||
#define PREFIX_SIGN 0x02
|
||||
#define PREFIX_BLANK 0x04
|
||||
#define LONG_TYPE 0x10
|
||||
#define OUTPUT_UNICODE 0x40
|
||||
#define FORMAT_UNICODE 0x100
|
||||
#define PAD_TO_WIDTH 0x200
|
||||
#define ARGUMENT_UNICODE 0x400
|
||||
#define PRECISION 0x800
|
||||
#define ARGUMENT_REVERSED 0x1000
|
||||
#define PREFIX_SIGN BIT1
|
||||
#define PREFIX_BLANK BIT2
|
||||
#define LONG_TYPE BIT4
|
||||
#define OUTPUT_UNICODE BIT6
|
||||
#define FORMAT_UNICODE BIT8
|
||||
#define PAD_TO_WIDTH BIT9
|
||||
#define ARGUMENT_UNICODE BIT10
|
||||
#define PRECISION BIT11
|
||||
#define ARGUMENT_REVERSED BIT12
|
||||
#define COUNT_ONLY_NO_PRINT BIT13
|
||||
|
||||
//
|
||||
// Record date and time information
|
||||
|
@ -59,16 +60,24 @@ typedef struct {
|
|||
VA_LIST is used this routine allows the nesting of Vararg routines. Thus
|
||||
this is the main print working routine.
|
||||
|
||||
@param Buffer The character buffer to print the results of the parsing
|
||||
of Format into.
|
||||
@param BufferSize The maximum number of characters to put into buffer.
|
||||
@param Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE and OUTPUT_UNICODE set.
|
||||
@param Format A Null-terminated format string.
|
||||
@param VaListMarker VA_LIST style variable argument list consumed by processing Format.
|
||||
@param BaseListMarker BASE_LIST style variable argument list consumed by processing Format.
|
||||
If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.
|
||||
|
||||
@param[out] Buffer The character buffer to print the results of the
|
||||
parsing of Format into.
|
||||
@param[in] BufferSize The maximum number of characters to put into
|
||||
buffer.
|
||||
@param[in] Flags Initial flags value.
|
||||
Can only have FORMAT_UNICODE, OUTPUT_UNICODE,
|
||||
and COUNT_ONLY_NO_PRINT set.
|
||||
@param[in] Format A Null-terminated format string.
|
||||
@param[in] VaListMarker VA_LIST style variable argument list consumed by
|
||||
processing Format.
|
||||
@param[in] BaseListMarker BASE_LIST style variable argument list consumed
|
||||
by processing Format.
|
||||
|
||||
@return The number of characters printed not including the Null-terminator.
|
||||
If COUNT_ONLY_NO_PRINT was set returns the same, but without any
|
||||
modification to Buffer.
|
||||
|
||||
**/
|
||||
UINTN
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
Mde UEFI library API implementation.
|
||||
Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE
|
||||
|
||||
Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
|
@ -706,3 +706,97 @@ AsciiPrintXY (
|
|||
return ReturnNum;
|
||||
}
|
||||
|
||||
/**
|
||||
Appends a formatted Unicode string to a Null-terminated Unicode string
|
||||
|
||||
This function appends a formatted Unicode string to the Null-terminated
|
||||
Unicode string specified by String. String is optional and may be NULL.
|
||||
Storage for the formatted Unicode string returned is allocated using
|
||||
AllocatePool(). The pointer to the appended string is returned. The caller
|
||||
is responsible for freeing the returned string.
|
||||
|
||||
If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] String A Null-terminated Unicode string.
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] Marker VA_LIST marker for the variable argument list.
|
||||
|
||||
@retval NULL There was not enough available memory.
|
||||
@return Null-terminated Unicode string is that is the formatted
|
||||
string appended to String.
|
||||
**/
|
||||
CHAR16*
|
||||
EFIAPI
|
||||
CatVSPrint (
|
||||
IN CHAR16 *String, OPTIONAL
|
||||
IN CONST CHAR16 *FormatString,
|
||||
IN VA_LIST Marker
|
||||
)
|
||||
{
|
||||
UINTN CharactersRequired;
|
||||
UINTN SizeRequired;
|
||||
CHAR16 *BufferToReturn;
|
||||
|
||||
CharactersRequired = SPrintLength(FormatString, Marker);
|
||||
|
||||
if (String != NULL) {
|
||||
SizeRequired = StrSize(String) + (CharactersRequired * sizeof(CHAR16));
|
||||
} else {
|
||||
SizeRequired = sizeof(CHAR16) + (CharactersRequired * sizeof(CHAR16));
|
||||
}
|
||||
|
||||
BufferToReturn = AllocateZeroPool(SizeRequired);
|
||||
|
||||
if (BufferToReturn == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (String != NULL) {
|
||||
StrCpy(BufferToReturn, String);
|
||||
}
|
||||
|
||||
UnicodeVSPrint(BufferToReturn + StrLen(BufferToReturn), (CharactersRequired+1) * sizeof(CHAR16), FormatString, Marker);
|
||||
|
||||
ASSERT(StrSize(BufferToReturn)==SizeRequired);
|
||||
|
||||
return (BufferToReturn);
|
||||
}
|
||||
|
||||
/**
|
||||
Appends a formatted Unicode string to a Null-terminated Unicode string
|
||||
|
||||
This function appends a formatted Unicode string to the Null-terminated
|
||||
Unicode string specified by String. String is optional and may be NULL.
|
||||
Storage for the formatted Unicode string returned is allocated using
|
||||
AllocatePool(). The pointer to the appended string is returned. The caller
|
||||
is responsible for freeing the returned string.
|
||||
|
||||
If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().
|
||||
If FormatString is NULL, then ASSERT().
|
||||
If FormatString is not aligned on a 16-bit boundary, then ASSERT().
|
||||
|
||||
@param[in] String A Null-terminated Unicode string.
|
||||
@param[in] FormatString A Null-terminated Unicode format string.
|
||||
@param[in] ... The variable argument list whose contents are
|
||||
accessed based on the format string specified by
|
||||
FormatString.
|
||||
|
||||
@retval NULL There was not enough available memory.
|
||||
@return Null-terminated Unicode string is that is the formatted
|
||||
string appended to String.
|
||||
**/
|
||||
CHAR16 *
|
||||
EFIAPI
|
||||
CatSPrint (
|
||||
IN CHAR16 *String, OPTIONAL
|
||||
IN CONST CHAR16 *FormatString,
|
||||
...
|
||||
)
|
||||
{
|
||||
VA_LIST Marker;
|
||||
VA_START (Marker, FormatString);
|
||||
return (CatVSPrint(String, FormatString, Marker));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue