Changeset 19875 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

May 20, 2009 9:18:53 PM (16 years ago)

Author:

vboxsync

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

47568

Message:

HostServices and GuestHost/SharedClipboard: hopefully fixed the broken saved state and improved on my changes to the platform-neutral code for asynchronous handling of guest data requests

File:

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

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

@@ -1353 +1353 @@
      * a request for the clipboard contents) */
     unsigned mSize;
-    /** The opaque context structure for completing the request */
-    CLIPREADX11CBCONTEXT *mReadCtx;
     /** The format VBox would like the data in */
     uint32_t mFormat;
@@ -1425 +1423 @@
         rc = VERR_NOT_IMPLEMENTED;
     XtFree((char *)pvSrc);
-    ClipCompleteDataRequestFromX11(pReq->mReadCtx, rc, cbActual);
+    ClipCompleteDataRequestFromX11(pReq->mCtx->pFrontend, rc, cbActual);
     RTMemFree(pReq);
     if (RT_SUCCESS(rc))
@@ -1479 +1477 @@
         /* The clipboard callback was never scheduled, so we must signal
          * that the request processing is finished and clean up ourselves. */
-        ClipCompleteDataRequestFromX11(pReq->mReadCtx, rc, 0);
+        ClipCompleteDataRequestFromX11(pReq->mCtx->pFrontend, rc, 0);
         RTMemFree(pReq);
     }
@@ -1498 +1496 @@
  */
 int ClipRequestDataFromX11(CLIPBACKEND *pCtx, uint32_t u32Format, void *pv,
-                           uint32_t cb, CLIPREADX11CBCONTEXT *pReadCtx)
+                           uint32_t cb)
 {
     /*
@@ -1513 +1511 @@
         pReq->mBuffer = pv;
         pReq->mSize = cb;
-        pReq->mReadCtx = pReadCtx;
         pReq->mFormat = u32Format;
         pReq->mCtx = pCtx;
@@ -1953 +1950 @@
 }
 
-struct _CLIPREADX11CBCONTEXT
-{
-    int rc;
-    uint32_t cbActual;
-};
-
-void ClipCompleteDataRequestFromX11(CLIPREADX11CBCONTEXT *pCtx, int rc,
+static int g_completedRC = VINF_SUCCESS;
+static int g_completedActual = 0;
+
+void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc,
                                     uint32_t cbActual)
 {
-    pCtx->rc = rc;
-    pCtx->cbActual = cbActual;
+    g_completedRC = rc;
+    g_completedActual = cbActual;
+}
+
+static void clipGetCompletedRequest(int *prc, uint32_t *pcbActual)
+{
+    *prc = g_completedRC;
+    *pcbActual = g_completedActual;
 }
 
@@ -1984 +1984 @@
     {
         char pc[MAX_BUF_SIZE];
-        CLIPREADX11CBCONTEXT readCtx;
+        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                               (void *) pc, cbBuf);
+        int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
-        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
-                               (void *) pc, cbBuf, &readCtx);
-        int rc = readCtx.rc;
-        cbActual = readCtx.cbActual;
+        clipGetCompletedRequest(&rc, &cbActual);
         if (rc != rcExp)
             RTPrintf("Wrong return code, expected %Rrc, got %Rrc\n", rcExp,
@@ -2042 +2041 @@
     {
         char pc[MAX_BUF_SIZE];
-        CLIPREADX11CBCONTEXT readCtx;
+        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                               (void *) pc, cbBuf);
+        int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
-        ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
-                               (void *) pc, cbBuf, &readCtx);
-        int rc = readCtx.rc;
-        cbActual = readCtx.cbActual;
+        clipGetCompletedRequest(&rc, &cbActual);
         if (rc != rcExp)
             RTPrintf("Wrong return code, expected %Rrc, got %Rrc\n", rcExp,
@@ -2272 +2270 @@
     clipSetSelectionValues("UTF8_STRING", XA_STRING, NULL,
                            0, 8);
-    CLIPREADX11CBCONTEXT readCtx;
     ClipRequestDataFromX11(pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
-                           (void *) pc, sizeof(pc), &readCtx);
-    rc = readCtx.rc;
-    cbActual = readCtx.cbActual;
+                           (void *) pc, sizeof(pc));
+    clipGetCompletedRequest(&rc, &cbActual);
     if (rc != VERR_NO_DATA)
     {
@@ -2285 +2281 @@
     /*** request for an invalid VBox format from X11 ***/
     RTPrintf(TEST_NAME ": TESTING a request for an invalid VBox format from X11\n");
-    ClipRequestDataFromX11(pCtx, 0xffff, (void *) pc, sizeof(pc), &readCtx);
-    rc = readCtx.rc;
-    cbActual = readCtx.cbActual;
+    ClipRequestDataFromX11(pCtx, 0xffff, (void *) pc, sizeof(pc));
+    clipGetCompletedRequest(&rc, &cbActual);
     if (rc != VERR_NOT_IMPLEMENTED)
     {
@@ -2442 +2437 @@
 {}
 
-void ClipCompleteDataRequestFromX11(CLIPREADX11CBCONTEXT *pCtx, int rc,
+void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc,
                                     uint32_t cbActual)
 {}