Changeset 105280 in vbox

Timestamp:

Jul 11, 2024 5:28:42 PM (5 months ago)

Author:

vboxsync

Message:

/Config.kmk, Devices/Graphics/DevVGA.cpp, Devices/Graphics/BIOS, Devices/EFI/Firmware: Remove long obsolete code for "new year" specific BIOS splash and use new logo/wordmark. This is a draft, because the scaling lowers quality. bugref:10724

Commands for converting the images into a usable format:

convert .../vbox_bios_splash_oracle.png -alpha deactivate -resize "30%" BMP3:vbox_bios_splash_oracle.bmp

convert .../vbox_bios_splash.png -alpha deactivate -resize "50%" BMP3:vbox_bios_splash.bmp

convert .../vbox_bios_splash.png -alpha deactivate -resize "50%" -compress none -type palette BMP3:Logo.bmp

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/EFI/Firmware/VBoxPkg/Logo/Logo.bmp (modified) ( previous)
• src/VBox/Devices/Graphics/BIOS/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/Graphics/BIOS/ose_logo.bmp (deleted)
• src/VBox/Devices/Graphics/BIOS/vbox_bios_splash.bmp (added)
• src/VBox/Devices/Graphics/BIOS/vbox_bios_splash_oracle.bmp (added)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -1260 +1260 @@
 # Branding
 #
-VBOX_BRAND_BIOS_LOGO                 := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/puel_logo.bmp
+VBOX_BRAND_BIOS_LOGO                 := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/vbox_bios_splash_oracle.bmp
 VBOX_BRAND_LICENSE_HTML              := $(PATH_ROOT)/doc/License-gpl-3.0.html
 VBOX_BRAND_LICENSE_RTF               := $(PATH_ROOT)/doc/License-gpl-3.0.rtf
@@ -1572 +1572 @@
  VBOX_BRAND_LICENSE_TXT              := $(PATH_ROOT)/doc/License-gpl-3.0.txt
  VBOX_BRAND_LICENSE_VER              :=
- VBOX_BRAND_BIOS_LOGO                := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/ose_logo.bmp
+ VBOX_BRAND_BIOS_LOGO                := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/vbox_bios_splash.bmp
  VBOX_BRAND_GUI_ABOUT_PNG            := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about.png
  VBOX_BRAND_GUI_ABOUT_X2_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_x2.png

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -171 +171 @@
 VgaDefBiosLogo_SOURCES   = $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogo.c
 VgaDefBiosLogo_CLEAN     = $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogo.c
-ifndef VBOX_OSE
- VgaDefBiosLogo_SOURCES += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
- VgaDefBiosLogo_CLEAN   += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
-endif
 
 # Rule for making the bios logo.
@@ -180 +176 @@
         $(call MSG_TOOL,bin2c,VgaDefBiosLogo,$<,$@)
         $(QUIET)$(VBOX_BIN2C) VgaDefBiosLogo $< $@
-
-# Rule for making the bios logo.
-$$(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c: $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/puel_logo_ny.bmp $(VBOX_BIN2C) | $$(dir $$@)
-        $(call MSG_TOOL,bin2c,VgaDefBiosLogoNY,$<,$@)
-        $(QUIET)$(VBOX_BIN2C) VgaDefBiosLogoNY $< $@
 
 

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -7254 +7254 @@
     if (g_cbVgaDefBiosLogo)
         pThisCC->cbLogo = RT_MAX(pThisCC->cbLogo, g_cbVgaDefBiosLogo);
-# ifndef VBOX_OSE
-    if (g_cbVgaDefBiosLogoNY)
-        pThisCC->cbLogo = RT_MAX(pThisCC->cbLogo, g_cbVgaDefBiosLogoNY);
-# endif
     pThisCC->cbLogo += sizeof(LogoHdr);
 
@@ -7287 +7283 @@
             || RT_FAILURE(rc))
         {
-# ifndef VBOX_OSE
-            RTTIMESPEC Now;
-            RTTimeLocalNow(&Now);
-            RTTIME T;
-            RTTimeLocalExplode(&T, &Now);
-            bool fSuppressNewYearSplash = false;
-            rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "SuppressNewYearSplash", &fSuppressNewYearSplash, true);
-            if (   !fSuppressNewYearSplash
-                && (T.u16YearDay > 353 || T.u16YearDay < 10))
-            {
-                pLogoHdr->cbLogo = LogoHdr.cbLogo = g_cbVgaDefBiosLogoNY;
-                memcpy(pLogoHdr + 1, g_abVgaDefBiosLogoNY, LogoHdr.cbLogo);
-                pThisCC->fBootMenuInverse = true;
-            }
-            else
-# endif
-                memcpy(pLogoHdr + 1, g_abVgaDefBiosLogo, LogoHdr.cbLogo);
+            memcpy(pLogoHdr + 1, g_abVgaDefBiosLogo, LogoHdr.cbLogo);
             rc = vbeR3ParseBitmap(pThisCC);
             AssertLogRelMsgReturn(RT_SUCCESS(rc), ("Parsing of internal bitmap failed! vbeR3ParseBitmap() -> %Rrc\n", rc), rc);