Changeset 85864 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140033

Message:

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

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -901 +901 @@
     AssertPtrReturn(pcbDest, VERR_INVALID_POINTER);
 
-    PWINHDR pBmpWinHdr = (PWINHDR)pvSrc;
+    PBMPWIN3XINFOHDR coreHdr = (PBMPWIN3XINFOHDR)pvSrc;
     /** @todo Support all the many versions of the DIB headers. */
-    if (   cbSrc < sizeof(WINHDR)
-        || RT_LE2H_U32(pBmpWinHdr->Size) < sizeof(WINHDR)
-        || RT_LE2H_U32(pBmpWinHdr->Size) != sizeof(WINHDR))
+    if (   cbSrc < sizeof(BMPWIN3XINFOHDR)
+        || RT_LE2H_U32(coreHdr->cbSize) < sizeof(BMPWIN3XINFOHDR)
+        || RT_LE2H_U32(coreHdr->cbSize) != sizeof(BMPWIN3XINFOHDR))
     {
         return VERR_INVALID_PARAMETER;
     }
 
-    size_t offPixel = sizeof(BMPINFO)
-                    + RT_LE2H_U32(pBmpWinHdr->Size)
-                    + RT_LE2H_U32(pBmpWinHdr->ClrUsed) * sizeof(uint32_t);
+    size_t offPixel = sizeof(BMPFILEHDR)
+                    + RT_LE2H_U32(coreHdr->cbSize)
+                    + RT_LE2H_U32(coreHdr->cClrUsed) * sizeof(uint32_t);
     if (cbSrc < offPixel)
         return VERR_INVALID_PARAMETER;
 
-    size_t cbDst = sizeof(BMPINFO) + cbSrc;
+    size_t cbDst = sizeof(BMPFILEHDR) + cbSrc;
 
     void *pvDest = RTMemAlloc(cbDst);
@@ -922 +922 @@
         return VERR_NO_MEMORY;
 
-    PBMPINFO pBmpHdr = (PBMPINFO)pvDest;
-
-    pBmpHdr->Type        = BMP_HDR_MAGIC;
-    pBmpHdr->FileSize    = (uint32_t)RT_H2LE_U32(cbDst);
-    pBmpHdr->Reserved1   = pBmpHdr->Reserved2 = 0;
-    pBmpHdr->Offset      = (uint32_t)RT_H2LE_U32(offPixel);
-
-    memcpy((uint8_t *)pvDest + sizeof(BMPINFO), pvSrc, cbSrc);
+    PBMPFILEHDR fileHdr = (PBMPFILEHDR)pvDest;
+
+    fileHdr->uType       = BMP_HDR_MAGIC;
+    fileHdr->cbFileSize  = (uint32_t)RT_H2LE_U32(cbDst);
+    fileHdr->Reserved1   = 0;
+    fileHdr->Reserved2   = 0;
+    fileHdr->offBits     = (uint32_t)RT_H2LE_U32(offPixel);
+
+    memcpy((uint8_t *)pvDest + sizeof(BMPFILEHDR), pvSrc, cbSrc);
 
     *ppvDest = pvDest;
@@ -945 +946 @@
     AssertPtrReturn(pcbDest, VERR_INVALID_POINTER);
 
-    PBMPINFO pBmpHdr = (PBMPINFO)pvSrc;
-    if (   cbSrc < sizeof(BMPINFO)
-        || pBmpHdr->Type != BMP_HDR_MAGIC
-        || RT_LE2H_U32(pBmpHdr->FileSize) != cbSrc)
+    PBMPFILEHDR pBmpHdr = (PBMPFILEHDR)pvSrc;
+    if (   cbSrc < sizeof(BMPFILEHDR)
+        || pBmpHdr->uType != BMP_HDR_MAGIC
+        || RT_LE2H_U32(pBmpHdr->cbFileSize) != cbSrc)
     {
         return VERR_INVALID_PARAMETER;
     }
 
-    *ppvDest = ((uint8_t *)pvSrc) + sizeof(BMPINFO);
-    *pcbDest = cbSrc - sizeof(BMPINFO);
+    *ppvDest = ((uint8_t *)pvSrc) + sizeof(BMPFILEHDR);
+    *pcbDest = cbSrc - sizeof(BMPFILEHDR);
 
     return VINF_SUCCESS;