Kaynağa Gözat

EmulatorPkg/EmuGopDxe: Set ModeInfo after Open successfully

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2668

WindowOpen will fail in some case. for example, without XServer.

Shouldn't set ModeInfo in this case to avoid the caller use it
incorrectly

Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
Guomin Jiang 2 yıl önce
ebeveyn
işleme
b422b0fcf9
1 değiştirilmiş dosya ile 7 ekleme ve 6 silme
  1. 7 6
      EmulatorPkg/EmuGopDxe/GopScreen.c

+ 7 - 6
EmulatorPkg/EmuGopDxe/GopScreen.c

@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -107,11 +107,7 @@ EmuGopSetMode (
     return EFI_UNSUPPORTED;
   }
 
-  ModeData                                                 = &Private->ModeData[ModeNumber];
-  This->Mode->Mode                                         = ModeNumber;
-  Private->GraphicsOutput.Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;
-  Private->GraphicsOutput.Mode->Info->VerticalResolution   = ModeData->VerticalResolution;
-  Private->GraphicsOutput.Mode->Info->PixelsPerScanLine    = ModeData->HorizontalResolution;
+  ModeData = &Private->ModeData[ModeNumber];
 
   if (Private->HardwareNeedsStarting) {
     Status = EmuGopStartWindow (
@@ -128,6 +124,11 @@ EmuGopSetMode (
     Private->HardwareNeedsStarting = FALSE;
   }
 
+  This->Mode->Mode                                         = ModeNumber;
+  Private->GraphicsOutput.Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;
+  Private->GraphicsOutput.Mode->Info->VerticalResolution   = ModeData->VerticalResolution;
+  Private->GraphicsOutput.Mode->Info->PixelsPerScanLine    = ModeData->HorizontalResolution;
+
   Status = Private->EmuGraphicsWindow->Size (
                                          Private->EmuGraphicsWindow,
                                          ModeData->HorizontalResolution,