Changeset 58834 in vbox

Timestamp:

Nov 23, 2015 5:47:55 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: Fix displaying our boot logo

File:

• trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c

@@ -743 +743 @@
   if ((BmpHeader->Size != BmpImageSize) ||
       (BmpHeader->Size < BmpHeader->ImageOffset) ||
+#ifndef VBOX
       (BmpHeader->Size - BmpHeader->ImageOffset !=  BmpHeader->PixelHeight * DataSizePerLine)) {
+#else
+      /*
+       * Our boot logo size is two bytes bigger (some 4 byte alignment in the file I guess)
+       * than the calculated size which makes the above line fail. Just let it pass as long as there
+       * is no data underrun.
+       */
+      (BmpHeader->Size - BmpHeader->ImageOffset <  BmpHeader->PixelHeight * DataSizePerLine)) {
+#endif
     return EFI_INVALID_PARAMETER;
   }