Changeset 79276 in vbox for trunk/src/VBox

Timestamp:

Jun 21, 2019 1:10:30 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/ClipboardURIList.cpp (modified) (2 diffs)
• GuestHost/SharedClipboard/ClipboardURIObject.cpp (modified) (3 diffs)
• GuestHost/SharedClipboard/clipboard-uri.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-uri.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp

@@ -114 +114 @@
     AssertPtrReturn(pcszDstBase, VERR_INVALID_POINTER);
     AssertPtrReturn(pcszDstPath, VERR_INVALID_POINTER);
+    AssertReturn(!(fFlags & ~SHAREDCLIPBOARDURILIST_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
 
     LogFlowFunc(("pcszSrcPath=%s, pcszDstPath=%s, pcszDstBase=%s, cchDstBase=%zu, fFlags=0x%x\n",
@@ -280 +281 @@
 
     m_lstTree.append(pObject);
-    m_lstRoot.append(pObject->GetSourcePathAbs());;
+    m_lstRoot.append(pObject->GetSourcePathAbs());
 
     m_cTotal++;

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp

@@ -121 +121 @@
 void SharedClipboardURIObject::Close(void)
 {
+    LogFlowFuncEnter();
+
     closeInternal();
 }
@@ -337 +339 @@
             u.File.cbToProcess = u.File.objInfo.cbObject;
             u.File.cbProcessed = 0;
+
+            m_enmView = enmView;
         }
     }
@@ -467 +471 @@
     /* pcbRead is optional. */
 
-    AssertMsgReturn(m_enmView == View_Source, ("Cannot read from an object which is not in source view\n"),
+    AssertMsgReturn(m_enmView == View_Source, ("Cannot read from an object which is not in source view (is 0x%x)\n", m_enmView),
                     VERR_INVALID_STATE);
 

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

@@ -1370 +1370 @@
 
                 dirData.pszPath = RTStrDup(strPath.c_str());
-                dirData.cbPath  = (uint32_t)strlen(dirData.pszPath) + 1 /* Include termination */;
+                dirData.cbPath  = (uint32_t)strlen(dirData.pszPath);
 
                 rc = pTransfer->pProvider->WriteDirectory(&dirData);
@@ -1391 +1391 @@
 
                 fileHdr.pszFilePath = RTStrDup(strPath.c_str());
-                fileHdr.cbFilePath  = (uint32_t)strlen(fileHdr.pszFilePath) + 1 /* Include termination */;
+                fileHdr.cbFilePath  = (uint32_t)strlen(fileHdr.pszFilePath);
                 fileHdr.cbSize      = pObj->GetSize();
                 fileHdr.fFlags      = 0;
@@ -1413 +1413 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = pTransfer->pProvider->WriteFileData(pvData, cbRead);
+                        uint32_t cbToRead = cbRead;
+                        rc = pTransfer->pProvider->WriteFileData(pvData, cbToRead, 0 /* fFlags */, &cbRead);
                     }
 

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

@@ -293 +293 @@
     }
 
-    bool fDispatchToProvider = false; /* Whether to (also) dispatch the HCGCM data to the transfer provider. */
+    bool fDispatchToProvider = false; /* Whether to (also) dispatch the HGCM data to the transfer provider. */
 
     int rc = VERR_INVALID_PARAMETER; /* Play safe. */
@@ -466 +466 @@
                 const char *pszCacheDir = pArea->GetDirAbs();
 
-    RT_BREAKPOINT();
-
                 char pszPathAbs[RTPATH_MAX];
                 rc = RTPathJoin(pszPathAbs, sizeof(pszPathAbs), pszCacheDir, fileHdr.pszFilePath);