]> git.proxmox.com Git - mirror_edk2.git/commitdiff
EmulatorPkg/EmuGopDxe: Use correct FROM_THIS macro for TextInEx
authorPedroa Liu <pedroa.liu@insyde.com>
Tue, 17 May 2016 00:51:33 +0000 (08:51 +0800)
committerJordan Justen <jordan.l.justen@intel.com>
Tue, 17 May 2016 01:25:17 +0000 (18:25 -0700)
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>
EmulatorPkg/EmuGopDxe/GopInput.c

index a1f636aaa28250bb93ff8e599a0527542f202620..cf37a7bd70a2bb2fef88d08c4200ad9e07401a41 100644 (file)
@@ -1,6 +1,6 @@
 /*++ @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>
 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;
   }