ShellPkg: smbiosview shows wrong information for Type 27.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / EditInputBar.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
index 978ce7f13a1f403c7cde1dcd4368fb26696f5d3c..5c43ffcd9d8aabd1cb9af792250bc86ee27912ea 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implements inputbar interface functions.\r
 \r
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved. <BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -103,7 +103,7 @@ InputBarPrintInput (
 \r
 typedef struct {\r
   UINT32  Foreground : 4;\r
-  UINT32  Background : 4;\r
+  UINT32  Background : 3;\r
 } INPUT_BAR_COLOR_ATTRIBUTES;\r
 \r
 typedef union {\r
@@ -133,8 +133,6 @@ InputBarRefresh (
   UINTN                   Size;\r
   EFI_STATUS              Status;\r
   BOOLEAN                 NoDisplay;\r
-  UINTN                   Limit;\r
-  UINTN                   mPromptLen;\r
   UINTN                   EventIndex;\r
   UINTN                   CursorRow;\r
   UINTN                   CursorCol;\r
@@ -151,10 +149,11 @@ InputBarRefresh (
   CursorCol             = gST->ConOut->Mode->CursorColumn;\r
   CursorRow             = gST->ConOut->Mode->CursorRow;\r
   Orig.Data             = gST->ConOut->Mode->Attribute;\r
-  New.Colors.Foreground = Orig.Colors.Background;\r
-  New.Colors.Background = Orig.Colors.Foreground;\r
+  New.Data              = 0;\r
+  New.Colors.Foreground = Orig.Colors.Background & 0xF;\r
+  New.Colors.Background = Orig.Colors.Foreground & 0x7;\r
 \r
-  gST->ConOut->SetAttribute (gST->ConOut, New.Data);\r
+  gST->ConOut->SetAttribute (gST->ConOut, New.Data & 0x7F);\r
 \r
   //\r
   // clear input bar\r
@@ -164,12 +163,6 @@ InputBarRefresh (
   gST->ConOut->SetCursorPosition (gST->ConOut, 0, LastRow - 1);\r
   ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gShellDebug1HiiHandle, mPrompt);\r
 \r
-  //\r
-  // that's the maximum input length that can be displayed on screen\r
-  //\r
-  mPromptLen = StrLen (mPrompt);\r
-  Limit     = LastColumn - mPromptLen;\r
-\r
   //\r
   // this is a selection mPrompt, cursor will stay in edit area\r
   // actually this is for search , search/replace\r