Changeset 78619 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 8:42:35 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-x11.cpp (modified) (6 diffs)
• testcase/tstClipboardServiceHost.cpp (modified) (1 diff)

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

@@ -551 +551 @@
     AssertRCReturn(rc, 1);
     rc = VBoxClipboardSvcImplConnect(&client, false);
-    CLIPBACKEND *pBackend = client.pCtx->pBackend;
+    CLIPBACKEND *pBackend = client.State.pCtx->pBackend;
     AssertRCReturn(rc, 1);
     VBoxClipboardSvcImplFormatAnnounce(&client,
@@ -561 +561 @@
     }
     pBackend->readData.rc = VINF_SUCCESS;
-    client.asyncRead.callHandle = (VBOXHGCMCALLHANDLE)pBackend;
-    client.asyncRead.paParms = (VBOXHGCMSVCPARM *)&client;
+    client.State.asyncRead.callHandle = (VBOXHGCMCALLHANDLE)pBackend;
+    client.State.asyncRead.paParms = (VBOXHGCMSVCPARM *)&client;
     uint32_t u32Dummy;
     rc = VBoxClipboardSvcImplReadData(&client, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
@@ -586 +586 @@
         else
         {
-            ClipCompleteDataRequestFromX11(client.pCtx, VERR_NO_DATA,
+            ClipCompleteDataRequestFromX11(client.State.pCtx, VERR_NO_DATA,
                                            pBackend->readData.pReq, NULL, 43);
             if (   pBackend->completeRead.rc != VERR_NO_DATA
@@ -604 +604 @@
     pBackend->writeData.format = 1234;
     pBackend->reportData.format = 4321;  /* XX this should be handled! */
-    rc = ClipRequestDataForX11(client.pCtx, 23, &pv, &cb);
+    rc = ClipRequestDataForX11(client.State.pCtx, 23, &pv, &cb);
     if (   rc != VINF_SUCCESS
         || strcmp((const char *)pv, "testing") != 0
@@ -615 +615 @@
         RTMemFree(pv);
     pBackend->writeData.timeout = true;
-    rc = ClipRequestDataForX11(client.pCtx, 23, &pv, &cb);
+    rc = ClipRequestDataForX11(client.State.pCtx, 23, &pv, &cb);
     if (rc != VERR_TIMEOUT)
     {
@@ -624 +624 @@
     pBackend->writeData.cb = 0;
     pBackend->writeData.timeout = false;
-    rc = ClipRequestDataForX11(client.pCtx, 23, &pv, &cb);
+    rc = ClipRequestDataForX11(client.State.pCtx, 23, &pv, &cb);
     if (rc != VERR_NO_DATA)
     {

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -16 +16 @@
  */
 
-#include "../VBoxClipboard.h"
+#include "../VBoxSharedClipboardSvc-internal.h"
 
 #include <VBox/HostServices/VBoxClipboardSvc.h>