Changeset 8268 in vbox

Timestamp:

Apr 22, 2008 9:12:54 AM (17 years ago)

Author:

vboxsync

Message:

OSX: Fixed #2788. Utf-16 text not transfered from host to guest.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• clipboard-helper.cpp (modified) (2 diffs)
• darwin-pasteboard.cpp (modified) (2 diffs)

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

@@ -50 +50 @@
     for (i = (pwszSrc[0] == UTF16LEMARKER ? 1 : 0); i < cwSrc; ++i, ++cwDest)
     {
+        /* Check for a single line feed */
         if (pwszSrc[i] == LINEFEED)
+            ++cwDest;
+        /* Check for a single carriage return (MacOS) */
+        if (pwszSrc[i] == CARRIAGERETURN)
             ++cwDest;
         if (pwszSrc[i] == 0)
@@ -113 +117 @@
             }
         }
+        else
+            /* Check for a single carriage return (MacOS) */
+            if (pwszSrc[i] == CARRIAGERETURN)
+            {
+                /* set cr */
+                pu16Dest[j] = CARRIAGERETURN;
+                ++j;
+                if (j == cwDest)
+                {
+                    LogFlowFunc(("returning VERR_BUFFER_OVERFLOW\n"));
+                    return VERR_BUFFER_OVERFLOW;
+                }
+                /* add the lf */
+                pu16Dest[j] = LINEFEED;
+                continue;
+            }
         pu16Dest[j] = pwszSrc[i];
     }

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

@@ -167 +167 @@
             CFDataRef outData;
             PRTUTF16 pwszTmp = NULL;
-            /* Utf-16 is currently broken on more than one line.
-             * Has to be investigated. */
-#if 0
             /* Try utf-16 first */
             if (!(err = PasteboardCopyItemFlavorData (pPasteboard, itemID, CFSTR ("public.utf16-plain-text"), &outData)))
@@ -178 +175 @@
             /* Second try is utf-8 */
             else
-#endif
                 if (!(err = PasteboardCopyItemFlavorData (pPasteboard, itemID, CFSTR ("public.utf8-plain-text"), &outData)))
                 {