Changeset 41210 in vbox

Timestamp:

May 8, 2012 3:06:18 PM (13 years ago)

Author:

vboxsync

Message:

GuestHost, HostService: darwin bitmap support, copyright header and some cleanups.

Location:

trunk

Files:

• include/VBox/GuestHost/clipboard-helper.h (modified) (2 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/clipboard-helper.h

@@ -145 +145 @@
  * @param   pcbDest       Pointer to the size of the buffer for the destination data in bytes
  */
-int vboxClipboardDibToBmp(const void *pSrc, size_t cbSrc, void **ppDest, size_t *pcbDest);
+int vboxClipboardDibToBmp(const void *pvSrc, size_t cbSrc, void **ppvDest, size_t *pcbDest);
 
 /**
@@ -158 +158 @@
  * @param   pcbDest       Pointer to the size of the destination data in bytes
  */
-int vboxClipboardBmpGetDib(const void *pSrc, size_t cbSrc, const void **ppDest, size_t *pcbDest);
+int vboxClipboardBmpGetDib(const void *pvSrc, size_t cbSrc, const void **ppvDest, size_t *pcbDest);
 
 

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

@@ -6 +6 @@
 /*
  * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2012 François Revol
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -265 +266 @@
 }
 
-int vboxClipboardDibToBmp(const void *pSrc, size_t cbSrc, void **ppDest, size_t *pcbDest)
-{
-    size_t cb = sizeof(BMFILEHEADER) + cbSrc;
-    PBMFILEHEADER pFileHeader;
-    void *dest;
-    size_t pixelOffset;
-
-    PBMINFOHEADER pBitmapInfoHeader = (PBMINFOHEADER)pSrc;
-    if (cbSrc < sizeof(BMINFOHEADER) ||
-        RT_LE2H_U32(pBitmapInfoHeader->u32Size) < sizeof(BMINFOHEADER) ||
+int vboxClipboardDibToBmp(const void *pvSrc, size_t cbSrc, void **ppvDest, size_t *pcbDest)
+{
+    size_t        cb            = sizeof(BMFILEHEADER) + cbSrc;
+    PBMFILEHEADER pFileHeader   = NULL;
+    void         *pvDest        = NULL;
+    size_t        offPixel      = 0;
+
+    AssertPtrReturn(pvSrc,   VERR_INVALID_PARAMETER);
+    AssertPtrReturn(ppvDest, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbDest, VERR_INVALID_PARAMETER);
+
+    PBMINFOHEADER pBitmapInfoHeader = (PBMINFOHEADER)pvSrc;
     /** @todo Support all the many versions of the DIB headers. */
-        RT_LE2H_U32(pBitmapInfoHeader->u32Size) != sizeof(BMINFOHEADER))
-    {
-        Log (("vboxClipboardDibToBmp: invalid or unsupported bitmap data.\n"));
+    if (   cbSrc < sizeof(BMINFOHEADER)
+        || RT_LE2H_U32(pBitmapInfoHeader->u32Size) < sizeof(BMINFOHEADER)
+        || RT_LE2H_U32(pBitmapInfoHeader->u32Size) != sizeof(BMINFOHEADER))
+    {
+        Log(("vboxClipboardDibToBmp: invalid or unsupported bitmap data.\n"));
         return VERR_INVALID_PARAMETER;
     }
-    pixelOffset = sizeof(BMFILEHEADER)
-        + RT_LE2H_U32(pBitmapInfoHeader->u32Size)
-        + RT_LE2H_U32(pBitmapInfoHeader->u32ClrUsed) * sizeof(uint32_t);
-    if (cbSrc < pixelOffset)
-    {
-        Log (("vboxClipboardDibToBmp: invalid bitmap data.\n"));
+
+    offPixel = sizeof(BMFILEHEADER)
+                + RT_LE2H_U32(pBitmapInfoHeader->u32Size)
+                + RT_LE2H_U32(pBitmapInfoHeader->u32ClrUsed) * sizeof(uint32_t);
+    if (cbSrc < offPixel)
+    {
+        Log(("vboxClipboardDibToBmp: invalid bitmap data.\n"));
         return VERR_INVALID_PARAMETER;
     }
 
-    dest = RTMemAlloc(cb);
-    if (dest == NULL)
-    {
-        Log (("writeToPasteboard: cannot allocate memory for bitmap.\n"));
+    pvDest = RTMemAlloc(cb);
+    if (!pvDest)
+    {
+        Log(("writeToPasteboard: cannot allocate memory for bitmap.\n"));
         return VERR_NO_MEMORY;
     }
 
-    pFileHeader = (PBMFILEHEADER)dest;
-    pFileHeader->u16Type = BITMAPHEADERMAGIC;
-    pFileHeader->u32Size = RT_H2LE_U32(cb);
-    pFileHeader->u16Reserved1 = pFileHeader->u16Reserved2 = 0;
-    pFileHeader->u32OffBits = RT_H2LE_U32(pixelOffset);
-    memcpy((uint8_t *)dest + sizeof(BMFILEHEADER), pSrc, cbSrc);
-    *ppDest = dest;
+    pFileHeader = (PBMFILEHEADER)pvDest;
+    pFileHeader->u16Type        = BITMAPHEADERMAGIC;
+    pFileHeader->u32Size        = RT_H2LE_U32(cb);
+    pFileHeader->u16Reserved1   = pFileHeader->u16Reserved2 = 0;
+    pFileHeader->u32OffBits     = RT_H2LE_U32(offPixel);
+    memcpy((uint8_t *)pvDest + sizeof(BMFILEHEADER), pvSrc, cbSrc);
+    *ppvDest = pvDest;
     *pcbDest = cb;
     return VINF_SUCCESS;
 }
 
-int vboxClipboardBmpGetDib(const void *pSrc, size_t cbSrc, const void **pDest, size_t *pcbDest)
-{
-    PBMFILEHEADER pFileHeader = (PBMFILEHEADER)pSrc;
-
-    if (pFileHeader == NULL || cbSrc < sizeof(BMFILEHEADER) ||
-        pFileHeader->u16Type != BITMAPHEADERMAGIC ||
-        RT_LE2H_U32(pFileHeader->u32Size) != cbSrc)
-    {
-        Log (("vboxClipboardBmpGetDib: invalid bitmap data.\n"));
+int vboxClipboardBmpGetDib(const void *pvSrc, size_t cbSrc, const void **ppvDest, size_t *pcbDest)
+{
+    AssertPtrReturn(pvSrc,   VERR_INVALID_PARAMETER);
+    AssertPtrReturn(ppvDest, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbDest, VERR_INVALID_PARAMETER);
+
+    PBMFILEHEADER pFileHeader = (PBMFILEHEADER)pvSrc;
+    if (   cbSrc < sizeof(BMFILEHEADER)
+        || pFileHeader->u16Type != BITMAPHEADERMAGIC
+        || RT_LE2H_U32(pFileHeader->u32Size) != cbSrc)
+    {
+        Log(("vboxClipboardBmpGetDib: invalid bitmap data.\n"));
         return VERR_INVALID_PARAMETER;
     }
-    *pDest = ((uint8_t *)pSrc) + sizeof(BMFILEHEADER);
+
+    *ppvDest = ((uint8_t *)pvSrc) + sizeof(BMFILEHEADER);
     *pcbDest = cbSrc - sizeof(BMFILEHEADER);
     return VINF_SUCCESS;

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

@@ -6 +6 @@
 /*
  * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2012 François Revol
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as