Changeset 64960 in vbox

Timestamp:

Dec 19, 2016 2:53:24 PM (8 years ago)

Author:

vboxsync

Message:

new year splash screen for Oracle builds

Location:

trunk/src/VBox/Devices

Files:

• Graphics/BIOS/Makefile.kmk (modified) (2 diffs)
• Graphics/DevVGA.cpp (modified) (11 diffs)
• Graphics/DevVGA.h (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)

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

@@ -160 +160 @@
 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.
@@ -165 +169 @@
         $(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

@@ -3871 +3871 @@
  * @param   cxLogo      Logo width.
  * @param   cyLogo      Logo height.
+ * @param   fInverse    True if the bitmask is black on white (only for 1bpp)
  * @param   iStep       Fade in/fade out step.
  * @param   pu32Palette Palette data.
@@ -3876 +3877 @@
  * @param   pbDst       Destination buffer.
  */
-static void vbeShowBitmap(uint16_t cBits, uint16_t xLogo, uint16_t yLogo, uint16_t cxLogo, uint16_t cyLogo, uint8_t iStep,
+static void vbeShowBitmap(uint16_t cBits, uint16_t xLogo, uint16_t yLogo, uint16_t cxLogo, uint16_t cyLogo,
+                          bool fInverse, uint8_t iStep,
                           const uint32_t *pu32Palette, const uint8_t *pbSrc, uint8_t *pbDst)
 {
@@ -3924 +3926 @@
         for (i = 0; i < cxLogo; i++)
         {
-            uint8_t pix;
-
             switch (cBits)
             {
@@ -3933 +3933 @@
                         c = *pbSrc++;
 
-                    pix = (c & 1) ? 0xFF : 0;
-                    c >>= 1;
-
-                    if (pix)
+                    if (c & 1)
                     {
-                        *pbTmpDst++ = pix * iStep / LOGO_SHOW_STEPS;
-                        *pbTmpDst++ = pix * iStep / LOGO_SHOW_STEPS;
-                        *pbTmpDst++ = pix * iStep / LOGO_SHOW_STEPS;
-                        pbTmpDst++;
+                        if (fInverse)
+                        {
+                            *pbTmpDst++ = 0;
+                            *pbTmpDst++ = 0;
+                            *pbTmpDst++ = 0;
+                            pbTmpDst++;
+                        }
+                        else
+                        {
+                            uint8_t pix = 0xFF * iStep / LOGO_SHOW_STEPS;
+                            *pbTmpDst++ = pix;
+                            *pbTmpDst++ = pix;
+                            *pbTmpDst++ = pix;
+                            pbTmpDst++;
+                        }
                     }
                     else
                         pbTmpDst += 4;
-
+                    c >>= 1;
                     j = (j + 1) % 8;
                     break;
@@ -3955 +3963 @@
                         c = *pbSrc++;
 
-                    pix = (c >> 4) & 0xF;
+                    uint8_t pix = (c >> 4) & 0xF;
                     c <<= 4;
 
@@ -3976 +3984 @@
                     uint32_t u32Pal = pu32Palette[*pbSrc++];
 
-                    pix = (u32Pal >> 16) & 0xFF;
+                    uint8_t pix = (u32Pal >> 16) & 0xFF;
                     *pbTmpDst++ = pix * iStep / LOGO_SHOW_STEPS;
                     pix = (u32Pal >> 8) & 0xFF;
@@ -4055 +4063 @@
                 vbeShowBitmap(pThis->cLogoBits, xLogo, yLogo,
                               pThis->cxLogo, pThis->cyLogo,
-                              iStep, &pThis->au32LogoPalette[0],
+                              false, iStep, &pThis->au32LogoPalette[0],
                               pbSrc, pbDst);
 
@@ -4062 +4070 @@
                     vbeShowBitmap(1, LOGO_F12TEXT_X, LOGO_F12TEXT_Y,
                                   LOGO_F12TEXT_WIDTH, LOGO_F12TEXT_HEIGHT,
-                                  iStep, &pThis->au32LogoPalette[0],
+                                  pThis->fBootMenuInverse, iStep, &pThis->au32LogoPalette[0],
                                   &g_abLogoF12BootText[0], pbDst);
 
@@ -6069 +6077 @@
                                           "HostWindowId\0"
 #endif
+                                          "SuppressNewYearSplash\0"
                                           ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -6919 +6928 @@
     /*
      * Allocate buffer for the logo data.
-     * RT_MAX() is applied to let us fall back to default logo on read failure.
+     * Let us fall back to default logo on read failure.
      */
-    pThis->cbLogo = sizeof(LogoHdr) + LogoHdr.cbLogo;
-    pThis->pbLogo = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, RT_MAX(pThis->cbLogo, g_cbVgaDefBiosLogo + sizeof(LogoHdr)));
+    pThis->cbLogo = LogoHdr.cbLogo;
+    if (g_cbVgaDefBiosLogo)
+        pThis->cbLogo = g_cbVgaDefBiosLogo;
+#ifndef VBOX_OSE
+    if (g_cbVgaDefBiosLogoNY)
+        pThis->cbLogo = g_cbVgaDefBiosLogoNY;
+#endif
+    pThis->cbLogo += sizeof(LogoHdr);
+
+    pThis->pbLogo = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, pThis->cbLogo);
     if (pThis->pbLogo)
     {
@@ -6949 +6966 @@
             || RT_FAILURE(rc))
         {
-            memcpy(pLogoHdr + 1, g_abVgaDefBiosLogo, LogoHdr.cbLogo);
+#ifndef VBOX_OSE
+            RTTIMESPEC Now;
+            RTTimeLocalNow(&Now);
+            RTTIME T;
+            RTTimeLocalExplode(&T, &Now);
+            bool fSuppressNewYearSplash = false;
+            rc = CFGMR3QueryBoolDef(pCfg, "SuppressNewYearSplash", &fSuppressNewYearSplash, false);
+            if (   !fSuppressNewYearSplash
+                && (T.u16YearDay > 353 || T.u16YearDay < 10))
+            {
+                pLogoHdr->cbLogo = LogoHdr.cbLogo = g_cbVgaDefBiosLogoNY;
+                memcpy(pLogoHdr + 1, g_abVgaDefBiosLogoNY, LogoHdr.cbLogo);
+                pThis->fBootMenuInverse = true;
+            }
+            else
+#endif
+                memcpy(pLogoHdr + 1, g_abVgaDefBiosLogo, LogoHdr.cbLogo);
             rc = vbeParseBitmap(pThis);
             if (RT_FAILURE(rc))

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

@@ -585 +585 @@
     /** Clear screen flag. */
     uint8_t                     fLogoClearScreen;
-    uint8_t                     Padding8[7];
+    uint8_t                     fBootMenuInverse;
+    uint8_t                     Padding8[6];
     /** Palette data. */
     uint32_t                    au32LogoPalette[256];

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -25 +25 @@
 /** The default BIOS logo data. */
 extern const unsigned char  g_abVgaDefBiosLogo[];
+extern const unsigned char  g_abVgaDefBiosLogoNY[];
 /** The size of the default BIOS logo data. */
 extern const unsigned       g_cbVgaDefBiosLogo;
+extern const unsigned       g_cbVgaDefBiosLogoNY;