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

Timestamp:

Jul 9, 2019 8:14:01 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

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

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

@@ -47 +47 @@
 
 VBoxClipboardWinStreamImpl::VBoxClipboardWinStreamImpl(VBoxClipboardWinDataObject *pParent,
-                                                       PSHAREDCLIPBOARDURITRANSFER pTransfer, uint64_t uObjIdx)
+                                                       PSHAREDCLIPBOARDURITRANSFER pTransfer, SHAREDCLIPBOARDOBJHANDLE hObj)
     : m_pParent(pParent)
     , m_lRefCount(1)
     , m_pURITransfer(pTransfer)
-    , m_uObjIdx(uObjIdx)
+    , m_hObj(hObj)
 {
     AssertPtr(m_pURITransfer);
 
-    LogFunc(("m_uObjIdx=%RU64\n", uObjIdx));
+    LogFunc(("m_hObj=%RU64\n", m_hObj));
 }
 
@@ -160 +160 @@
     LogFlowThisFuncEnter();
 
-    AssertPtr(m_pURITransfer->State.ObjCtx.pObjInfo);
-
-    const uint64_t cbSize      = m_pURITransfer->State.ObjCtx.pObjInfo->cbObject;
-          uint64_t cbProcessed = m_pURITransfer->State.ObjCtx.cbProcessed;
+    const uint64_t cbSize      = m_pURITransfer->ProviderIface.pfnObjGetSize(&m_pURITransfer->ProviderCtx, m_hObj);
+          uint64_t cbProcessed = m_pURITransfer->ProviderIface.pfnObjGetProcessed(&m_pURITransfer->ProviderCtx, m_hObj);
 
     if (cbProcessed == cbSize)
@@ -181 +179 @@
     if (cbToRead)
     {
-        rc = m_pURITransfer->ProviderIface.pfnObjRead(&m_pURITransfer->ProviderCtx, m_pURITransfer->State.ObjCtx.uHandle,
+        rc = m_pURITransfer->ProviderIface.pfnObjRead(&m_pURITransfer->ProviderCtx, m_hObj,
                                                       pvBuffer, cbToRead, 0 /* fFlags */, &cbRead);
         if (RT_SUCCESS(rc))
@@ -191 +189 @@
                 m_pParent->OnTransferComplete();
 
-            m_pURITransfer->State.ObjCtx.cbProcessed = cbProcessed;
+    #if 0
+            m_pObj->State.cbProcessed = cbProcessed;
+            Assert(m_pObj->State.cbProcessed <= m_pObj->objInfo.cbObject);
+    #endif
         }
     }
@@ -231 +232 @@
     if (pStatStg)
     {
-        const SharedClipboardURIObject *pObj = SharedClipboardURITransferGetObject(m_pURITransfer, m_uObjIdx);
-
         RT_BZERO(pStatStg, sizeof(STATSTG));
 
@@ -243 +242 @@
             case STATFLAG_DEFAULT:
             {
-                int rc2 = RTStrToUtf16(pObj->GetDestPathAbs().c_str(), &pStatStg->pwcsName);
+                int rc2 = RTStrToUtf16(m_pURITransfer->ProviderIface.pfnObjGetPath(&m_pURITransfer->ProviderCtx, m_hObj),
+                                       &pStatStg->pwcsName);
                 if (RT_FAILURE(rc2))
                     hr = E_FAIL;
@@ -259 +259 @@
             pStatStg->grfMode           = STGM_READ;
             pStatStg->grfLocksSupported = 0;
-            pStatStg->cbSize.QuadPart   = pObj->GetSize();
+            pStatStg->cbSize.QuadPart   = m_pURITransfer->ProviderIface.pfnObjGetSize(&m_pURITransfer->ProviderCtx, m_hObj);
         }
     }
@@ -295 +295 @@
  * @param   pParent             Pointer to the parent data object.
  * @param   pTransfer           Pointer to URI transfer object to use.
- * @param   uObjIdx             Index of object to handle within the given URI transfer object.
+ * @param   hObj                Handle of URI transfer object.
  * @param   ppStream            Where to return the created stream object on success.
  */
 /* static */
-HRESULT VBoxClipboardWinStreamImpl::Create(VBoxClipboardWinDataObject *pParent,
-                                           PSHAREDCLIPBOARDURITRANSFER pTransfer, uint64_t uObjIdx, IStream **ppStream)
+HRESULT VBoxClipboardWinStreamImpl::Create(VBoxClipboardWinDataObject *pParent, PSHAREDCLIPBOARDURITRANSFER pTransfer,
+                                           SHAREDCLIPBOARDOBJHANDLE hObj, IStream **ppStream)
 {
     AssertPtrReturn(pTransfer, E_POINTER);
 
-    VBoxClipboardWinStreamImpl *pStream = new VBoxClipboardWinStreamImpl(pParent, pTransfer, uObjIdx);
+    VBoxClipboardWinStreamImpl *pStream = new VBoxClipboardWinStreamImpl(pParent, pTransfer, hObj);
     if (pStream)
     {