Changeset 85828 in vbox for trunk/src/VBox/Additions/darwin/VBoxClient

Timestamp:

Aug 19, 2020 9:12:33 AM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Major cleanup for string conversion functions. Not fully tested yet.

Location:

trunk/src/VBox/Additions/darwin/VBoxClient

Files:

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

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

@@ -222 +222 @@
 
     size_t cwcActual; /* (includes a schwarzenegger character) */
-    int rc = ShClUtf16GetWinSize(pwszData, cbData / sizeof(RTUTF16), &cwcActual);
+    int rc = ShClUtf16LFLenUtf8(pwszData, cbData / sizeof(RTUTF16), &cwcActual);
     AssertReturn(RT_SUCCESS(rc), rc);
 
@@ -228 +228 @@
     AssertReturn(pwszWinTmp, VERR_NO_MEMORY);
 
-    rc = ShClUtf16LinToWin(pwszData, cbData / sizeof(RTUTF16), pwszWinTmp, cwcActual);
+    rc = ShClConvUtf16LFToCRLF(pwszData, cbData / sizeof(RTUTF16), pwszWinTmp, cwcActual);
     if (RT_SUCCESS(rc))
         rc = vbclClipboardHostPasteData(u32ClientId, VBOX_SHCL_FMT_UNICODETEXT,

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

@@ -169 +169 @@
 
     /* Convert END-OF-LINE */
-    rc = ShClUtf16GetLinSize((RTUTF16 *)pData, cbDataSize / 2, &cbActualLen);
+    rc = ShClUtf16CRLFLenUtf8((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), &cbActualLen);
     AssertReturn(RT_SUCCESS(rc), rc);
-    pDataInternal = (RTUTF16 *)RTMemAlloc(cbActualLen * 2);
+    pDataInternal = (RTUTF16 *)RTMemAlloc(cbActualLen * sizeof(RTUTF16));
     AssertReturn(pDataInternal, VERR_NO_MEMORY);
-    rc = ShClUtf16WinToLin((RTUTF16 *)pData, cbDataSize / 2, pDataInternal, cbActualLen);
+    rc = ShClConvUtf16CRLFToLF((RTUTF16 *)pData, cbDataSize / sizeof(RTUTF16), pDataInternal, cbActualLen);
 
     /* Do actual paste */