Changeset 22234 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2009 12:20:07 PM (15 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard/x11: revert r50977, as Windows doesn't like non-nul-terminated clipboard text

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (8 diffs)

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

@@ -1028 +1028 @@
                                      XtPointer *pValReturn,
                                      unsigned long *pcLenReturn,
-                                     int *piFormatReturn)
+                                         int *piFormatReturn)
 {
     char *pszTmp = NULL, *pszTmp2 = NULL;
@@ -1113 +1113 @@
                                            atomTypeReturn, pValReturn,
                                            pcLenReturn, piFormatReturn);
-        /* Our conversion functions add nul terminators if they are missing.
-         * Remove them again. */
-        if (RT_SUCCESS(rc) && ((PRTUTF16)pv)[cb / 2 - 1] != 0)
-            --(*pcLenReturn);
         RTMemFree(pv);
     }
@@ -1513 +1509 @@
                 rc = VERR_INVALID_PARAMETER;
         }
-        /* Our conversion functions add nul terminators if they are missing.
-         * Remove them again. */
-        if (RT_SUCCESS(rc) && ((const char *)pvSrc)[cbSrc - 1] != '\0')
-            cbDest -= 2;
     }
     else
@@ -2289 +2281 @@
     clipSetSelectionValues("TEXT", XA_STRING,
                            "hello world", sizeof("hello world") - 1, 8);
-    testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
-                      sizeof("hello world") * 2 - 2);
+    // testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
+    //                   sizeof("hello world") * 2 - 2);
 
     /*** COMPOUND TEXT from X11 ***/
@@ -2317 +2309 @@
     clipSetSelectionValues("COMPOUND_TEXT", XA_STRING,
                            "hello world", sizeof("hello world") - 1, 8);
-    testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
-                      sizeof("hello world") * 2 - 2);
+    // testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
+    //                   sizeof("hello world") * 2 - 2);
 
     /*** Latin1 from X11 ***/
@@ -2342 +2334 @@
                            "Georges Dupr\xEA!",
                            sizeof("Georges Dupr\xEA!") - 1, 8);
-    testLatin1FromX11(hTest, pCtx, "Georges Dupr\xEA!", VINF_SUCCESS,
-                      sizeof("Georges Dupr\xEA!") * 2 - 2);
+    // testLatin1FromX11(hTest, pCtx, "Georges Dupr\xEA!", VINF_SUCCESS,
+    //                   sizeof("Georges Dupr\xEA!") * 2 - 2);
 
     /*** Unknown X11 format ***/
@@ -2451 +2443 @@
     clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "hello world",
                      sizeof("hello world") * 2 - 2);
-    testStringFromVBox(hTest, pCtx, "TEXT", clipGetAtom(NULL, "TEXT"),
-                       "hello world", sizeof("hello world") - 1);
+    // testStringFromVBox(hTest, pCtx, "TEXT",
+    //                         clipGetAtom(NULL, "TEXT"),
+    //                         "hello world", sizeof("hello world") - 1);
 
     /*** COMPOUND TEXT from VBox ***/
@@ -2488 +2481 @@
     clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "hello world",
                      sizeof("hello world") * 2 - 2);
-    testStringFromVBox(hTest, pCtx, "COMPOUND_TEXT",
-                       clipGetAtom(NULL, "COMPOUND_TEXT"),
-                       "hello world", sizeof("hello world") - 1);
+    // testStringFromVBox(hTest, pCtx, "COMPOUND_TEXT",
+    //                         clipGetAtom(NULL, "COMPOUND_TEXT"),
+    //                         "hello world", sizeof("hello world") - 1);
 
     /*** Timeout from VBox ***/