From c17c4a1ffdc1894a5c13a67229c22fa6c2c99b93 Mon Sep 17 00:00:00 2001
From: Qiu Shumin <shumin.qiu@intel.com>
Date: Tue, 9 Jun 2015 02:29:37 +0000
Subject: ShellPkg\Application\Shell: Clean start row information after the
 console has been Reset or SetMode.

OriginalStartRow and CurrentStartRow should be initialized after new mode is set.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Signed-off-by: Eric Jin <eric.jin@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17584 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Application/Shell/ConsoleLogger.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'ShellPkg/Application/Shell')

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 75469d9b06..06f9686671 100644
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -2,7 +2,7 @@
   Provides interface to shell console logger.
 
   (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2015, 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
@@ -410,6 +410,10 @@ ConsoleLoggerReset (
   //
   if (!EFI_ERROR (Status)) {
     ConsoleLoggerResetBuffers(ConsoleInfo);
+    if (ExtendedVerification == TRUE) {
+      ConsoleInfo->OriginalStartRow = 0;
+      ConsoleInfo->CurrentStartRow = 0;
+    }
   }
 
   return Status;
@@ -963,10 +967,13 @@ ConsoleLoggerSetMode (
   // Check that the buffers are still correct for logging
   //
   if (!EFI_ERROR (Status)) {
-    ConsoleInfo->OurConOut.Mode = gST->ConOut->Mode;
+    ConsoleInfo->OurConOut.Mode = ConsoleInfo->OldConOut->Mode;
     ConsoleLoggerResetBuffers(ConsoleInfo);
+    ConsoleInfo->OriginalStartRow = 0;
+    ConsoleInfo->CurrentStartRow = 0;
+    ConsoleInfo->OurConOut.ClearScreen (&ConsoleInfo->OurConOut);
   }
-
+   
   return Status;
 }
 
-- 
cgit v1.2.3