1. Fixed bugs in DxeNetLib to meet consistence with network module DriverBinding...

[mirror_edk2.git] / MdeModulePkg / Universal / Console / ConSplitterDxe / ConSplitterGraphics.c

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 3f720ac380aef0f4a94bd3cc6ace17932438a9b4..2c66a44ad04726bc4f54ece4ccc69a7f313e4de1 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -1350,6 +1350,7 @@ DevNullTextOutSetMode (
 --*/\r
 {\r
   UINTN                         Size;\r
+  INT32                         CurrentMode;\r
   UINTN                         Row;\r
   UINTN                         Column;\r
   TEXT_OUT_SPLITTER_QUERY_DATA  *Mode;\r
@@ -1357,8 +1358,14 @@ DevNullTextOutSetMode (
   //\r
   // No extra check for ModeNumber here, as it has been checked in\r
   // ConSplitterTextOutSetMode. And mode 0 should always be supported.\r
+  // Row and Column should be fetched from intersection map.\r
   //\r
-  Mode    = &(Private->TextOutQueryData[ModeNumber]);\r
+  if (Private->TextOutModeMap != NULL) {\r
+    CurrentMode = *(Private->TextOutModeMap + Private->TextOutListCount * ModeNumber);\r
+  } else {\r
+    CurrentMode = (INT32)(ModeNumber);\r
+  }\r
+  Mode    = &(Private->TextOutQueryData[CurrentMode]);\r
   Row     = Mode->Rows;\r
   Column  = Mode->Columns;\r
 \r