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 C686AAC0F40 for ; Tue, 26 Sep 2023 20:03:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=rqEwNqwgkUWGJ2PuQy29XnO9Tx7sqf8Q8cCCFN25y1s=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1695758609; v=1; b=La8Lh+e9YCrw7DQwIW8p+G2BQIkDAeyGRbpSGTGzq1ISA8ba97MrsyTVTRS1hbeQh9K3tHrE ry6e5ufquZLfcewYjOThD3fsWlIlyhzEpA9T13NUO810yywbbuom2bJXQJ5vZGX9ABz9uunqsqF G9GWW6gcIFwa5jlNDD6oac0g= X-Received: by 127.0.0.2 with SMTP id LhRpYY7687511xsttdPh4opR; Tue, 26 Sep 2023 13:03:29 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.1230.1695758608773934458 for ; Tue, 26 Sep 2023 13:03:29 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="385509109" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="385509109" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 13:03:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="864526522" X-IronPort-AV: E=Sophos;i="6.03,178,1694761200"; d="scan'208";a="864526522" X-Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga002.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 26 Sep 2023 13:03:27 -0700 X-Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Tue, 26 Sep 2023 13:03:26 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Tue, 26 Sep 2023 13:03:26 -0700 X-Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.32; Tue, 26 Sep 2023 13:03:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nS96uZ8QhyEFLKRYyy8TEF7HhWd4qY6OiQmlviOyWWJ8xnw99DKOxJwsljIa8TdfgKfyyQIPqtcqCZxtRW1qUhPEMhwu5cv+OJhmCZzKsYqbHdEd4/57Hvr2Jt84sSBkFuXscNEQjKxt3/SOi5RElx9DhYR2MLYS+HCQicqui4C4UDHXgNe9B7mfgwZzHPaXKt3F1KWIVjUbgGecWr9EMC8BOaJ/NrHCZZ+l+Sbe9qgPoFJ2DR3/B2V5TRmMZqu5MuJgOsq3bB5Q4Hmbi6UxcCLrInwM7kPsoBMkVctypg3jdUM0KqShbF0lHdgJSbcINYJ80aLFzs1rGZsqSCcVkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IpYJobb6Vn+kDSpIB371uU4HJB3IOG7Ks9hxQd6hj24=; b=bWUp7dzviMN0T5pOzwxyfBmIQ0sngJ8GaeJ25HPxHkU3xbCBWqSCxBVC2stbYOUFP2+VPhScDaBISp/Aa+ecnO0kkZcSflrV1RsmkETokjlITJCi6VbwIQPSD1NRqjb0ZT/C6Ni0j0X+0kTyfmZJjOOHGKpWbi090jI6IHx7Qb98mpSTt24rcrkrXRjyrM8W1V9UmQqELpKKHVVsqIM/jPbYPGrBSEWPVrpkajJeBJVyiHJikHtvafhM3lnF2iAfTwv19wktO4wTAisaXK2LUBAxM21DRmOG2YJdUc3pe2wiFxyzm3avGZLEogRwbliiMXMBOYRLEwR7DSK6VEdPtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from SA2PR11MB4938.namprd11.prod.outlook.com (2603:10b6:806:fb::14) by PH8PR11MB6999.namprd11.prod.outlook.com (2603:10b6:510:221::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 26 Sep 2023 20:03:25 +0000 X-Received: from SA2PR11MB4938.namprd11.prod.outlook.com ([fe80::ca3:8eed:9332:b6e0]) by SA2PR11MB4938.namprd11.prod.outlook.com ([fe80::ca3:8eed:9332:b6e0%6]) with mapi id 15.20.6813.017; Tue, 26 Sep 2023 20:03:24 +0000 From: "Michael D Kinney" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: Andrew Fish , "Ni, Ray" , "Chiu, Chasel" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v1] EmulatorPkg: Fix Terminal Issues Thread-Topic: [PATCH v1] EmulatorPkg: Fix Terminal Issues Thread-Index: AQHZ8KhcA9l2MMuSy0C673hGdEk4+rAth0pw Date: Tue, 26 Sep 2023 20:03:24 +0000 Message-ID: References: <20230926183601.2974-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20230926183601.2974-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SA2PR11MB4938:EE_|PH8PR11MB6999:EE_ x-ms-office365-filtering-correlation-id: 2a0af3e5-cfd7-4e93-775f-08dbbecba448 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: ClW/QozHKn45CsBVT8Twcb1PSf1k8iVxlKknfnMgGaTTW+5H20jbxKbXQfxiMLNPuSCEfzVKl7RrZ8EQzToo2cy/OiPqVJZd5FUz+ypFBvNjEpgPms0fNO5hNIKwgoXn8VB2UzR8/ioQdOoKg53EGxZjKzB97EZ2HOmiuxB5kVQYRJJg4NN3YwMTdxDW+cFLU1mWA9gdOOhC5QGGPXJdqzjbtTWIcPosWxG0o/xCglcitGUfdeOt2PuTmbsUzhaUjZNJ8+7FnEbUvnzR6AamTLt6z9+Kzb0f0WH+E15rrUPKZu4sHDs9cP5IwI7YBt5EUBc8uCAA44nLjrf5jyh9ntrUNJ0upDPVx/DHdRSd7/JLqmP8/aYtHQ018tSjE1tGWtnvNU8Bw5JbyHjdPKSIxLrvhwy2QK2JQxHwsX5cjimi2Y3RgcJ3AT0cWt8FVqPJHFavZyBy2755TpjTk1WByXFRziAQrWKTHvZufQVFmFyi9kfGish9L5dq7bzyV0iIV/GC1DBP8Z+abKB/73JQHJhJT61Ia5bhYW4yn0yXpY/hZFFKvlqAhbTz+oMXT1JJU36PBN1I6QJsSiQlgOqbm+r33y/uZJH60U3RKp4UK/EMCwSFL1SXpnkrb51nYqTL x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?51k5ax6eHV/lpbryNjYmbpk7VyquTtc0J2TYJ5DkmsulphmD6evTmFtiAmif?= =?us-ascii?Q?ylZ9FQupV8myHH44T58ZWj85uF36iZ0C21CJ95LV4rMobWvhAhmZXWWcCkq4?= =?us-ascii?Q?J4/XxHSmn8KSUygupoYrSvVeBNLZZJt+L2ZV4OYDkVSypsQHFCqiJ678tvHE?= =?us-ascii?Q?khpo0Nc5KLVkut/doROprqGSfQzmk7/iE0vKNDQBImS9XTo4VoRayar9MD1H?= =?us-ascii?Q?gFGaK7IO6Ew1fSSLV9Iln0HqWw34/vZvREs/Kg24hbnsaEa2BV3OQR+jaEso?= =?us-ascii?Q?VLm71JkfNlCk/Xe0kkKHognfaY3t8KobHCmbbQgvfcuNjBgaYO0ReheMAteQ?= =?us-ascii?Q?NXwgpGhQwmo1ym2rZvoMLr00CrxmMWr10jFaSC0q4QzbcEMD+jcfL0YhI8dz?= =?us-ascii?Q?qji+ii2rc8kNU+jH2Qxg9yaIqIqz7MvVwhChmef3w8g48Q7VsqFj3wn3FX6D?= =?us-ascii?Q?mT+MztrsY2QInrRGr2iaPSgd6pyqhQ9AiKpiPSdHtUMC3Rd8mX+OfraXU2Ox?= =?us-ascii?Q?MxwU13Xhl2PH5xu9Fpp/i3kY+A9QTB3Ia05Dc6PMNgL87K/fDWJn9DEE7SjX?= =?us-ascii?Q?ZP63BWlxP0LpSYLALEIUZr1posGBtr0YeyDxbKc85DF4B5DZFieV2Bszz14u?= =?us-ascii?Q?VLtbWqUsYzGlk/Li/9PTNV/x+mS31EkB5v0bjVRk3VUJLI5pnYm3jmd0ylXZ?= =?us-ascii?Q?+jydXidvQK58QlVxo7cxGxhOxj2rMSSbR7Pq4A2xLpPKfyR2Kbq9h8Fix2xF?= =?us-ascii?Q?MvgPSacWw+qD1Pxyo0mXk5Aun9SJMZVE/xpVjxf5mmk6kRW1pzcC+GG5lgS0?= =?us-ascii?Q?9Q2GirBHB8DjYNwmtSGTneqreZ90fwNqAJJAZUDO/W9vhQqlHqO8p473cyWg?= =?us-ascii?Q?tTWIkNkI/VtNvzlECGZ7Cjppso5Mm1F4U/LF6nV3vNZZBPzneo3EZ/KR0dP7?= =?us-ascii?Q?EMtSZWckVClQY3asyW7jt4h/lHiM5T4ZM22jLDMsApMYplWb32gaV0MwkTrX?= =?us-ascii?Q?Ujm0gM5WeLmsiE0DlQIo24eGmSpRg6yM3PnZc5rTvqqZcdso0hGVZwLc3IVR?= =?us-ascii?Q?D1XAhmV5a+bD8lL+PawT9ekz1f7HZthlPPbCtNuuTwRMdOppeRmCMc0IqaDn?= =?us-ascii?Q?5tDq5LJeFdrGat5mUdhcqST5uObXs+UMkZTUD/yIl3aa0l4z2IGgbQLGqRVW?= =?us-ascii?Q?C8KtRkzH72UZgTAjQOcI6v680zi4pKNdu8GEpUJWI/5lvHG8Zs0Ami+46GKM?= =?us-ascii?Q?Mo88cblhN2/71CBrFu5DbvGpWirUl2ELrTkfQ64UG4S9JvGT17rwnFO3GuuV?= =?us-ascii?Q?pEjoH8LsEaJKVaP4A7pFl99SA8V7qphFGYYn3lBtYi+1/w57A6xh2RJGEJ56?= =?us-ascii?Q?3o8q+r4Ib1vQP85q2bYj1Jcpo3ZJzYASEX5Kk3K5+1eqaYwke2Q+uBZDwiZe?= =?us-ascii?Q?YVzeng6+TAIyA4OdKKI6RqRJ/C2hXu8BpAzLnKYDBCy0THPZ70Of1/KVJgwX?= =?us-ascii?Q?YXARdtv7rAGwlbXI+9vI9lTjRCVV7mcz56EYcYYsV6PC3HX1EXb3NwfVnrp0?= =?us-ascii?Q?PMZEtYm/XRxeOl8OkmH7wuUYRPjua6sL/7zyrJLd?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA2PR11MB4938.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a0af3e5-cfd7-4e93-775f-08dbbecba448 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Sep 2023 20:03:24.6910 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8LGT4vTkYusTqGhUucQ/tcVGwHkIbNu3LzJYcUlE7UUAF9Jhgmd14WM03F3WdLZnf12wC6Pyozv8eCXE1UCTdsj+7MzJICv+sqdVph5XWUk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6999 X-OriginatorOrg: intel.com 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,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: nDsTAzTBqbPITNrBDMcZZXBnx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=La8Lh+e9; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:dns request to arcselector9901._domainkey.microsoft.com failed: no records with this name}"); 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 Thanks Nate! I have noticed this issue for a while. One comment below. With that update: Reviewed-by: Michael D Kinney Mike > -----Original Message----- > From: Desimone, Nathaniel L > Sent: Tuesday, September 26, 2023 11:36 AM > To: devel@edk2.groups.io > Cc: Andrew Fish ; Ni, Ray ; Kinney, > Michael D ; Chiu, Chasel > > Subject: [PATCH v1] EmulatorPkg: Fix Terminal Issues >=20 > 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. >=20 > 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(-) >=20 > 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. >=20 > -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 >=20 > @@ -34,6 +34,9 @@ UINTN settimer_callback =3D 0; >=20 > BOOLEAN gEmulatorInterruptEnabled =3D FALSE; >=20 > +STATIC BOOLEAN mEmulatorStdInConfigured =3D 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 &=3D ~(ICANON | ECHO); > tcsetattr (STDIN_FILENO, TCSANOW, &tty); > + mEmulatorStdInConfigured =3D TRUE; >=20 > // setvbuf (STDIN_FILENO, NULL, _IONBF, 0); >=20 > @@ -338,6 +348,10 @@ SecExit ( > UINTN Status > ) > { > + // Reset the TTY back to its original state > + if (mEmulatorStdInConfigured) { > + tcsetattr (STDIN_FILENO, TCSANOW, &mOldTty); > + } > exit (Status); > } >=20 > 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 >=20 > -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 >=20 > Module Name: > @@ -30,6 +30,12 @@ Abstract: >=20 > #include "WinHost.h" >=20 > +STATIC BOOLEAN mEmulatorStdInConfigured =3D 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 ( >=20 > Success =3D 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 =3D Mode; > + } > // > // Disable buffer (line input), echo, mouse, window > // > @@ -82,6 +94,12 @@ SecConfigStdIn ( > // > if (Success) { > Success =3D GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), > &Mode); > + if (!mEmulatorStdInConfigured) { > + // > + // Save the original state of the console so it can be restored > on exit > + // > + mOldStdOutMode =3D Mode; > + } > if (Success) { > Success =3D SetConsoleMode ( > GetStdHandle (STD_OUTPUT_HANDLE), > @@ -91,6 +109,9 @@ SecConfigStdIn ( > } >=20 > #endif > + if (Success) { > + mEmulatorStdInConfigured =3D TRUE; > + } > return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR; > } >=20 > @@ -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) I think the BOOL Success variable could be added here and reduce the #if st= atements > + Success =3D 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); > } >=20 > -- > 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109087): https://edk2.groups.io/g/devel/message/109087 Mute This Topic: https://groups.io/mt/101602599/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-