From 8b3ccf16e0b71cceb4ea4d9546f95ba55a6abc6a Mon Sep 17 00:00:00 2001 From: Pedroa Liu Date: Tue, 17 May 2016 08:51:33 +0800 Subject: [PATCH] EmulatorPkg/EmuGopDxe: Use correct FROM_THIS macro for TextInEx Fixes assert of "Bad signature" Pedroa fixed EmuGopSimpleTextInExReadKeyStrokeEx. Jordan fixed EmuGopSimpleTextInExSetState. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Pedroa Liu Reviewed-by: Jordan Justen [jordan.l.justen@intel.com: Also update EmuGopSimpleTextInExSetState] Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen --- EmulatorPkg/EmuGopDxe/GopInput.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/GopInput.c b/EmulatorPkg/EmuGopDxe/GopInput.c index a1f636aaa2..cf37a7bd70 100644 --- a/EmulatorPkg/EmuGopDxe/GopInput.c +++ b/EmulatorPkg/EmuGopDxe/GopInput.c @@ -1,6 +1,6 @@ /*++ @file -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
Portions copyright (c) 2010 0 2011,Apple Inc. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -389,7 +389,7 @@ EmuGopSimpleTextInExReadKeyStrokeEx ( return EFI_INVALID_PARAMETER; } - Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_THIS (This); + Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This); if (Private->EmuGraphicsWindow == NULL) { return EFI_NOT_READY; } @@ -442,7 +442,7 @@ EmuGopSimpleTextInExSetState ( EFI_STATUS Status; EFI_TPL OldTpl; - Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_THIS (This); + Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This); if (Private->EmuGraphicsWindow == NULL) { return EFI_NOT_READY; }