Changeset 78974 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

Timestamp:

Jun 4, 2019 4:51:48 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

@@ -46 +46 @@
 
 
-VBoxClipboardWinStreamImpl::VBoxClipboardWinStreamImpl(SharedClipboardProvider *pProvider, SharedClipboardURIObject *pURIObj)
-    : m_lRefCount(1)
-    , m_pProvider(pProvider)
+VBoxClipboardWinStreamImpl::VBoxClipboardWinStreamImpl(VBoxClipboardWinDataObject *pParent,
+                                                       PSHAREDCLIPBOARDURITRANSFER pTransfer, SharedClipboardURIObject *pURIObj)
+    : m_pParent(pParent)
+    , m_lRefCount(1)
+    , m_pTransfer(pTransfer)
     , m_pURIObj(pURIObj)
 {
-    AssertPtr(m_pProvider);
+    AssertPtr(m_pTransfer);
+    AssertPtr(m_pTransfer->pProvider);
     AssertPtr(m_pURIObj);
 
     LogFunc(("szSrcPath=%s, cbSize=%RU64\n", m_pURIObj->GetSourcePathAbs().c_str(), m_pURIObj->GetSize()));
 
-    m_pProvider->AddRef();
+    m_pTransfer->pProvider->AddRef();
 }
 
@@ -62 +65 @@
 {
     LogFlowThisFuncEnter();
-    m_pProvider->Release();
+
+    if (   m_pTransfer
+        && m_pTransfer->pProvider)
+        m_pTransfer->pProvider->Release();
 }
 
@@ -159 +165 @@
     const uint64_t cbProcessed = m_pURIObj->GetProcessed();
 
-    const size_t cbToRead = RT_MIN(cbSize - cbProcessed, nBytesToRead);
-          size_t cbRead   = 0;
+    const uint32_t cbToRead = RT_MIN(cbSize - cbProcessed, nBytesToRead);
+          uint32_t cbRead   = 0;
 
     int rc = VINF_SUCCESS;
 
     if (cbToRead)
-        rc = m_pProvider->ReadData(pvBuffer, cbToRead, &cbRead);
+    {
+        VBOXCLIPBOARDFILEDATA FileData;
+        RT_ZERO(FileData);
+
+        FileData.pvData = pvBuffer;
+        FileData.cbData = cbToRead;
+
+        rc = m_pTransfer->pProvider->ReadFileData(&FileData, &cbRead);
+        if (RT_SUCCESS(rc))
+        {
+            if (m_pURIObj->IsComplete())
+                m_pParent->OnTransferComplete();
+        }
+    }
 
     if (nBytesRead)
@@ -229 +248 @@
  *
  * @returns HRESULT
- * @param   pProvider           Pointer to Shared Clipboard provider to use.
+ * @param   pParent             Pointer to the parent data object.
+ * @param   pTransfer           Pointer to URI transfer object to use.
  * @param   pURIObj             Pointer to URI object to handle.
  * @param   ppStream            Where to return the created stream object on success.
  */
 /* static */
-HRESULT VBoxClipboardWinStreamImpl::Create(SharedClipboardProvider *pProvider, SharedClipboardURIObject *pURIObj,
+HRESULT VBoxClipboardWinStreamImpl::Create(VBoxClipboardWinDataObject *pParent,
+                                           PSHAREDCLIPBOARDURITRANSFER pTransfer, SharedClipboardURIObject *pURIObj,
                                            IStream **ppStream)
 {
-    AssertPtrReturn(pProvider, E_POINTER);
-
-    VBoxClipboardWinStreamImpl *pStream = new VBoxClipboardWinStreamImpl(pProvider, pURIObj);
+    AssertPtrReturn(pTransfer, E_POINTER);
+
+    VBoxClipboardWinStreamImpl *pStream = new VBoxClipboardWinStreamImpl(pParent, pTransfer, pURIObj);
     if (pStream)
     {