Changeset 82882 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 27, 2020 6:08:51 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Ditched SHCLDATABLOCK [build fix, forgot file]. bugref:9437

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -29 +29 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/path.h>
 #include <iprt/process.h>
 #include <iprt/semaphore.h>
@@ -107 +108 @@
 #endif
     {
-        SHCLDATABLOCK dataBlock;
-        RT_ZERO(dataBlock);
-
-        dataBlock.uFormat = Format;
-        dataBlock.cbData  = _4K;
-        dataBlock.pvData  = RTMemAlloc(dataBlock.cbData);
-        if (dataBlock.pvData)
-        {
-            rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cbRead);
+        uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
+        void    *pvData = RTMemAlloc(cbData);
+        if (pvData)
+        {
+            rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, Format, pvData, cbData, &cbRead);
         }
         else
@@ -129 +126 @@
             /* cbRead contains the size required. */
 
-            dataBlock.cbData = cbRead;
-            dataBlock.pvData = RTMemRealloc(dataBlock.pvData, cbRead);
-            if (dataBlock.pvData)
+            cbData = cbRead;
+            pvData = RTMemRealloc(pvData, cbRead);
+            if (pvData)
             {
-                rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cbRead);
+                rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, Format, pvData, cbData, &cbRead);
                 if (rc == VINF_BUFFER_OVERFLOW)
                     rc = VERR_BUFFER_OVERFLOW;
@@ -144 +141 @@
         {
             *pcb = cbRead; /* Actual bytes read. */
-            *ppv = dataBlock.pvData;
+            *ppv = pvData;
         }
 
@@ -154 +151 @@
          */
         if (RT_FAILURE(rc))
-            RTMemFree(dataBlock.pvData);
+            RTMemFree(pvData);
     }
 
@@ -206 +203 @@
     LogFlowFunc(("rc=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", rc, pReq->Format, pv, cb));
 
-    SHCLDATABLOCK dataBlock;
-    RT_ZERO(dataBlock);
-
-    dataBlock.uFormat = pReq->Format;
-
-    if (RT_SUCCESS(rc))
-    {
-        dataBlock.pvData = pv;
-        dataBlock.cbData = cb;
-    }
-
-    int rc2 = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, &dataBlock);
+    int rc2 = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
     RT_NOREF(rc2);
 
@@ -230 +216 @@
  * @returns VBox status code.
  */
+#if 0
 static int vboxClipboardConnect(void)
 {
@@ -259 +246 @@
     return rc;
 }
+#endif
 
 /**
@@ -392 +380 @@
     RTThreadUserSignal(hThreadSelf);
 
-    char szExecPath[RTPATH_MAX];
-    RTProcGetExecutablePath(szExecPath, sizeof(szExecPath));
-
-    char szTempDir[RTPATH_MAX];
-    RTStrPrintf(szTempDir, sizeof(szTempDir), "VBoxSharedClipboard-XXXXXXXX");
-
-    int rc = RTDirCreateTemp(szTempDir, 0700);
+    SHCL_FUSE_OPTS Opts;
+    RT_ZERO(Opts);
+
+    Opts.fForeground     = true;
+    Opts.fSingleThreaded = false; /** @todo Do we want multithread here? */
+
+    int rc = RTPathTemp(Opts.szMountPoint, sizeof(Opts.szMountPoint));
     if (RT_SUCCESS(rc))
     {
-        char *paArgs[2];
-        paArgs[0] = szExecPath;
-        paArgs[1] = szTempDir;
-
-        rc = ShClFuseMain(2 /* argc */, paArgs);
-    }
+        rc = RTPathAppend(Opts.szMountPoint, sizeof(Opts.szMountPoint), "VBoxSharedClipboard");
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTDirCreate(Opts.szMountPoint, 0700,
+                             RTDIRCREATE_FLAGS_NO_SYMLINKS);
+            if (rc == VERR_ALREADY_EXISTS)
+                rc = VINF_SUCCESS;
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = ShClFuseMain(&Opts);
+    }
+    else
+        LogRel(("Error creating FUSE mount directory, rc=%Rrc\n", rc));
 
     LogFlowFuncLeaveRC(rc);
@@ -472 +470 @@
 
     /* Initialise the guest library. */
-    int rc = vboxClipboardConnect();
+    int rc = 0; //vboxClipboardConnect();
     if (RT_SUCCESS(rc))
     {
@@ -480 +478 @@
         {
 #endif
-            rc = vboxClipboardMain();
+            RTThreadSleep(60 * 1000);
+
+            //rc = vboxClipboardMain();
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE