correct on bug in DebugLib instance.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4321 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2007-11-22 08:16:50 +00:00
parent 4cc9af6c58
commit fe123a5e88
2 changed files with 13 additions and 4 deletions

View File

@ -41,6 +41,7 @@ DebugPrint (
) )
{ {
CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
CHAR8 AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH];
VA_LIST Marker; VA_LIST Marker;
// //
@ -59,9 +60,11 @@ DebugPrint (
// Convert the DEBUG() message to a Unicode String // Convert the DEBUG() message to a Unicode String
// //
VA_START (Marker, Format); VA_START (Marker, Format);
UnicodeVSPrintAsciiFormat (Buffer, sizeof (Buffer), Format, Marker); AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, Marker);
AsciiStrToUnicodeStr (AsciiBuffer, Buffer);
VA_END (Marker); VA_END (Marker);
// //
// Send the print string to the Console Output device // Send the print string to the Console Output device
// //
@ -103,11 +106,13 @@ DebugAssert (
) )
{ {
CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
CHAR8 AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH];
// //
// Generate the ASSERT() message in Unicode format // Generate the ASSERT() message in Unicode format
// //
UnicodeSPrintAsciiFormat (Buffer, sizeof (Buffer), "ASSERT %s(%d): %s\n", FileName, LineNumber, Description); AsciiSPrint (AsciiBuffer, sizeof (AsciiBuffer), "ASSERT %a(%d): %a\n", FileName, LineNumber, Description);
AsciiStrToUnicodeStr (AsciiBuffer, Buffer);
// //
// Send the print string to the Console Output device // Send the print string to the Console Output device

View File

@ -41,6 +41,7 @@ DebugPrint (
) )
{ {
CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
CHAR8 AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH];
VA_LIST Marker; VA_LIST Marker;
// //
@ -59,7 +60,8 @@ DebugPrint (
// Convert the DEBUG() message to a Unicode String // Convert the DEBUG() message to a Unicode String
// //
VA_START (Marker, Format); VA_START (Marker, Format);
UnicodeVSPrintAsciiFormat (Buffer, sizeof (Buffer), Format, Marker); AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, Marker);
AsciiStrToUnicodeStr (AsciiBuffer, Buffer);
VA_END (Marker); VA_END (Marker);
// //
@ -103,11 +105,13 @@ DebugAssert (
) )
{ {
CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
CHAR8 AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH];
// //
// Generate the ASSERT() message in Unicode format // Generate the ASSERT() message in Unicode format
// //
UnicodeSPrintAsciiFormat (Buffer, sizeof (Buffer), "ASSERT %s(%d): %s\n", FileName, LineNumber, Description); AsciiSPrint (AsciiBuffer, sizeof (AsciiBuffer), "ASSERT %a(%d): %a\n", FileName, LineNumber, Description);
AsciiStrToUnicodeStr (AsciiBuffer, Buffer);
// //
// Send the print string to the Standard Error device // Send the print string to the Standard Error device