Changeset 7117 in vbox

Timestamp:

Feb 25, 2008 3:54:42 PM (17 years ago)

Author:

vboxsync

Message:

r=bird: subversion attributes. some hungarian fixes. do not pass stuff by reference unless its normal C++ code and very convenient (because it makes it totally unreadable otherwise). A couple of questions. (hope it still compiles)

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• Makefile.kmk (modified) (1 diff)
• clipboard-helper.cpp (modified) (14 diffs, 1 prop)
• clipboard-helper.h (modified) (6 diffs, 1 prop)
• darwin-pasteboard.cpp (modified) (18 diffs, 1 prop)
• darwin-pasteboard.h (modified) (2 diffs, 1 prop)
• darwin.cpp (modified) (11 diffs, 1 prop)

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -35 +35 @@
 VBoxSharedClipboard_SOURCES.darwin = \
         darwin.cpp \
-    clipboard-helper.cpp \
-    darwin-pasteboard.cpp
+        clipboard-helper.cpp \
+        darwin-pasteboard.cpp
 if1of ($(BUILD_TARGET),linux solaris)
  ifndef VBOX_HEADLESS
   VBoxSharedClipboard_SOURCES += \
-    clipboard-helper.cpp \
-        linux.cpp
+        clipboard-helper.cpp \
+        linux.cpp
  else
   VBoxSharedClipboard_SOURCES += \
-        linux-stub.cpp
+        linux-stub.cpp
  endif
 endif

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Clipboard:
- * Some helper function for converting between the various eol.
+ * Shared Clipboard: Some helper function for converting between the various eol.
  */
 
@@ -21 +20 @@
 #include <iprt/assert.h>
 
-int vboxClipboardUtf16GetWinSize(PRTUTF16 pu16Src, size_t cwSrc, size_t *pcwDest)
+/** @todo use const where appropriate; delinuxifiy the code (*Lin* -> *Host*); use AssertLogRel*. */
+
+int vboxClipboardUtf16GetWinSize(PRTUTF16 pwszSrc, size_t cwSrc, size_t *pcwDest)
 {
     size_t cwDest, i;
 
-    LogFlowFunc(("pu16Src=%.*ls, cwSrc=%u\n", cwSrc, pu16Src, cwSrc));
-    if (pu16Src == 0)
-    {
-        LogRel(("vboxClipboardUtf16GetWinSize: received a null Utf16 string, returning VERR_INVALID_PARAMETER\n"));
-        AssertReturn(pu16Src != 0, VERR_INVALID_PARAMETER);
-    }
-    /* We only take little endian Utf16 */
-    if (pu16Src[0] == UTF16BEMARKER)
+    LogFlowFunc(("pwszSrc=%.*ls, cwSrc=%u\n", cwSrc, pwszSrc, cwSrc));
+    AssertLogRelMsgReturn(pwszSrc != NULL, ("vboxClipboardUtf16GetWinSize: received a null Utf16 string, returning VERR_INVALID_PARAMETER\n"), VERR_INVALID_PARAMETER);
+/** @todo convert the remainder of the Assert stuff to AssertLogRel. */
+    /* We only take little endian Utf16 */
+    if (pwszSrc[0] == UTF16BEMARKER)
     {
         LogRel(("vboxClipboardUtf16GetWinSize: received a big endian Utf16 string, returning VERR_INVALID_PARAMETER\n"));
-        AssertReturn(pu16Src[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
+        AssertReturn(pwszSrc[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
     }
     if (cwSrc == 0)
@@ -46 +44 @@
     /* Calculate the size of the destination text string. */
     /* Is this Utf16 or Utf16-LE? */
-    for (i = (pu16Src[0] == UTF16LEMARKER ? 1 : 0); i < cwSrc; ++i, ++cwDest)
-    {
-        if (pu16Src[i] == LINEFEED)
+    for (i = (pwszSrc[0] == UTF16LEMARKER ? 1 : 0); i < cwSrc; ++i, ++cwDest)
+    {
+        if (pwszSrc[i] == LINEFEED)
             ++cwDest;
-        if (pu16Src[i] == 0)
+        if (pwszSrc[i] == 0)
         {
             /* Don't count this, as we do so below. */
@@ -63 +61 @@
 }
 
-int vboxClipboardUtf16LinToWin(PRTUTF16 pu16Src, size_t cwSrc, PRTUTF16 pu16Dest,
+int vboxClipboardUtf16LinToWin(PRTUTF16 pwszSrc, size_t cwSrc, PRTUTF16 pu16Dest,
                                size_t cwDest)
 {
     size_t i, j;
-    LogFlowFunc(("pu16Src=%.*ls, cwSrc=%u\n", cwSrc, pu16Src, cwSrc));
-    if (!VALID_PTR(pu16Src) || !VALID_PTR(pu16Dest))
-    {
-        LogRel(("vboxClipboardUtf16LinToWin: received an invalid pointer, pu16Src=%p, pu16Dest=%p, returning VERR_INVALID_PARAMETER\n", pu16Src, pu16Dest));
-        AssertReturn(VALID_PTR(pu16Src) && VALID_PTR(pu16Dest), VERR_INVALID_PARAMETER);
-    }
-    /* We only take little endian Utf16 */
-    if (pu16Src[0] == UTF16BEMARKER)
+    LogFlowFunc(("pwszSrc=%.*ls, cwSrc=%u\n", cwSrc, pwszSrc, cwSrc));
+    if (!VALID_PTR(pwszSrc) || !VALID_PTR(pu16Dest))
+    {
+        LogRel(("vboxClipboardUtf16LinToWin: received an invalid pointer, pwszSrc=%p, pu16Dest=%p, returning VERR_INVALID_PARAMETER\n", pwszSrc, pu16Dest));
+        AssertReturn(VALID_PTR(pwszSrc) && VALID_PTR(pu16Dest), VERR_INVALID_PARAMETER);
+    }
+    /* We only take little endian Utf16 */
+    if (pwszSrc[0] == UTF16BEMARKER)
     {
         LogRel(("vboxClipboardUtf16LinToWin: received a big endian Utf16 string, returning VERR_INVALID_PARAMETER\n"));
-        AssertReturn(pu16Src[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
+        AssertReturn(pwszSrc[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
     }
     if (cwSrc == 0)
@@ -91 +89 @@
     }
     /* Don't copy the endian marker. */
-    for (i = (pu16Src[0] == UTF16LEMARKER ? 1 : 0), j = 0; i < cwSrc; ++i, ++j)
+    for (i = (pwszSrc[0] == UTF16LEMARKER ? 1 : 0), j = 0; i < cwSrc; ++i, ++j)
     {
         /* Don't copy the null byte, as we add it below. */
-        if (pu16Src[i] == 0)
+        if (pwszSrc[i] == 0)
             break;
         if (j == cwDest)
@@ -101 +99 @@
             return VERR_BUFFER_OVERFLOW;
         }
-        if (pu16Src[i] == LINEFEED)
+        if (pwszSrc[i] == LINEFEED)
         {
             pu16Dest[j] = CARRIAGERETURN;
@@ -111 +109 @@
             }
         }
-        pu16Dest[j] = pu16Src[i];
+        pu16Dest[j] = pwszSrc[i];
     }
     /* Add the trailing null. */
@@ -124 +122 @@
 }
 
-int vboxClipboardUtf16GetLinSize(PRTUTF16 pu16Src, size_t cwSrc, size_t *pcwDest)
+int vboxClipboardUtf16GetLinSize(PRTUTF16 pwszSrc, size_t cwSrc, size_t *pcwDest)
 {
     size_t cwDest;
 
-    LogFlowFunc(("pu16Src=%.*ls, cwSrc=%u\n", cwSrc, pu16Src, cwSrc));
-    if (!VALID_PTR(pu16Src))
-    {
-        LogRel(("vboxClipboardUtf16GetLinSize: received an invalid Utf16 string %p.  Returning VERR_INVALID_PARAMETER.\n", pu16Src));
-        AssertReturn(VALID_PTR(pu16Src), VERR_INVALID_PARAMETER);
-    }
-    /* We only take little endian Utf16 */
-    if (pu16Src[0] == UTF16BEMARKER)
+    LogFlowFunc(("pwszSrc=%.*ls, cwSrc=%u\n", cwSrc, pwszSrc, cwSrc));
+    if (!VALID_PTR(pwszSrc))
+    {
+        LogRel(("vboxClipboardUtf16GetLinSize: received an invalid Utf16 string %p.  Returning VERR_INVALID_PARAMETER.\n", pwszSrc));
+        AssertReturn(VALID_PTR(pwszSrc), VERR_INVALID_PARAMETER);
+    }
+    /* We only take little endian Utf16 */
+    if (pwszSrc[0] == UTF16BEMARKER)
     {
         LogRel(("vboxClipboardUtf16GetLinSize: received a big endian Utf16 string.  Returning VERR_INVALID_PARAMETER.\n"));
-        AssertReturn(pu16Src[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
+        AssertReturn(pwszSrc[0] != UTF16BEMARKER, VERR_INVALID_PARAMETER);
     }
     if (cwSrc == 0)
@@ -148 +146 @@
     /* Calculate the size of the destination text string. */
     /* Is this Utf16 or Utf16-LE? */
-    if (pu16Src[0] == UTF16LEMARKER)
+    if (pwszSrc[0] == UTF16LEMARKER)
         cwDest = 0;
     else
@@ -155 +153 @@
     {
         if (   (i + 1 < cwSrc)
-            && (pu16Src[i] == CARRIAGERETURN)
-            && (pu16Src[i + 1] == LINEFEED))
+            && (pwszSrc[i] == CARRIAGERETURN)
+            && (pwszSrc[i + 1] == LINEFEED))
         {
             ++i;
         }
-        if (pu16Src[i] == 0)
+        if (pwszSrc[i] == 0)
         {
             break;
@@ -172 +170 @@
 }
 
-int vboxClipboardUtf16WinToLin(PRTUTF16 pu16Src, size_t cwSrc, PRTUTF16 pu16Dest,
+int vboxClipboardUtf16WinToLin(PRTUTF16 pwszSrc, size_t cwSrc, PRTUTF16 pu16Dest,
                                size_t cwDest)
 {
     size_t cwDestPos;
 
-    LogFlowFunc(("pu16Src=%.*ls, cwSrc=%u, pu16Dest=%p, cwDest=%u\n",
-                 cwSrc, pu16Src, cwSrc, pu16Dest, cwDest));
+    LogFlowFunc(("pwszSrc=%.*ls, cwSrc=%u, pu16Dest=%p, cwDest=%u\n",
+                 cwSrc, pwszSrc, cwSrc, pu16Dest, cwDest));
     /* A buffer of size 0 may not be an error, but it is not a good idea either. */
     Assert(cwDest > 0);
-    if (!VALID_PTR(pu16Src) || !VALID_PTR(pu16Dest))
-    {
-        LogRel(("vboxClipboardUtf16WinToLin: received an invalid ptr, pu16Src=%p, pu16Dest=%p, returning VERR_INVALID_PARAMETER\n", pu16Src, pu16Dest));
-        AssertReturn(VALID_PTR(pu16Src) && VALID_PTR(pu16Dest), VERR_INVALID_PARAMETER);
-    }
-    /* We only take little endian Utf16 */
-    if (pu16Src[0] == UTF16BEMARKER)
+    if (!VALID_PTR(pwszSrc) || !VALID_PTR(pu16Dest))
+    {
+        LogRel(("vboxClipboardUtf16WinToLin: received an invalid ptr, pwszSrc=%p, pu16Dest=%p, returning VERR_INVALID_PARAMETER\n", pwszSrc, pu16Dest));
+        AssertReturn(VALID_PTR(pwszSrc) && VALID_PTR(pu16Dest), VERR_INVALID_PARAMETER);
+    }
+    /* We only take little endian Utf16 */
+    if (pwszSrc[0] == UTF16BEMARKER)
     {
         LogRel(("vboxClipboardUtf16WinToLin: received a big endian Utf16 string, returning VERR_INVALID_PARAMETER\n"));
@@ -204 +202 @@
     }
     /* Prepend the Utf16 byte order marker if it is missing. */
-    if (pu16Src[0] == UTF16LEMARKER)
+    if (pwszSrc[0] == UTF16LEMARKER)
     {
         cwDestPos = 0;
@@ -215 +213 @@
     for (size_t i = 0; i < cwSrc; ++i, ++cwDestPos)
     {
-        if (pu16Src[i] == 0)
+        if (pwszSrc[i] == 0)
         {
             break;
@@ -225 +223 @@
         }
         if (   (i + 1 < cwSrc)
-            && (pu16Src[i] == CARRIAGERETURN)
-            && (pu16Src[i + 1] == LINEFEED))
+            && (pwszSrc[i] == CARRIAGERETURN)
+            && (pwszSrc[i + 1] == LINEFEED))
         {
             ++i;
         }
-        pu16Dest[cwDestPos] = pu16Src[i];
+        pu16Dest[cwDestPos] = pwszSrc[i];
     }
     /* Terminating zero */

trunk/src/VBox/HostServices/SharedClipboard/clipboard-helper.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Clipboard:
- * Some helper function for converting between the various eol.
+ * Shared Clipboard: Some helper function for converting between the various eol.
  */
 
@@ -17 +16 @@
  */
 
-#ifndef __CLIPBOARD_HELPER_H
-#define __CLIPBOARD_HELPER_H
+#ifndef ___CLIPBOARD_HELPER_H
+#define ___CLIPBOARD_HELPER_H
 
 #include <iprt/string.h>
@@ -40 +39 @@
  * @returns RT error code
  *
- * @param   pu16Src  The source Utf16 string
+ * @param   pwszSrc  The source Utf16 string
  * @param   cwSrc    The length in 16 bit words of the source string
  * @retval  pcwDest  The length of the destination string in 16 bit words
  */
-int vboxClipboardUtf16GetWinSize(PRTUTF16 pu16Src, size_t cwSrc, size_t *pcwDest);
+int vboxClipboardUtf16GetWinSize(PRTUTF16 pwszSrc, size_t cwSrc, size_t *pcwDest);
 
 /**
@@ -52 +51 @@
  * @returns VBox status code
  *
- * @param   pu16Src  Source Utf16 text to convert
+ * @param   pwszSrc  Source Utf16 text to convert
  * @param   cwSrc    Size of the source text in 16 bit words
  * @retval  pu16Dest Buffer to store the converted text to.
  * @retval  pcwDest  Size of the buffer for the converted text in 16 bit words
  */
-int vboxClipboardUtf16LinToWin(PRTUTF16 pu16Src, size_t cwSrc, PRTUTF16 pu16Dest, size_t cwDest);
+int vboxClipboardUtf16LinToWin(PRTUTF16 pwszSrc, size_t cwSrc, PRTUTF16 pu16Dest, size_t cwDest);
 
 /**
@@ -65 +64 @@
  * @returns RT status code
  *
- * @param   pu16Src  The source Utf16 string
+ * @param   pwszSrc  The source Utf16 string
  * @param   cwSrc    The length in 16 bit words of the source string
  * @retval  pcwDest  The length of the destination string in 16 bit words
  */
-int vboxClipboardUtf16GetLinSize(PRTUTF16 pu16Src, size_t cwSrc, size_t *pcwDest);
+int vboxClipboardUtf16GetLinSize(PRTUTF16 pwszSrc, size_t cwSrc, size_t *pcwDest);
 
 /**
@@ -77 +76 @@
  * @returns VBox status code
  *
- * @param   pu16Src       Text to convert
+ * @param   pwszSrc       Text to convert
  * @param   cwSrc         Size of the source text in 16 bit words
  * @param   pu16Dest      The buffer to store the converted text to
  * @param   cwDest        The size of the buffer for the destination text in 16 bit words
  */
-int vboxClipboardUtf16WinToLin(PRTUTF16 pu16Src, size_t cwSrc, PRTUTF16 pu16Dest, size_t cwDest);
+int vboxClipboardUtf16WinToLin(PRTUTF16 pwszSrc, size_t cwSrc, PRTUTF16 pu16Dest, size_t cwDest);
 
-#endif /* __CLIPBOARD_HELPER_H */
+#endif
 

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Clipboard:
- * Mac OS X host implementation.
+ * Shared Clipboard: Mac OS X host implementation.
  */
 
@@ -17 +16 @@
  */
 
-// @todo: same as defined in VBoxClipboardSvc.h
+/// @todo: same as defined in VBoxClipboardSvc.h
+/// @todo r-bird: why don't you include it?
 #define VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT 0x01
 #define VBOX_SHARED_CLIPBOARD_FMT_BITMAP      0x02
@@ -34 +34 @@
 //#define SHOW_CLIPBOARD_CONTENT
 
-int initPasteboard (PasteboardRef &pPasteboard)
+int initPasteboard (PasteboardRef *pPasteboardRef)
 {
     int rc = VINF_SUCCESS;
 
-    if (PasteboardCreate (kPasteboardClipboard, &pPasteboard))
+    if (PasteboardCreate (kPasteboardClipboard, pPasteboardRef))
         rc = VERR_NOT_SUPPORTED;
 
@@ -44 +44 @@
 }
 
-void destroyPasteboard (PasteboardRef &pPasteboard)
-{
-    CFRelease (pPasteboard);
-    pPasteboard = NULL;
-}
-
-int queryPasteboardFormats (PasteboardRef pPasteboard, uint32_t &u32Formats)
+void destroyPasteboard (PasteboardRef *pPasteboardRef)
+{
+    CFRelease (*pPasteboardRef);
+    *pPasteboardRef = NULL;
+}
+
+int queryPasteboardFormats (PasteboardRef pPasteboard, uint32_t pfFormats)
 {
     Log (("queryPasteboardFormats\n"));
@@ -74 +74 @@
     if (!(err = PasteboardGetItemIdentifier (pPasteboard, 1, &itemID)))
     {
-        /* Retrieve all flavors in the pasteboard, maybe there 
+        /* Retrieve all flavors in the pasteboard, maybe there
          * is something we can use. */
         CFArrayRef flavorTypeArray;
@@ -91 +91 @@
                 {
                     Log (("Unicode flavor detected.\n"));
-                    u32Formats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+                    *pfFormats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
                 }
             }
@@ -103 +103 @@
 }
 
-int readFromPasteboard (PasteboardRef pPasteboard, uint32_t u32Format, void *pv, uint32_t cb, uint32_t *pcbActual)
-{
-    Log (("readFromPastboard: u32Format = %02X\n", u32Format));
+int readFromPasteboard (PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual)
+{
+    Log (("readFromPastboard: fFormat = %02X\n", fFormat));
 
     OSStatus err = noErr;
@@ -124 +124 @@
     {
         /* The guest request unicode */
-        if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+        if (fFormat & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
         {
             CFDataRef outData;
-            PRTUTF16 pu16Tmp = NULL;
-            /* Utf-16 is currently broken on more than one line. 
+            PRTUTF16 pwszTmp = NULL;
+            /* Utf-16 is currently broken on more than one line.
              * Has to be investigated. */
 #if 0
@@ -135 +135 @@
             {
                 Log (("Clipboard content is utf-16\n"));
-                rc = RTUtf16DupEx (&pu16Tmp, (RTUTF16*)CFDataGetBytePtr (outData), 0);
+                rc = RTUtf16DupEx (&pwszTmp, (PRTUTF16)CFDataGetBytePtr (outData), 0);
             }
             /* Second try is utf-8 */
-            else 
-#endif 
+            else
+#endif
                 if (!(err = PasteboardCopyItemFlavorData (pPasteboard, itemID, CFSTR ("public.utf8-plain-text"), &outData)))
                 {
                     Log (("readFromPastboard: clipboard content is utf-8\n"));
-                    rc = RTStrToUtf16 ((const char*)CFDataGetBytePtr (outData), &pu16Tmp);
-                }
-            if (pu16Tmp)
+                    rc = RTStrToUtf16 ((const char*)CFDataGetBytePtr (outData), &pwszTmp);
+                }
+            if (pwszTmp)
             {
                 /* Check how much longer will the converted text will be. */
-                size_t cwSrcLen = RTUtf16Len (pu16Tmp);
-                size_t cwDestLen;
-                rc = vboxClipboardUtf16GetWinSize (pu16Tmp, cwSrcLen, &cwDestLen);
+                size_t cwSrc = RTUtf16Len (pwszTmp);
+                size_t cwDest;
+                rc = vboxClipboardUtf16GetWinSize (pwszTmp, cwSrc, &cwDest);
                 if (RT_FAILURE (rc))
                 {
-                    RTUtf16Free (pu16Tmp);
+                    RTUtf16Free (pwszTmp);
                     Log (("readFromPastboard: clipboard conversion failed.  vboxClipboardUtf16GetWinSize returned %Vrc.  Abandoning.\n", rc));
                     AssertRCReturn (rc, rc);
                 }
                 /* Set the actually needed data size */
-                *pcbActual = cwDestLen * 2;
+                *pcbActual = cwDest * 2;
                 /* Return success state */
                 rc = VINF_SUCCESS;
@@ -164 +164 @@
                 if (*pcbActual <= cb)
                 {
-                    rc = vboxClipboardUtf16LinToWin (pu16Tmp, RTUtf16Len (pu16Tmp), static_cast <PRTUTF16> (pv), cb / 2);
+                    rc = vboxClipboardUtf16LinToWin (pwszTmp, RTUtf16Len (pwszTmp), static_cast <PRTUTF16> (pv), cb / 2);
                     if (RT_FAILURE (rc))
                     {
-                        RTUtf16Free (pu16Tmp);
+                        RTUtf16Free (pwszTmp);
                         Log (("readFromPastboard: clipboard conversion failed.  vboxClipboardUtf16LinToWin() returned %Vrc.  Abandoning.\n", rc));
                         AssertRCReturn (rc, rc);
@@ -176 +176 @@
                 }
                 /* Free the temp string */
-                RTUtf16Free (pu16Tmp);
+                RTUtf16Free (pwszTmp);
             }
         }
@@ -185 +185 @@
 }
 
-int writeToPasteboard (PasteboardRef pPasteboard, void *pv, uint32_t cb, uint32_t u32Format)
-{
-    Log (("writeToPasteboard: u32Format = %02X\n", u32Format));
- 
+int writeToPasteboard (PasteboardRef pPasteboard, void *pv, uint32_t cb, uint32_t fFormat)
+{
+    Log (("writeToPasteboard: fFormat = %02X\n", fFormat));
+
     /* Clear the pastboard */
     if (PasteboardClear (pPasteboard))
@@ -198 +198 @@
     int rc = VERR_NOT_SUPPORTED;
     /* Handle the unicode text */
-    if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+    if (fFormat & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
     {
-        PRTUTF16 pu16SrcText = static_cast <PRTUTF16> (pv);
-        size_t cwSrcLen = cb / 2;
-        size_t cwDestLen = 0;
+        PRTUTF16 pwszSrcText = static_cast <PRTUTF16> (pv);
+        size_t cwSrc = cb / 2;
+        size_t cwDest = 0;
         /* How long will the converted text be? */
-        rc = vboxClipboardUtf16GetLinSize (pu16SrcText, cwSrcLen, &cwDestLen);
+        rc = vboxClipboardUtf16GetLinSize (pwszSrcText, cwSrc, &cwDest);
         if (RT_FAILURE (rc))
         {
@@ -211 +211 @@
         }
         /* Empty clipboard? Not critical */
-        if (cwDestLen == 0)
+        if (cwDest == NULL)
         {
             Log (("writeToPasteboard: received empty clipboard data from the guest, returning false.\n"));
@@ -217 +217 @@
         }
         /* Allocate the necessary memory */
-        PRTUTF16 pu16DestText = static_cast <PRTUTF16> (RTMemAlloc (cwDestLen * 2));
-        if (pu16DestText == 0)
-        {
-            Log (("writeToPasteboard: failed to allocate %d bytes\n", cwDestLen * 2));
+        PRTUTF16 pwszDestText = static_cast <PRTUTF16> (RTMemAlloc (cwDest * 2));
+        if (pwszDestText == NULL)
+        {
+            Log (("writeToPasteboard: failed to allocate %d bytes\n", cwDest * 2));
             return VERR_NO_MEMORY;
         }
         /* Convert the EOL */
-        rc = vboxClipboardUtf16WinToLin (pu16SrcText, cwSrcLen, pu16DestText, cwDestLen);
+        rc = vboxClipboardUtf16WinToLin (pwszSrcText, cwSrc, pwszDestText, cwDest);
         if (RT_FAILURE (rc))
         {
             Log (("writeToPasteboard: clipboard conversion failed.  vboxClipboardUtf16WinToLin() returned %Vrc.  Abandoning.\n", rc));
-            RTMemFree (pu16DestText);
+            RTMemFree (pwszDestText);
             AssertRCReturn (rc, rc);
         }
@@ -237 +237 @@
         /* Create a CData object which we could pass to the pasteboard */
         if ((textData = CFDataCreate (kCFAllocatorDefault,
-                                      reinterpret_cast<UInt8*> (pu16DestText), cwDestLen * 2)))
+                                      reinterpret_cast<UInt8*> (pwszDestText), cwDest * 2)))
         {
             /* Put the Utf-16 version to the pasteboard */
@@ -245 +245 @@
         }
         /* Create a Utf-8 version */
-        char *pu8DestText;
-        rc = RTUtf16ToUtf8 (pu16DestText, &pu8DestText);
+        char *pszDestText;
+        rc = RTUtf16ToUtf8 (pwszDestText, &pszDestText);
         if (RT_SUCCESS (rc))
         {
             /* Create a CData object which we could pass to the pasteboard */
             if ((textData = CFDataCreate (kCFAllocatorDefault,
-                                          reinterpret_cast<UInt8*> (pu8DestText), RTUtf16CalcUtf8Len (pu16DestText))))
+                                          reinterpret_cast<UInt8*> (pszDestText), RTUtf16CalcUtf8Len (pwszDestText)))) /** @todo r=bird: why not strlen(pszDestText)? */
             {
                 /* Put the Utf-8 version to the pasteboard */
@@ -258 +258 @@
                                          textData, 0);
             }
-            RTStrFree (pu8DestText);
-        }
-
-        RTMemFree (pu16DestText);
+            RTStrFree (pszDestText);
+        }
+
+        RTMemFree (pwszDestText);
         rc = VINF_SUCCESS;
     }

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Clipboard:
- * Mac OS X host implementation.
+ * Shared Clipboard: Mac OS X host implementation.
  */
 
@@ -17 +16 @@
  */
 
-#ifndef __DARWIN_PASTEBOARD_H
-#define __DARWIN_PASTEBOARD_H
+#ifndef ___DARWIN_PASTEBOARD_H
+#define ___DARWIN_PASTEBOARD_H
 
 typedef struct OpaquePasteboardRef;
 typedef struct OpaquePasteboardRef *PasteboardRef;
 
-int initPasteboard (PasteboardRef &pPasteboard);
-void destroyPasteboard (PasteboardRef &pPasteboard);
+int initPasteboard (PasteboardRef *pPasteboardRef);
+void destroyPasteboard (PasteboardRef *pPasteboardRef);
 
-int queryPasteboardFormats (PasteboardRef pPasteboard, uint32_t &u32Formats);
-int readFromPasteboard (PasteboardRef pPasteboard, uint32_t u32Format, void *pv, uint32_t cb, uint32_t *pcbActual);
-int writeToPasteboard (PasteboardRef pPasteboard, void *pv, uint32_t cb, uint32_t u32Format);
+int queryPasteboardFormats (PasteboardRef pPasteboard, uint32_t *pfFormats);
+int readFromPasteboard (PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual);
+int writeToPasteboard (PasteboardRef pPasteboard, void *pv, uint32_t cb, uint32_t fFormat);
 
-#endif /* __DARWIN-PASTEBOARD_H */
+#endif
 

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Clipboard:
- * Mac OS X host.
+ * Shared Clipboard: Mac OS X host.
  */
 
@@ -24 +23 @@
 #include "VBoxClipboard.h"
 /* We do the work in a separate cpp file because
- * of the conflicting typedef "OSType". This is 
+ * of the conflicting typedef "OSType". This is
  * defined in Carbon and in VBox/ostypes.h also. */
 #include "darwin-pasteboard.h"
@@ -31 +30 @@
 struct _VBOXCLIPBOARDCONTEXT
 {
-    /* We have a separate thread to poll for new clipboard content */
+    /** We have a separate thread to poll for new clipboard content */
     RTTHREAD thread;
-    bool     fTerminate;
-
-    /* The reference to the current pasteboard */
+    bool volatile fTerminate;
+
+    /** The reference to the current pasteboard */
     PasteboardRef pasteboard;
 
@@ -41 +40 @@
 };
 
-/* Only one client is supported. There seems to be no need for more clients. */
+/** Only one client is supported. There seems to be no need for more clients. */
 static VBOXCLIPBOARDCONTEXT g_ctx;
 
@@ -49 +48 @@
         return VINF_SUCCESS;
 
-    uint32_t u32Formats = 0;
+    uint32_t fFormats = 0;
     /* Retrieve the formats currently in the clipboard and supported by vbox */
-    int rc = queryPasteboardFormats (pCtx->pasteboard, u32Formats);
-
-    if (u32Formats > 0)
-    {
-        vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, u32Formats);
-        Log (("vboxClipboardChanged u32Formats %02X\n", u32Formats));
+    int rc = queryPasteboardFormats (pCtx->pasteboard, fFormats);
+
+    if (fFormats > 0)
+    {
+        vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, fFormats);
+        Log (("vboxClipboardChanged fFormats %02X\n", fFormats));
     }
 
@@ -65 +64 @@
 {
     Log (("vboxClipboardThread: starting clipboard thread\n"));
-    
+
     AssertReturn (VALID_PTR (pvUser), VERR_INVALID_PARAMETER);
 
@@ -94 +93 @@
     g_ctx.fTerminate = false;
 
-    rc = initPasteboard (g_ctx.pasteboard);
-
-    rc = RTThreadCreate (&g_ctx.thread, vboxClipboardThread, &g_ctx, 0, 
+    rc = initPasteboard (&g_ctx.pasteboard);
+
+    rc = RTThreadCreate (&g_ctx.thread, vboxClipboardThread, &g_ctx, 0,
                          RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
 
@@ -109 +108 @@
     g_ctx.fTerminate = true;
 
-    destroyPasteboard (g_ctx.pasteboard);
+    destroyPasteboard (&g_ctx.pasteboard);
 
     /* Wait for the clipboard thread to terminate. */
@@ -148 +147 @@
     /* Sync the host clipboard content with the client. */
     int rc = vboxClipboardChanged (pClient->pCtx);
-    
+
     return rc;
 }
@@ -158 +157 @@
 {
     Log (("vboxClipboardDisconnect\n"));
-    
+
     g_ctx.pClient = NULL;
 }
@@ -179 +178 @@
     }
 
-    vboxSvcClipboardReportMsg (g_ctx.pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA, 
+    vboxSvcClipboardReportMsg (g_ctx.pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
                                u32Formats);
 }