Add ASSERT() conditions to UEFI Library Print() and AsciiPrint() functions if gST->ConOut is NULL.

Add ASSERT() conditions to UEFI Library ErrorPrint() and AsciiErrorPrint() functions if gST->StdErr is NULL.
Add ASSERT() conditions to UEFI Library PrintXY() and AsciiPrintXY() gST->ConsoleOutputHandle is NULL.
Update Print(), AsciiPrint(), ErrorPrint(), AsciiErrorPrint() to return 0 if the Simple Text Output Protocol OutputString() call returns an error.



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

1 files changed, 6 insertions, 0 deletions

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index 6d557e11ca..5c28776277 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -986,6 +986,7 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

   If Format is NULL, then ASSERT().

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

+  If gST->ConOut is NULL, then ASSERT().

 

   @param Format   A null-terminated Unicode format string.

   @param ...      The variable argument list whose contents are accessed based 

@@ -1012,6 +1013,7 @@ Print (
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

   If Format is NULL, then ASSERT().

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

+  If gST->StdErr is NULL, then ASSERT().

 

   @param Format   A null-terminated Unicode format string.

   @param ...      The variable argument list whose contents are accessed based 

@@ -1037,6 +1039,7 @@ ErrorPrint (
   string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

   If Format is NULL, then ASSERT().

+  If gST->ConOut is NULL, then ASSERT().

 

   @param Format   A null-terminated ASCII format string.

   @param ...      The variable argument list whose contents are accessed based 

@@ -1062,6 +1065,7 @@ AsciiPrint (
   string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

   If Format is NULL, then ASSERT().

+  If gST->StdErr is NULL, then ASSERT().

 

   @param Format   A null-terminated ASCII format string.

   @param ...      The variable argument list whose contents are accessed based 

@@ -1098,6 +1102,7 @@ AsciiErrorPrint (
   string is printed, and 0 is returned.

   If Format is NULL, then ASSERT().

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

+  If gST->ConsoleOutputHandle is NULL, then ASSERT().

 

   @param  PointX       X coordinate to print the string.

   @param  PointY       Y coordinate to print the string.

@@ -1147,6 +1152,7 @@ PrintXY (
   If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no 

   string is printed, and 0 is returned.

   If Format is NULL, then ASSERT().

+  If gST->ConsoleOutputHandle is NULL, then ASSERT().

 

   @param  PointX       X coordinate to print the string.

   @param  PointY       Y coordinate to print the string.