Changeset 104773 in vbox

Timestamp:

May 24, 2024 12:56:32 PM (6 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Make ShClUtf16LFLenUtf8 to provide proper length in characters for LF -> CRLF conversion, bugref:10694.

Also rename the function into ShClUtf16CalcNormalizedEolToCRLFLength and update documentation.

Location:

trunk

Files:

• include/VBox/GuestHost/clipboard-helper.h (modified) (2 diffs)
• src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboardGuestToHost.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/clipboard-helper.h

@@ -62 +62 @@
 
 /**
- * Returns the length (in UTF-8 characters) of an UTF-16 string with LF EOL.
+ * Returns calculated length (in UTF-8 characters) of normalized UTF-16 string with CRLF EOL.
+ *
+ * This function should be used in order to calculate number of UTF-8 characters
+ * in normalized UTF-16. Normalized string is expected to have LF characters replaced
+ * with CRLF sequences.
  *
  * @returns VBox status code.
@@ -70 +74 @@
  *                              Does not include terminator.
  */
-int ShClUtf16LFLenUtf8(PCRTUTF16 pcwszSrc, size_t cwcSrc, size_t *pchLen);
+int ShClUtf16CalcNormalizedEolToCRLFLength(PCRTUTF16 pcwszSrc, size_t cwcSrc, size_t *pchLen);
 
 /**

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

@@ -234 +234 @@
 
     size_t cwcTmp; /* (includes a schwarzenegger character) */
-    int rc = ShClUtf16LFLenUtf8(pwszData, cbData / sizeof(RTUTF16), &cwcTmp);
+    int rc = ShClUtf16CalcNormalizedEolToCRLFLength(pwszData, cbData / sizeof(RTUTF16), &cwcTmp);
     AssertRCReturn(rc, rc);
 

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -668 +668 @@
     size_t   cchDst;
 
-    int rc = ShClUtf16LFLenUtf8(pcwszSrc, cwcSrc, &cchDst);
+    int rc = ShClUtf16CalcNormalizedEolToCRLFLength(pcwszSrc, cwcSrc, &cchDst);
     if (RT_SUCCESS(rc))
     {
@@ -838 +838 @@
 }
 
-int ShClUtf16LFLenUtf8(PCRTUTF16 pcwszSrc, size_t cwSrc, size_t *pchLen)
+int ShClUtf16CalcNormalizedEolToCRLFLength(PCRTUTF16 pcwszSrc, size_t cwSrc, size_t *pchLen)
 {
     AssertPtrReturn(pcwszSrc, VERR_INVALID_POINTER);
@@ -856 +856 @@
     {
         /* Check for a single line feed */
-        if (pcwszSrc[i] == VBOX_SHCL_LINEFEED)
+        if (   pcwszSrc[i] == VBOX_SHCL_LINEFEED
+            && (i == 0 || pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN))
+        {
             ++cLen;
+        }
 #ifdef RT_OS_DARWIN
         /* Check for a single carriage return (MacOS) */
-        if (pcwszSrc[i] == VBOX_SHCL_CARRIAGERETURN)
+        if (   pcwszSrc[i] == VBOX_SHCL_CARRIAGERETURN
+            && (i + 1 >= cwcSrc || pcwszSrc[i + 1] != VBOX_SHCL_LINEFEED))
+        {
             ++cLen;
+        }
 #endif
         if (pcwszSrc[i] == 0)

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

@@ -313 +313 @@
                 Assert(cwcSrc == RTUtf16Len(pwszSrc));
                 size_t cwcDst = 0;
-                rc = ShClUtf16LFLenUtf8(pwszSrc, cwcSrc, &cwcDst);
+                rc = ShClUtf16CalcNormalizedEolToCRLFLength(pwszSrc, cwcSrc, &cwcDst);
                 if (RT_SUCCESS(rc))
                 {