Changeset 85864 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 21, 2020 12:44:56 PM (4 years ago)

Author:

vboxsync

Message:

Consolidated all the different Bitmap (BMP) file format headers / definitions into new include/iprt/formats/bmp.h (part 2): Renaming + prefixing stuff.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-info.cpp (modified) (1 diff)
• DevVGA.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -1818 +1818 @@
     if (cbPixel == 4)
     {
-        BITMAPV4HEADER bh;
-        RT_ZERO(bh);
-        bh.bV4Size          = sizeof(bh);
-        bh.bV4Width         = w;
-        bh.bV4Height        = -h;
-        bh.bV4Planes        = 1;
-        bh.bV4BitCount      = 32;
-        bh.bV4V4Compression = BI_BITFIELDS;
-        bh.bV4SizeImage     = cbBitmap;
-        bh.bV4XPelsPerMeter = 2835;
-        bh.bV4YPelsPerMeter = 2835;
-        // bh.bV4ClrUsed       = 0;
-        // bh.bV4ClrImportant  = 0;
-        bh.bV4RedMask       = 0x00ff0000;
-        bh.bV4GreenMask     = 0x0000ff00;
-        bh.bV4BlueMask      = 0x000000ff;
-        bh.bV4AlphaMask     = 0xff000000;
-        bh.bV4CSType        = LCS_WINDOWS_COLOR_SPACE;
-        // bh.bV4Endpoints     = {0};
-        // bh.bV4GammaRed      = 0;
-        // bh.bV4GammaGreen    = 0;
-        // bh.bV4GammaBlue     = 0;
-
-        BMPINFO bf;
-        RT_ZERO(bf);
-        bf.Type     = BMP_HDR_MAGIC;
-        bf.FileSize = sizeof(bf) + sizeof(bh) + cbBitmap;
-        bf.Offset   = sizeof(bf) + sizeof(bh);
-
-        fwrite(&bf, 1, sizeof(bf), f);
-        fwrite(&bh, 1, sizeof(bh), f);
+        BMPFILEHDR fileHdr;
+        RT_ZERO(fileHdr);
+        fileHdr.uType       = BMP_HDR_MAGIC;
+        fileHdr.cbFileSize = sizeof(fileHdr) + sizeof(BITMAPV4HEADER) + cbBitmap;
+        fileHdr.offBits    = sizeof(fileHdr) + sizeof(BITMAPV4HEADER);
+
+        BITMAPV4HEADER hdrV4;
+        RT_ZERO(hdrV4);
+        hdrV4.bV4Size          = sizeof(hdrV4);
+        hdrV4.bV4Width         = w;
+        hdrV4.bV4Height        = -h;
+        hdrV4.bV4Planes        = 1;
+        hdrV4.bV4BitCount      = 32;
+        hdrV4.bV4V4Compression = BI_BITFIELDS;
+        hdrV4.bV4SizeImage     = cbBitmap;
+        hdrV4.bV4XPelsPerMeter = 2835;
+        hdrV4.bV4YPelsPerMeter = 2835;
+        // hdrV4.bV4ClrUsed       = 0;
+        // hdrV4.bV4ClrImportant  = 0;
+        hdrV4.bV4RedMask       = 0x00ff0000;
+        hdrV4.bV4GreenMask     = 0x0000ff00;
+        hdrV4.bV4BlueMask      = 0x000000ff;
+        hdrV4.bV4AlphaMask     = 0xff000000;
+        hdrV4.bV4CSType        = LCS_WINDOWS_COLOR_SPACE;
+        // hdrV4.bV4Endpoints     = {0};
+        // hdrV4.bV4GammaRed      = 0;
+        // hdrV4.bV4GammaGreen    = 0;
+        // hdrV4.bV4GammaBlue     = 0;
+
+        fwrite(&fileHdr, 1, sizeof(fileHdr), f);
+        fwrite(&hdrV4, 1, sizeof(hdrV4), f);
     }
     else
 #endif
     {
-        BMPINFO bf;
-        RT_ZERO(bf);
-        bf.Type     = BMP_HDR_MAGIC;
-        bf.FileSize = sizeof(BMPINFO) + sizeof(WINHDR) + cbBitmap;
-        bf.Offset   = sizeof(BMPINFO) + sizeof(WINHDR);
-
-        WINHDR bi;
-        RT_ZERO(bi);
-        bi.Size      = sizeof(bi);
-        bi.Width     = w;
-        bi.Height    = -h;
-        bi.Planes    = 1;
-        bi.BitCount  = 32;
-        bi.SizeImage = cbBitmap;
-
-        fwrite(&bf, 1, sizeof(bf), f);
-        fwrite(&bi, 1, sizeof(bi), f);
+        BMPFILEHDR fileHdr;
+        RT_ZERO(fileHdr);
+        fileHdr.uType      = BMP_HDR_MAGIC;
+        fileHdr.cbFileSize = sizeof(BMPFILEHDR) + sizeof(BMPWIN3XINFOHDR) + cbBitmap;
+        fileHdr.offBits    = sizeof(BMPFILEHDR) + sizeof(BMPWIN3XINFOHDR);
+
+        BMPWIN3XINFOHDR coreHdr;
+        RT_ZERO(coreHdr);
+        coreHdr.cbSize      = sizeof(coreHdr);
+        coreHdr.uWidth      = w;
+        coreHdr.uHeight     = -h;
+        coreHdr.cPlanes     = 1;
+        coreHdr.cBits       = 32;
+        coreHdr.cbSizeImage = cbBitmap;
+
+        fwrite(&fileHdr, 1, sizeof(fileHdr), f);
+        fwrite(&coreHdr, 1, sizeof(coreHdr), f);
     }
 

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

@@ -3871 +3871 @@
      * Get bitmap header data
      */
-    PBMPINFO pBmpInfo = (PBMPINFO)(pThisCC->pbLogo + sizeof(LOGOHDR));
-    PWINHDR  pWinHdr  = (PWINHDR)(pThisCC->pbLogo + sizeof(LOGOHDR) + sizeof(BMPINFO));
-
-    if (pBmpInfo->Type == BMP_HDR_MAGIC)
-    {
-        switch (pWinHdr->Size)
+    PBMPFILEHDR      pFileHdr = (PBMPFILEHDR)(pThisCC->pbLogo + sizeof(LOGOHDR));
+    PBMPWIN3XINFOHDR pCoreHdr = (PBMPWIN3XINFOHDR)(pThisCC->pbLogo + sizeof(LOGOHDR) + sizeof(BMPFILEHDR));
+
+    if (pFileHdr->uType == BMP_HDR_MAGIC)
+    {
+        switch (pCoreHdr->cbSize)
         {
-            case BMP_HEADER_OS21:
+            case BMP_HDR_SIZE_OS21:
             {
-                POS2HDR pOs2Hdr = (POS2HDR)pWinHdr;
-                pThisCC->cxLogo = pOs2Hdr->Width;
-                pThisCC->cyLogo = pOs2Hdr->Height;
-                pThisCC->cLogoPlanes = pOs2Hdr->Planes;
-                pThisCC->cLogoBits = pOs2Hdr->BitCount;
-                pThisCC->LogoCompression = BMP_COMPRESS_NONE;
+                PBMPOS2COREHDR pOs2Hdr = (PBMPOS2COREHDR)pCoreHdr;
+                pThisCC->cxLogo = pOs2Hdr->uWidth;
+                pThisCC->cyLogo = pOs2Hdr->uHeight;
+                pThisCC->cLogoPlanes = pOs2Hdr->cPlanes;
+                pThisCC->cLogoBits = pOs2Hdr->cBits;
+                pThisCC->LogoCompression = BMP_COMPRESSION_TYPE_NONE;
                 pThisCC->cLogoUsedColors = 0;
                 break;
             }
 
-            case BMP_HEADER_OS22:
+            case BMP_HDR_SIZE_OS22:
             {
-                POS22HDR pOs22Hdr = (POS22HDR)pWinHdr;
-                pThisCC->cxLogo = pOs22Hdr->Width;
-                pThisCC->cyLogo = pOs22Hdr->Height;
-                pThisCC->cLogoPlanes = pOs22Hdr->Planes;
-                pThisCC->cLogoBits = pOs22Hdr->BitCount;
-                pThisCC->LogoCompression = pOs22Hdr->Compression;
-                pThisCC->cLogoUsedColors = pOs22Hdr->ClrUsed;
+                PBMPOS2COREHDR2 pOs22Hdr = (PBMPOS2COREHDR2)pCoreHdr;
+                pThisCC->cxLogo = pOs22Hdr->uWidth;
+                pThisCC->cyLogo = pOs22Hdr->uHeight;
+                pThisCC->cLogoPlanes = pOs22Hdr->cPlanes;
+                pThisCC->cLogoBits = pOs22Hdr->cBits;
+                pThisCC->LogoCompression = pOs22Hdr->enmCompression;
+                pThisCC->cLogoUsedColors = pOs22Hdr->cClrUsed;
                 break;
             }
 
-            case BMP_HEADER_WIN3:
-                pThisCC->cxLogo = pWinHdr->Width;
-                pThisCC->cyLogo = pWinHdr->Height;
-                pThisCC->cLogoPlanes = pWinHdr->Planes;
-                pThisCC->cLogoBits = pWinHdr->BitCount;
-                pThisCC->LogoCompression = pWinHdr->Compression;
-                pThisCC->cLogoUsedColors = pWinHdr->ClrUsed;
+            case BMP_HDR_SIZE_WIN3X:
+                pThisCC->cxLogo = pCoreHdr->uWidth;
+                pThisCC->cyLogo = pCoreHdr->uHeight;
+                pThisCC->cLogoPlanes = pCoreHdr->cPlanes;
+                pThisCC->cLogoBits = pCoreHdr->cBits;
+                pThisCC->LogoCompression = pCoreHdr->enmCompression;
+                pThisCC->cLogoUsedColors = pCoreHdr->cClrUsed;
                 break;
 
             default:
-                AssertLogRelMsgFailedReturn(("Unsupported bitmap header size %u.\n", pWinHdr->Size),
+                AssertLogRelMsgFailedReturn(("Unsupported bitmap header size %u.\n", pCoreHdr->cbSize),
                                             VERR_INVALID_PARAMETER);
                 break;
@@ -3933 +3933 @@
                               VERR_INVALID_PARAMETER);
 
-        AssertLogRelMsgReturn(pThisCC->LogoCompression == BMP_COMPRESS_NONE,
+        AssertLogRelMsgReturn(pThisCC->LogoCompression == BMP_COMPRESSION_TYPE_NONE,
                                ("Unsupported %u compression.\n", pThisCC->LogoCompression),
                                VERR_INVALID_PARAMETER);
@@ -3947 +3947 @@
         if (pThisCC->cLogoPalEntries)
         {
-            const uint8_t *pbPal = pThisCC->pbLogo + sizeof(LOGOHDR) + sizeof(BMPINFO) + pWinHdr->Size; /* ASSUMES Size location (safe) */
+            const uint8_t *pbPal = pThisCC->pbLogo + sizeof(LOGOHDR) + sizeof(BMPFILEHDR) + pCoreHdr->cbSize; /* ASSUMES Size location (safe) */
 
             for (uint16_t i = 0; i < pThisCC->cLogoPalEntries; i++)
@@ -3969 +3969 @@
          * Bitmap data offset
          */
-        pThisCC->pbLogoBitmap = pThisCC->pbLogo + sizeof(LOGOHDR) + pBmpInfo->Offset;
+        pThisCC->pbLogoBitmap = pThisCC->pbLogo + sizeof(LOGOHDR) + pFileHdr->offBits;
     }
     else