Changeset 80448 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Aug 27, 2019 6:30:26 PM (6 years ago)

Author:

vboxsync

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

132939

Message:

Shared Clipboard/URI: Build fix for X11 testcase.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -548 +548 @@
         && !pBackend->writeData.timeout)
     {
-        rc = VBoxClipboardSvcImplWriteData(pClient, pBackend->writeData.pv, pBackend->writeData.cb, pBackend->writeData.format);
+        SHAREDCLIPBOARDDATABLOCK dataBlock;
+        RT_ZERO(dataBlock);
+
+        dataBlock.pvData  = pBackend->writeData.pv;
+        dataBlock.cbData  = pBackend->writeData.cb;
+        dataBlock.uFormat = pBackend->writeData.format;
+
+        rc = VBoxClipboardSvcImplWriteData(pClient, NULL /* pCmdCtx */, &dataBlock);
     }
     else
@@ -604 +611 @@
 int main()
 {
-    VBOXCLIPBOARDCLIENTDATA client;
+    VBOXCLIPBOARDCLIENT client;
     unsigned cErrors = 0;
     int rc = RTR3InitExeNoArguments(0);
@@ -612 +619 @@
     CLIPBACKEND *pBackend = client.State.pCtx->pBackend;
     AssertRCReturn(rc, 1);
-    VBoxClipboardSvcImplFormatAnnounce(&client,
-                                VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT);
+
+    SHAREDCLIPBOARDFORMATDATA formatData;
+    RT_ZERO(formatData);
+    formatData.uFormats = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+
+    VBoxClipboardSvcImplFormatAnnounce(&client, NULL /* pCmdCtx */, &formatData);
+
     if (pBackend->formats != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
     {
@@ -620 +632 @@
     }
     pBackend->readData.rc = VINF_SUCCESS;
-    client.State.asyncRead.callHandle = (VBOXHGCMCALLHANDLE)pBackend;
-    client.State.asyncRead.paParms = (VBOXHGCMSVCPARM *)&client;
+
+    client.State.Old.asyncRead.callHandle = (VBOXHGCMCALLHANDLE)pBackend;
+    client.State.Old.asyncRead.paParms = (VBOXHGCMSVCPARM *)&client;
+
     uint32_t u32Dummy;
-    rc = VBoxClipboardSvcImplReadData(&client, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
-                               &u32Dummy, 42, &u32Dummy);
+
+    SHAREDCLIPBOARDDATABLOCK dataBlock;
+    RT_ZERO(dataBlock);
+    dataBlock.pvData  = &u32Dummy;
+    dataBlock.cbData  = 42;
+    dataBlock.uFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+
+    rc = VBoxClipboardSvcImplReadData(&client, &dataBlock, &u32Dummy);
     if (rc != VINF_HGCM_ASYNC_EXECUTE)
     {
@@ -691 +711 @@
     /* Data arriving after a timeout should *not* cause any segfaults or
      * memory leaks.  Check with Valgrind! */
-    VBoxClipboardSvcImplWriteData(&client, (void *)"tested", sizeof("tested"), 999);
+    RT_ZERO(dataBlock);
+
+    const char *pszString = "tested";
+
+    dataBlock.pvData  = (void *)pszString;
+    dataBlock.cbData  = (uint32_t)(strlen(pszString) + 1);
+    dataBlock.uFormat = 999;
+
+    VBoxClipboardSvcImplWriteData(&client, NULL /* pCmdCtx */, &dataBlock);
+
     VBoxClipboardSvcImplDisconnect(&client);
-    if (cErrors > 0)
-        RTPrintf(TEST_NAME ": errors: %u\n", cErrors);
+
+    RTPrintf(TEST_NAME ": errors: %u\n", cErrors);
+
     return cErrors > 0 ? 1 : 0;
 }