Changeset 104761 in vbox

Timestamp:

May 22, 2024 2:46:08 PM (10 months ago)

Author:

vboxsync

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

163328

Message:

Shared Clipboard: Attempt to prevent extra new lines when copying text from Linux to Windows (simplify fix), 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 == 0
-                || (   i > 1
-                    && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN
-                   )
-               )
-            {
-                pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
-                ++j;
-            }
+            if (i == 0 || pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+                pu16Dst[j++] = VBOX_SHCL_CARRIAGERETURN;
 
             /* Not enough space in destination? */
@@ -964 +957 @@
         {
             /* Set CR.r, but avoid '\r\r'. */
-            if (   i == 0
-                || (   i > 1
-                    && pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN
-                   )
-               )
-            {
-                pu16Dst[j] = VBOX_SHCL_CARRIAGERETURN;
-                ++j;
-            }
+            if (i == 0 || pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
+                pu16Dst[j++] = VBOX_SHCL_CARRIAGERETURN;
 
             /* Not enough space in destination? */