Changeset 85845 in vbox for trunk/src/VBox/Additions/darwin

Timestamp:

Aug 20, 2020 2:28:33 PM (5 years ago)

Author:

vboxsync

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

140013

Message:

Shared Clipboard/X11: Fixes for empty strings (was too strict before), don't include the terminating zeros when return string lengths to match IPRT. Also should fix the testcases.

Location:

trunk/src/VBox/Additions/darwin/VBoxClient

Files:

• VBoxClientClipboardGuestToHost.cpp (modified) (1 diff)
• VBoxClientClipboardHostToGuest.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboardGuestToHost.cpp

@@ -221 +221 @@
     AssertPtrReturn(pwszData, VERR_INVALID_POINTER);
 
-    size_t cwcActual; /* (includes a schwarzenegger character) */
-    int rc = ShClUtf16LFLenUtf8(pwszData, cbData / sizeof(RTUTF16), &cwcActual);
-    AssertReturn(RT_SUCCESS(rc), rc);
-
-    PRTUTF16 pwszWinTmp = (PRTUTF16)RTMemAlloc(cwcActual * sizeof(RTUTF16));
-    AssertReturn(pwszWinTmp, VERR_NO_MEMORY);
-
-    rc = ShClConvUtf16LFToCRLF(pwszData, cbData / sizeof(RTUTF16), pwszWinTmp, cwcActual);
+    size_t cwcTmp; /* (includes a schwarzenegger character) */
+    int rc = ShClUtf16LFLenUtf8(pwszData, cbData / sizeof(RTUTF16), &cwcTmp);
+    AssertRCReturn(rc, rc);
+
+    cwcTmp++; /* Add space for terminator. */
+
+    PRTUTF16 pwszTmp = (PRTUTF16)RTMemAlloc(cwcTmp * sizeof(RTUTF16));
+    AssertReturn(pwszTmp, VERR_NO_MEMORY);
+
+    rc = ShClConvUtf16LFToCRLF(pwszData, cbData / sizeof(RTUTF16), pwszTmp, cwcTmp);
     if (RT_SUCCESS(rc))
         rc = vbclClipboardHostPasteData(u32ClientId, VBOX_SHCL_FMT_UNICODETEXT,
-                                        pwszWinTmp, cwcActual * sizeof(RTUTF16));
-
-    RTMemFree(pwszWinTmp);
+                                        pwszTmp, cwcTmp * sizeof(RTUTF16));
+
+    RTMemFree(pwszTmp);
 
     return rc;

trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboardHostToGuest.cpp

@@ -155 +155 @@
 static int vbclClipboardGuestPasteText(PasteboardRef pPasteboard, void *pData, uint32_t cbDataSize)
 {
-    size_t   cbActualLen;
-    int      rc;
-    char    *pszUtf8Buf;
-    RTUTF16 *pDataInternal;
-
     AssertReturn(pData, VERR_INVALID_PARAMETER);
 
@@ -169 +164 @@
 
     /* Convert END-OF-LINE */
-    rc = ShClUtf16CRLFLenUtf8((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), &cbActualLen);
-    AssertReturn(RT_SUCCESS(rc), rc);
-    pDataInternal = (RTUTF16 *)RTMemAlloc(cbActualLen * sizeof(RTUTF16));
-    AssertReturn(pDataInternal, VERR_NO_MEMORY);
-    rc = ShClConvUtf16CRLFToLF((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), pDataInternal, cbActualLen);
-
-    /* Do actual paste */
+    size_t cwcDst;
+    int rc = ShClUtf16CRLFLenUtf8((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), &cwcDst);
+    AssertRCReturn(rc, rc);
+
+    cwcDst++; /* Add space for terminator. */
+
+    PRTUTF16 pwszDst = (RTUTF16 *)RTMemAlloc(cwcDst * sizeof(RTUTF16));
+    AssertPtrReturn(pwszDst, VERR_NO_MEMORY);
+
+    rc = ShClConvUtf16CRLFToLF((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), pwszDst, cwcDst);
     if (RT_SUCCESS(rc))
     {
         /* Paste UTF16 */
-        rc = vbclClipboardGuestPasteData(pPasteboard, (UInt8 *)pDataInternal, cbActualLen * 2, kUTTypeUTF16PlainText, true);
+        rc = vbclClipboardGuestPasteData(pPasteboard, (UInt8 *)pwszDst, cwcDst * sizeof(RTUTF16), kUTTypeUTF16PlainText, true);
         if (RT_SUCCESS(rc))
         {
             /* Paste UTF8 */
-            rc = RTUtf16ToUtf8((RTUTF16 *)pDataInternal, &pszUtf8Buf);
+            char *pszDst;
+            rc = RTUtf16ToUtf8((PRTUTF16)pwszDst, &pszDst);
             if (RT_SUCCESS(rc))
             {
-                rc = vbclClipboardGuestPasteData(pPasteboard, (UInt8 *)pszUtf8Buf, strlen(pszUtf8Buf), kUTTypeUTF8PlainText, false);
-                RTStrFree(pszUtf8Buf);
+                rc = vbclClipboardGuestPasteData(pPasteboard, (UInt8 *)pszDst, strlen(pszDst), kUTTypeUTF8PlainText, false);
+                RTStrFree(pszDst);
             }
         }
@@ -193 +192 @@
     }
 
-    RTMemFree(pDataInternal);
+    RTMemFree(pwszDst);
 
     return rc;