From nobody Wed May 1 17:47:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39396+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39396+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556002856; cv=none; d=zoho.com; s=zohoarc; b=fnLztlI3TbhMTD934NVu7hAOj9ndUNjMjhqg+2BHqtUVt+ERkl+vXfJWygjf+FZLm534a5WGqYQA68VmoVbaou6cIo1SEaJzqA/S9fbzdb78G+DGRMYDKMRVrB1iprJz6n9uTAZ2hRbA2qoMGcOwtdrw8Vt3GIlE0BbIr7yjjL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556002856; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=EVzUgZ6dpFXA0nm0QstYNfw4o7AfZDxYPCjzBeQYZl4=; b=hqQMgd9FtxpUz/+ZrOtJlnbWEgM7MLYu67yMwl9GH6u35C77pTRUd1Qw++SGcoOaKnN0WaXGmGBHp3zFgQwqZ2RNDqc/upITDK5aIN+Xn0zZq4W9Blc33ZSuLMcCLWwjlqES9rBaUf7fQpMdGdKHkDIIzZnmJFp0vaj/MYZQJ7M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39396+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556002856244313.3585565461076; Tue, 23 Apr 2019 00:00:56 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Tue, 23 Apr 2019 00:00:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 00:00:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,384,1549958400"; d="scan'208";a="225843159" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga001.jf.intel.com with ESMTP; 23 Apr 2019 00:00:53 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong , Hao Wu , Ruiyu Ni Subject: [edk2-devel] [patch 1/2] MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol Date: Tue, 23 Apr 2019 15:00:38 +0800 Message-Id: <20190423070039.29160-2-dandan.bi@intel.com> In-Reply-To: <20190423070039.29160-1-dandan.bi@intel.com> References: <20190423070039.29160-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: 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,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556002855; bh=8EBzuHtm7P8Kg319qPwFQIGf9M5Cug1sEj5BvZO6ppA=; h=Cc:Date:From:Reply-To:Subject:To; b=GGyvqcxG1EE4Pf1LSuKOnOyVl5mlA9t89AFy5pBOa69j8QtDoVSI56CNpOGDDCEhc5x Hl1oE5tM0V1skJ7VZm8Wgr6VR0bOqaT972Y/qlXMcq6s4NN9kdPVAs00nT/W5w4SeyY+n KdDIk8dlaCfBdHNPXA7qX+LBDpU3mlibhWE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1728 Currently Emulator meets ASSERT when enter setup->Continue->enter setup. When re-enter setup, the BmmDriverHandle in BMMUiLib Constructor is not NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT. So here set BmmDriverHandle to NULL after uninstalling protocols on it in Destructor function to avoid this issue. Cc: Liming Gao Cc: Eric Dong Cc: Hao Wu Cc: Ruiyu Ni Signed-off-by: Dandan Bi Reviewed-by: Eric Dong --- .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenan= ce.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c index 2167d3a5e8..28592f9f47 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c @@ -1,9 +1,9 @@ /** @file The functions for Boot Maintainence Main menu. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "BootMaintenanceManager.h" @@ -1761,9 +1761,10 @@ BootMaintenanceManagerUiLibDestructor ( &mBmmCallbackInfo->BmmConfigAccess, NULL ); =20 FreePool (mBmmCallbackInfo->LoadContext); + mBmmCallbackInfo->BmmDriverHandle =3D NULL; =20 return EFI_SUCCESS; } =20 --=20 2.18.0.windows.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 (#39396): https://edk2.groups.io/g/devel/message/39396 Mute This Topic: https://groups.io/mt/31306510/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed May 1 17:47:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39397+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39397+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556002858; cv=none; d=zoho.com; s=zohoarc; b=Lb8uxZtzTYVq2JlARnL321k7ZSFCaDg8wx2NL/AJGgbJMLKxHk/PgffoRyzR/cYZ996rYovA0VPAsAHkIQ6XO/d9TyCCTHtFYp/6/M2CrqLilrA9J555sGa+4rGvMU+wEJ5PUdCHaIRxqIBTevcU1ucXEodtQpMxwQ3/cwQbVVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556002858; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=9E/qgqEGTOHmztB9Fb36BlY0w/x/SuU8N++tshHJ/ng=; b=JdtdZb9wA5Re5cNkCxL5Snj0tzmeglzCHy/KM2wA/HifynjTeTefV8YzSt+66UN3QRD1oOmrFwQAG1EgdoPwqAVjMMT4zJrUgoZ6zhZHrYmo0wTTl1L4+A5Mp6ByDfpbL/nA8qDeGmGFM9sPNgtp1hhjTVXP73miNc6FEkjBa04= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39397+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556002858581933.6298899701472; Tue, 23 Apr 2019 00:00:58 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Tue, 23 Apr 2019 00:00:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 00:00:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,384,1549958400"; d="scan'208";a="225843178" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga001.jf.intel.com with ESMTP; 23 Apr 2019 00:00:56 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong , Hao Wu , Ruiyu Ni Subject: [edk2-devel] [patch 2/2] MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol Date: Tue, 23 Apr 2019 15:00:39 +0800 Message-Id: <20190423070039.29160-3-dandan.bi@intel.com> In-Reply-To: <20190423070039.29160-1-dandan.bi@intel.com> References: <20190423070039.29160-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: 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,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556002858; bh=nrmC48UKsuaKgWBOZz5inxghCx0O3vi4gckVYrLDeco=; h=Cc:Date:From:Reply-To:Subject:To; b=fGBH7/Hd5hEwbFkTQ4NFMFfyDnx6BzD7KeAK0qK43w6xNQK09hyJljdGjZlDqfPMjfD eEB7oTGpMHKTPTvjyWeUHKuZlQDjNzf9jB2NG6uMa5ZcZX9j5fKZ4sKhPSuD/7HwZVkaZ JqOUofQ0dMp9N9fmERvzZxGxV/e2GfHRhmA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1728 Currently Emulator meets ASSERT when enter setup->Continue->enter setup. When re-enter setup, the FeDriverHandle in FileExplorerLib Constructor is not NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT. So here set FeDriverHandle to NULL after uninstalling protocols on it in the Destructor function to avoid this issue. Cc: Liming Gao Cc: Eric Dong Cc: Hao Wu Cc: Ruiyu Ni Signed-off-by: Dandan Bi Reviewed-by: Eric Dong --- MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModul= ePkg/Library/FileExplorerLib/FileExplorer.c index 27f12fcbf9..58e4910259 100644 --- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c +++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c @@ -1,9 +1,9 @@ /** @file File explorer related functions. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 =20 @@ -1641,10 +1641,11 @@ FileExplorerLibDestructor ( NULL ); ASSERT_EFI_ERROR (Status); =20 HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle); + gFileExplorerPrivate.FeDriverHandle =3D NULL; } =20 FreePool (gHiiVendorDevicePath); =20 return EFI_SUCCESS; --=20 2.18.0.windows.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 (#39397): https://edk2.groups.io/g/devel/message/39397 Mute This Topic: https://groups.io/mt/31306517/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-