tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <pedroa.liu@insyde.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
[jordan.l.justen@intel.com: Also update EmuGopSimpleTextInExSetState]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Pedroa Liu 2016-05-17 08:51:33 +08:00 committed by Jordan Justen
parent f85d3ce2ef
commit 8b3ccf16e0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EmulatorPkg/EmuGopDxe/GopInput.c
View File

@ -1,6 +1,6 @@
/*++ @file /*++ @file
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2010 0 2011,Apple Inc. All rights reserved.<BR> Portions copyright (c) 2010 0 2011,Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -389,7 +389,7 @@ EmuGopSimpleTextInExReadKeyStrokeEx (
return EFI_INVALID_PARAMETER; 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) { if (Private->EmuGraphicsWindow == NULL) {
return EFI_NOT_READY; return EFI_NOT_READY;
} }
@ -442,7 +442,7 @@ EmuGopSimpleTextInExSetState (
EFI_STATUS Status; EFI_STATUS Status;
EFI_TPL OldTpl; 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) { if (Private->EmuGraphicsWindow == NULL) {
return EFI_NOT_READY; return EFI_NOT_READY;
} }