Changeset 104760 in vbox for trunk/src/VBox/GuestHost

Timestamp:

May 22, 2024 2:32:06 PM (9 months ago)

Author:

vboxsync

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

163326

Message:

Shared Clipboard: Attempt to prevent extra new lines when copying text from Linux to Windows (take care about buf[0] == '\n' as well), bugref:10694.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (2 diffs)

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

@@ -942 +942 @@
             /* Insert '\r' in front of '\n', but avoid '\r\r\n' situations
                because it will result in extra empty lines on the other side. */
-            if (   i > 1
-                && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+            if (   i == 0
+                || (   i > 1
+                    && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN
+                   )
+               )
             {
                 pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
@@ -961 +964 @@
         {
             /* Set CR.r, but avoid '\r\r'. */
-            if (   i > 1
-                && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+            if (   i == 0
+                || (   i > 1
+                    && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN
+                   )
+               )
             {
                 pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;