From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 2B785941B4B for ; Tue, 26 Sep 2023 18:36:28 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=KuiBPr8ETJTouhqBxfW5OmLjjb4yRVF//SexP30W2JU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1695753386; v=1; b=RSk0/WBGS4LosZihG22Z0uuE1eam6ZEAGrI7Fa3yzerllzBbTxBnAVbN1adk7aIhtOXI07aP LgqsODRtVTgzkEUXjc0lCerpd82V3aZ1N3mFkFlQ2htUBTWfiwROO1qzM31guzOG6iEpWYtP74m pR/do+ALtvh/ncId7HseLIeM= X-Received: by 127.0.0.2 with SMTP id iYQYYY7687511xZTjoyj1biA; Tue, 26 Sep 2023 11:36:26 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.27274.1695753385910650769 for ; Tue, 26 Sep 2023 11:36:26 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="378918240" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="378918240" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 11:36:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="752277609" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="752277609" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.72]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 11:36:24 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Andrew Fish , Ray Ni , Michael D Kinney , Chasel Chiu Subject: [edk2-devel] [PATCH v1] EmulatorPkg: Fix Terminal Issues Date: Tue, 26 Sep 2023 11:36:01 -0700 Message-Id: <20230926183601.2974-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: DJ7rJw9lOLYlvtqzuu5hhMiZx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="RSk0/WBG"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io After running EmulatorPkg, one will notice that their terminal acts strangely. This is caused by the EmulatorPkg Host changing the terminal mode and not restoring the original mode, which is now fixed. Cc: Andrew Fish Cc: Ray Ni Cc: Michael D Kinney Cc: Chasel Chiu Signed-off-by: Nate DeSimone --- EmulatorPkg/Unix/Host/EmuThunk.c | 16 ++++++++++++- EmulatorPkg/Win/Host/WinThunk.c | 40 +++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c index 6422f056a6..e6879db650 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -9,7 +9,7 @@ it may cause the table to be initialized with the members at the end being set to zero. This is bad as jumping to zero will crash. -Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2023, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -34,6 +34,9 @@ UINTN settimer_callback = 0; BOOLEAN gEmulatorInterruptEnabled = FALSE; +STATIC BOOLEAN mEmulatorStdInConfigured = FALSE; +STATIC struct termios mOldTty; + UINTN SecWriteStdErr ( IN UINT8 *Buffer, @@ -58,8 +61,15 @@ SecConfigStdIn ( // Need to turn off line buffering, ECHO, and make it unbuffered. // tcgetattr (STDIN_FILENO, &tty); + if (!mEmulatorStdInConfigured) { + // + // Save the original state of the TTY so it can be restored on exit + // + CopyMem (&mOldTty, &tty, sizeof (struct termios)); + } tty.c_lflag &= ~(ICANON | ECHO); tcsetattr (STDIN_FILENO, TCSANOW, &tty); + mEmulatorStdInConfigured = TRUE; // setvbuf (STDIN_FILENO, NULL, _IONBF, 0); @@ -338,6 +348,10 @@ SecExit ( UINTN Status ) { + // Reset the TTY back to its original state + if (mEmulatorStdInConfigured) { + tcsetattr (STDIN_FILENO, TCSANOW, &mOldTty); + } exit (Status); } diff --git a/EmulatorPkg/Win/Host/WinThunk.c b/EmulatorPkg/Win/Host/WinThunk.c index 008e5755db..90a6da2ece 100644 --- a/EmulatorPkg/Win/Host/WinThunk.c +++ b/EmulatorPkg/Win/Host/WinThunk.c @@ -1,6 +1,6 @@ /**@file -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent Module Name: @@ -30,6 +30,12 @@ Abstract: #include "WinHost.h" +STATIC BOOLEAN mEmulatorStdInConfigured = FALSE; +STATIC DWORD mOldStdInMode; +#if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2) + STATIC DWORD mOldStdOutMode; +#endif + UINTN SecWriteStdErr ( IN UINT8 *Buffer, @@ -61,6 +67,12 @@ SecConfigStdIn ( Success = GetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), &Mode); if (Success) { + if (!mEmulatorStdInConfigured) { + // + // Save the original state of the console so it can be restored on exit + // + mOldStdInMode = Mode; + } // // Disable buffer (line input), echo, mouse, window // @@ -82,6 +94,12 @@ SecConfigStdIn ( // if (Success) { Success = GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), &Mode); + if (!mEmulatorStdInConfigured) { + // + // Save the original state of the console so it can be restored on exit + // + mOldStdOutMode = Mode; + } if (Success) { Success = SetConsoleMode ( GetStdHandle (STD_OUTPUT_HANDLE), @@ -91,6 +109,9 @@ SecConfigStdIn ( } #endif + if (Success) { + mEmulatorStdInConfigured = TRUE; + } return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR; } @@ -467,6 +488,23 @@ SecExit ( UINTN Status ) { + #if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2) + BOOL Success; + #endif + + if (mEmulatorStdInConfigured) { + // + // Reset the console back to its original state + // + #if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2) + Success = SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), mOldStdInMode); + if (Success) { + SetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), mOldStdOutMode); + } + #else + SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), mOldStdInMode); + #endif + } exit ((int)Status); } -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109080): https://edk2.groups.io/g/devel/message/109080 Mute This Topic: https://groups.io/mt/101602599/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-