Changeset 85828 in vbox for trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

Timestamp:

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

Author:

vboxsync

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

139986

Message:

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

File:

• trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp (modified) (4 diffs)

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

@@ -299 +299 @@
                 Assert(cwcSrc == RTUtf16Len(pwszSrc));
                 size_t cwcDst = 0;
-                rc = ShClUtf16GetWinSize(pwszSrc, cwcSrc, &cwcDst);
+                rc = ShClUtf16LFLenUtf8(pwszSrc, cwcSrc, &cwcDst);
                 if (RT_SUCCESS(rc))
                 {
@@ -305 +305 @@
                     if (*pcbActual <= cb)
                     {
-                        rc = ShClUtf16LinToWin(pwszSrc, cwcSrc, (PRTUTF16)pv, cb / sizeof(RTUTF16));
+                        rc = ShClConvUtf16LFToCRLF(pwszSrc, cwcSrc, (PRTUTF16)pv, cb / sizeof(RTUTF16));
                         if (RT_SUCCESS(rc))
                         {
@@ -554 +554 @@
         /* How long will the converted text be? */
         size_t cwcDst = 0;
-        rc = ShClUtf16GetLinSize(pwszSrc, cwcSrc, &cwcDst);
+        rc = ShClUtf16CRLFLenUtf8(pwszSrc, cwcSrc, &cwcDst);
         AssertMsgRCReturn(rc, ("ShClUtf16GetLinSize failed: %Rrc\n", rc), rc);
 
@@ -568 +568 @@
         AssertMsgReturn(pwszDst, ("cwcDst=%#zx\n", cwcDst), VERR_NO_UTF16_MEMORY);
 
-        rc = ShClUtf16WinToLin(pwszSrc, cwcSrc, pwszDst, cwcDst);
+        rc = ShClConvUtf16CRLFToLF(pwszSrc, cwcSrc, pwszDst, cwcDst);
         if (RT_SUCCESS(rc))
         {