1. Update internal EfiPrint protocol to contain all print interfaces provided by PrintLib class of MdePkg. 2. Update SetupBrowserDxe driver to produce new EfiPrint protocol.

3. Update EdkDxePrintLib instance to implement all interfaces defined in PrintLib class based on new EfiPrint protocol.
4. Update Nt32Pkg platform.dsc to use EdkDxePrintLib instance for UEFI_APPLICATION modules.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4109 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 534 insertions, 81 deletions

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
index e2f4634cf1..8000b4ce7d 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2203,7 +2203,15 @@ Returns:
 }

 

 EFI_HANDLE          PrintHandle     = NULL;

-EFI_PRINT_PROTOCOL  mPrintProtocol  = { UnicodeVSPrint };

+EFI_PRINT_PROTOCOL  mPrintProtocol  = 

+{

+  UnicodeVSPrint,

+  UnicodeVSPrintAsciiFormat,

+  UnicodeValueToString,

+  AsciiVSPrint,

+  AsciiVSPrintUnicodeFormat,

+  AsciiValueToString

+};

 

 STATIC

 EFI_STATUS

diff --git a/MdeModulePkg/Include/Protocol/Print.h b/MdeModulePkg/Include/Protocol/Print.h
index c381295f31..b640cb0b2f 100644
--- a/MdeModulePkg/Include/Protocol/Print.h
+++ b/MdeModulePkg/Include/Protocol/Print.h
@@ -23,7 +23,7 @@ Abstract:
 #define __PPRINT_H__

 

 #define EFI_PRINT_PROTOCOL_GUID  \

-   { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0 } }

+   { 0x5bcc3dbc, 0x8c57, 0x450a, { 0xbb, 0xc, 0xa1, 0xc0, 0xbd, 0xde, 0x48, 0xc } }

 

 //

 // Forward reference for pure ANSI compatability

@@ -33,18 +33,67 @@ typedef struct _EFI_PRINT_PROTOCOL  EFI_PRINT_PROTOCOL;
 

 typedef

 UINTN

-(EFIAPI *EFI_VSPRINT) (

+(EFIAPI *UNI_VSPRINT) (

   OUT CHAR16        *StartOfBuffer,

   IN  UINTN         BufferSize,

   IN  CONST CHAR16  *FormatString,

   IN  VA_LIST       Marker

   );

 

+typedef

+UINTN
+(EFIAPI *UNI_VSPRINT_ASCII) (
+  OUT CHAR16       *StartOfBuffer,
+  IN  UINTN        BufferSize,
+  IN  CONST CHAR8  *FormatString,
+  IN  VA_LIST      Marker
+  );

+

+typedef

+UINTN
+(EFIAPI *VALUE_TO_UNISTRING) (
+  IN OUT CHAR16  *Buffer,
+  IN UINTN       Flags,
+  IN INT64       Value,
+  IN UINTN       Width
+  );

+

+typedef

+UINTN
+(EFIAPI *ASCII_VSPRINT) (
+  OUT CHAR8         *StartOfBuffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR8   *FormatString,
+  IN  VA_LIST       Marker
+  );

+

+typedef

+UINTN
+(EFIAPI *ASCII_VSPRINT_UNI) (
+  OUT CHAR8         *StartOfBuffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR16  *FormatString,
+  IN  VA_LIST       Marker
+  );

+

+typedef

+UINTN
+(EFIAPI *VALUE_TO_ASCIISTRING) (
+  IN OUT CHAR8  *Buffer,
+  IN UINTN      Flags,
+  IN INT64      Value,
+  IN UINTN      Width
+  );

+

 struct _EFI_PRINT_PROTOCOL {

-  EFI_VSPRINT                                   VSPrint;

+  UNI_VSPRINT               VSPrint;

+  UNI_VSPRINT_ASCII         UniVSPrintAscii;

+  VALUE_TO_UNISTRING        UniValueToString;                         

+  ASCII_VSPRINT             AsciiVSPrint;          

+  ASCII_VSPRINT_UNI         AsciiVSPrintUni;

+  VALUE_TO_ASCIISTRING      AsciiValueToString;

 };

 

-

 extern EFI_GUID gEfiPrintProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
index 5d781ebdda..2194015b8d 100644
--- a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
+++ b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
@@ -19,9 +19,6 @@ Abstract:
 

 --*/

 

-

-

-

 #include <PiDxe.h>

 

 #include <Protocol/Print.h>

@@ -31,39 +28,12 @@ Abstract:
 

 static EFI_PRINT_PROTOCOL  *gPrintProtocol = NULL;

 

-UINTN

-UnicodeVSPrint (

-  OUT CHAR16        *StartOfBuffer,

-  IN  UINTN         BufferSize,

-  IN  const CHAR16  *FormatString,

-  IN  VA_LIST       Marker

+EFI_STATUS

+EFIAPI

+InternalLocatePrintProtocol (

   )

-/*++

-

-Routine Description:

-

-  VSPrint function to process format and place the results in Buffer. Since a

-  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus

-  this is the main print working routine

-

-Arguments:

-

-  StartOfBuffer - Unicode buffer to print the results of the parsing of Format into.

-

-  BufferSize    - Maximum number of characters to put into buffer. Zero means

-                  no limit.

-

-  FormatString  - Unicode format string see file header for more details.

-

-  Marker        - Vararg list consumed by processing Format.

-

-Returns:

-

-  Number of characters printed.

-

---*/

 {

-  EFI_STATUS  Status;

+  EFI_STATUS  Status = EFI_SUCCESS;

 

   if (gPrintProtocol == NULL) {

     Status = gBS->LocateProtocol (

@@ -73,81 +43,506 @@ Returns:
                     );

     if (EFI_ERROR (Status)) {

       gPrintProtocol = NULL;

-    }

-    if (gPrintProtocol == NULL) {

-      return 0;

+      return Status;

     }

   }

+  

+  return EFI_SUCCESS;

+}

+

+/**

+  Produces a Null-terminated Unicode string in an output buffer based on 

+  a Null-terminated Unicode format string and a VA_LIST argument list

+  

+  Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer

+  and BufferSize.  

+  The Unicode string is produced by parsing the format string specified by FormatString.  

+  Arguments are pulled from the variable argument list specified by Marker based on the 

+  contents of the format string.  

+  The number of Unicode characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 1 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().

+  If BufferSize > 1 and FormatString is NULL, then ASSERT().

+  If BufferSize > 1 and FormatString is not aligned on a 16-bit boundary, then ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than 

+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string

+  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          Unicode string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  @param  Marker          VA_LIST marker for the variable argument list.

+  

+  @return The number of Unicode characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

+UINTN

+EFIAPI

+UnicodeVSPrint (

+  OUT CHAR16        *StartOfBuffer,

+  IN  UINTN         BufferSize,

+  IN  CONST CHAR16  *FormatString,

+  IN  VA_LIST       Marker

+  )

+{

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

+

   return gPrintProtocol->VSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

 }

 

+/**

+  Produces a Null-terminated Unicode string in an output buffer based on a Null-terminated 

+  Unicode format string and variable argument list.

+  

+  Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The Unicode string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list based on the contents of the format string.

+  The number of Unicode characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 1 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().

+  If BufferSize > 1 and FormatString is NULL, then ASSERT().

+  If BufferSize > 1 and FormatString is not aligned on a 16-bit boundary, then ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than 

+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string

+  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          Unicode string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  

+  @return The number of Unicode characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

 UINTN

+EFIAPI

 UnicodeSPrint (

   OUT CHAR16        *StartOfBuffer,

   IN  UINTN         BufferSize,

-  IN  const CHAR16  *FormatString,

+  IN  CONST CHAR16  *FormatString,

   ...

   )

-

 {

-  UINTN    Return;

-  VA_LIST  Marker;

+  VA_LIST Marker;

 

   VA_START (Marker, FormatString);

-  Return = UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

-  VA_END (Marker);

-  return Return;

+  return UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

 }

 

+/**

+  Produces a Null-terminated Unicode string in an output buffer based on a Null-terminated

+  ASCII format string and a VA_LIST argument list

+  

+  Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The Unicode string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list specified by Marker based on the 

+  contents of the format string.

+  The number of Unicode characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 1 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().

+  If BufferSize > 1 and FormatString is NULL, then ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than

+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string

+  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          Unicode string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  @param  Marker          VA_LIST marker for the variable argument list.

+  

+  @return The number of Unicode characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

 UINTN

-AsciiVSPrint (

-  OUT CHAR8         *StartOfBuffer,

-  IN  UINTN         BufferSize,

-  IN  const CHAR8   *FormatString,

-  IN  VA_LIST       Marker

+EFIAPI

+UnicodeVSPrintAsciiFormat (

+  OUT CHAR16       *StartOfBuffer,

+  IN  UINTN        BufferSize,

+  IN  CONST CHAR8  *FormatString,

+  IN  VA_LIST      Marker

   )

-/*++

-

-Routine Description:

-

-  VSPrint function to process format and place the results in Buffer. Since a

-  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus

-  this is the main print working routine

-

-Arguments:

-

-  StartOfBuffer - Unicode buffer to print the results of the parsing of Format into.

+{

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

 

-  BufferSize    - Maximum number of characters to put into buffer. Zero means

-                  no limit.

+  return gPrintProtocol->UniVSPrintAscii (StartOfBuffer, BufferSize, FormatString, Marker);

+}

 

-  FormatString  - Unicode format string see file header for more details.

+/**

+  Produces a Null-terminated Unicode string in an output buffer based on a Null-terminated 

+  ASCII format string and  variable argument list.

+  

+  Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The Unicode string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list based on the contents of the 

+  format string.

+  The number of Unicode characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 1 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().

+  If BufferSize > 1 and FormatString is NULL, then ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than

+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string

+  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          Unicode string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  

+  @return The number of Unicode characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

+UINTN

+EFIAPI

+UnicodeSPrintAsciiFormat (

+  OUT CHAR16       *StartOfBuffer,

+  IN  UINTN        BufferSize,

+  IN  CONST CHAR8  *FormatString,

+  ...

+  )

+{

+  VA_LIST Marker;

 

-  Marker        - Vararg list consumed by processing Format.

+  VA_START (Marker, FormatString);

+  return UnicodeVSPrintAsciiFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+}

 

-Returns:

+/**

+  Converts a decimal value to a Null-terminated Unicode string.

+  

+  Converts the decimal number specified by Value to a Null-terminated Unicode 

+  string specified by Buffer containing at most Width characters. No padding of spaces 

+  is ever performed. If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.

+  The number of Unicode characters in Buffer is returned not including the Null-terminator.

+  If the conversion contains more than Width characters, then only the first

+  Width characters are returned, and the total number of characters 

+  required to perform the conversion is returned.

+  Additional conversion parameters are specified in Flags.  

+  

+  The Flags bit LEFT_JUSTIFY is always ignored.

+  All conversions are left justified in Buffer.

+  If Width is 0, PREFIX_ZERO is ignored in Flags.

+  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas

+  are inserted every 3rd digit starting from the right.

+  If HEX_RADIX is set in Flags, then the output buffer will be 

+  formatted in hexadecimal format.

+  If Value is < 0 and HEX_RADIX is not set in Flags, then the fist character in Buffer is a '-'.

+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, 

+  then Buffer is padded with '0' characters so the combination of the optional '-' 

+  sign character, '0' characters, digit characters for Value, and the Null-terminator

+  add up to Width characters.

+  If both COMMA_TYPE and HEX_RADIX are set in Flags, then ASSERT().

+  If Buffer is NULL, then ASSERT().

+  If Buffer is not aligned on a 16-bit boundary, then ASSERT().

+  If unsupported bits are set in Flags, then ASSERT().

+  If both COMMA_TYPE and HEX_RADIX are set in Flags, then ASSERT().

+  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()

+

+  @param  Buffer  Pointer to the output buffer for the produced Null-terminated

+                  Unicode string.

+  @param  Flags   The bitmask of flags that specify left justification, zero 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 Buffer, not including

+                  the Null-terminator.

+  

+  @return The number of Unicode characters in Buffer not including the Null-terminator.

+

+**/

+UINTN

+EFIAPI

+UnicodeValueToString (

+  IN OUT CHAR16  *Buffer,

+  IN UINTN       Flags,

+  IN INT64       Value,

+  IN UINTN       Width

+  )

+{

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

 

-  Number of characters printed.

+  return gPrintProtocol->UniValueToString (Buffer, Flags, Value, Width);

+}

 

---*/

+/**

+  Produces a Null-terminated ASCII string in an output buffer based on a Null-terminated

+  ASCII format string and a VA_LIST argument list.

+  

+  Produces a Null-terminated ASCII string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The ASCII string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list specified by Marker based on 

+  the contents of the format string.

+  The number of ASCII characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is NULL, then ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than

+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string

+  contains more than PcdMaximumAsciiStringLength ASCII characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          ASCII string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  @param  Marker          VA_LIST marker for the variable argument list.

+  

+  @return The number of ASCII characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

+UINTN

+EFIAPI

+AsciiVSPrint (

+  OUT CHAR8         *StartOfBuffer,

+  IN  UINTN         BufferSize,

+  IN  CONST CHAR8   *FormatString,

+  IN  VA_LIST       Marker

+  )

 {

-  return 0;

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

+

+  return gPrintProtocol->AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

 }

 

+/**

+  Produces a Null-terminated ASCII string in an output buffer based on a Null-terminated

+  ASCII format string and  variable argument list.

+  

+  Produces a Null-terminated ASCII string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The ASCII string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list based on the contents of the 

+  format string.

+  The number of ASCII characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is NULL, then ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than

+  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string

+  contains more than PcdMaximumAsciiStringLength ASCII characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          ASCII string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  

+  @return The number of ASCII characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

 UINTN

+EFIAPI

 AsciiSPrint (

   OUT CHAR8        *StartOfBuffer,

   IN  UINTN        BufferSize,

-  IN  const CHAR8  *FormatString,

+  IN  CONST CHAR8  *FormatString,

   ...

   )

+{

+  VA_LIST Marker;

+

+  VA_START (Marker, FormatString);

+  return AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

+}

 

+/**

+  Produces a Null-terminated ASCII string in an output buffer based on a Null-terminated

+  ASCII format string and a VA_LIST argument list.

+  

+  Produces a Null-terminated ASCII string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The ASCII string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list specified by Marker based on 

+  the contents of the format string.

+  The number of ASCII characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is not aligned on a 16-bit boundary, then ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than

+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string

+  contains more than PcdMaximumAsciiStringLength ASCII characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          ASCII string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  @param  Marker          VA_LIST marker for the variable argument list.

+  

+  @return The number of ASCII characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

+UINTN

+EFIAPI

+AsciiVSPrintUnicodeFormat (

+  OUT CHAR8         *StartOfBuffer,

+  IN  UINTN         BufferSize,

+  IN  CONST CHAR16  *FormatString,

+  IN  VA_LIST       Marker

+  )

 {

-  UINTN    Return;

-  VA_LIST  Marker;

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

+

+  return gPrintProtocol->AsciiVSPrintUni (StartOfBuffer, BufferSize, FormatString, Marker);

+}

+

+/**

+  Produces a Null-terminated ASCII string in an output buffer based on a Null-terminated

+  ASCII format string and  variable argument list.

+  

+  Produces a Null-terminated ASCII string in the output buffer specified by StartOfBuffer

+  and BufferSize.

+  The ASCII string is produced by parsing the format string specified by FormatString.

+  Arguments are pulled from the variable argument list based on the contents of the 

+  format string.

+  The number of ASCII characters in the produced output buffer is returned not including

+  the Null-terminator.

+  If BufferSize is 0, then no output buffer is produced and 0 is returned.

+

+  If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is NULL, then ASSERT().

+  If BufferSize > 0 and FormatString is not aligned on a 16-bit boundary, then ASSERT().

+  If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than

+  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then

+  ASSERT().

+  If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string

+  contains more than PcdMaximumAsciiStringLength ASCII characters not including the

+  Null-terminator, then ASSERT().

+

+  @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 

+                          ASCII string.

+  @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.

+  @param  FormatString    Null-terminated Unicode format string.

+  

+  @return The number of ASCII characters in the produced output buffer not including the

+          Null-terminator.

+

+**/

+UINTN

+EFIAPI

+AsciiSPrintUnicodeFormat (

+  OUT CHAR8         *StartOfBuffer,

+  IN  UINTN         BufferSize,

+  IN  CONST CHAR16  *FormatString,

+  ...

+  )

+{

+  VA_LIST Marker;

 

   VA_START (Marker, FormatString);

-  Return = AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

-  VA_END (Marker);

-  return Return;

+  return AsciiVSPrintUnicodeFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+}

+

+

+/**

+  Converts a decimal value to a Null-terminated ASCII string.

+  

+  Converts the decimal number specified by Value to a Null-terminated ASCII string 

+  specified by Buffer containing at most Width characters. No padding of spaces 

+  is ever performed.

+  If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.

+  The number of ASCII characters in Buffer is returned not including the Null-terminator.

+  If the conversion contains more than Width characters, then only the first Width

+  characters are returned, and the total number of characters required to perform

+  the conversion is returned.

+  Additional conversion parameters are specified in Flags.  

+  The Flags bit LEFT_JUSTIFY is always ignored.

+  All conversions are left justified in Buffer.

+  If Width is 0, PREFIX_ZERO is ignored in Flags.

+  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas

+  are inserted every 3rd digit starting from the right.

+  If HEX_RADIX is set in Flags, then the output buffer will be 

+  formatted in hexadecimal format.

+  If Value is < 0 and HEX_RADIX is not set in Flags, then the fist character in Buffer is a '-'.

+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, 

+  then Buffer is padded with '0' characters so the combination of the optional '-' 

+  sign character, '0' characters, digit characters for Value, and the Null-terminator

+  add up to Width characters.

+  

+  If Buffer is NULL, then ASSERT().

+  If unsupported bits are set in Flags, then ASSERT().

+  If both COMMA_TYPE and HEX_RADIX are set in Flags, then ASSERT().

+  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()

+

+  @param  Buffer  Pointer to the output buffer for the produced Null-terminated

+                  ASCII string.

+  @param  Flags   The bitmask of flags that specify left justification, zero 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 Buffer, not including

+                  the Null-terminator.

+  

+  @return The number of ASCII characters in Buffer not including the Null-terminator.

+

+**/

+UINTN

+EFIAPI

+AsciiValueToString (

+  IN OUT CHAR8  *Buffer,

+  IN UINTN      Flags,

+  IN INT64      Value,

+  IN UINTN      Width

+  )

+{

+  if (InternalLocatePrintProtocol() != EFI_SUCCESS) {

+    return 0;

+  }

+

+  return gPrintProtocol->AsciiValueToString (Buffer, Flags, Value, Width);

 }

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index f680666261..746d1492c4 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -69,7 +69,7 @@
 

   gEfiCapsuleArchProtocolGuid    = { 0x5053697E, 0x2EBC, 0x4819, { 0x90, 0xD9, 0x05, 0x80, 0xDE, 0xEE, 0x57, 0x54 }}

   gEfiLoadPeImageProtocolGuid    = { 0x5CB5C776, 0x60D5, 0x45EE, { 0x88, 0x3C, 0x45, 0x27, 0x08, 0xCD, 0x74, 0x3F }}

-  gEfiPrintProtocolGuid          = { 0xDF2D868E, 0x32FC, 0x4CF0, { 0x8E, 0x6B, 0xFF, 0xD9, 0x5D, 0x13, 0x43, 0xD0 }}

+  gEfiPrintProtocolGuid          = { 0x5bcc3dbc, 0x8c57, 0x450a, { 0xbb, 0x0c, 0xa1, 0xc0, 0xbd, 0xde, 0x48, 0x0c }}

   gEfiGenericMemTestProtocolGuid = { 0x309DE7F1, 0x7F5E, 0x4ACE, { 0xB4, 0x9C, 0x53, 0x1B, 0xE5, 0xAA, 0x95, 0xEF }}

   gEfiDiskInfoProtocolGuid       = { 0xD432A67F, 0x14DC, 0x484B, { 0xB3, 0xBB, 0x3F, 0x02, 0x91, 0x84, 0x93, 0x27 }}

   gEfiFvbExtensionProtocolGuid   = { 0x53A4C71B, 0xB581, 0x4170, { 0x91, 0xB3, 0x8D, 0xB8, 0x7A, 0x4B, 0x5C, 0x46 }}

diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
index de3e68ea2f..b8a076083d 100644
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -58,7 +58,7 @@ InternalPrint (
 

   Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);

 

-  if (Console != NULL) {

+  if (Console != NULL && Return > 0) {

     //

     // To be extra safe make sure Console has been initialized

     //

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 08a624fba5..6404f7150c 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -216,6 +216,7 @@
   WinNtLib|Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf

   OemHookStatusCodeLib|Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf

   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

+  PrintLib|MdeModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.inf

 

 

 ################################################################################