Changeset 78974 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-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/ClipboardDataObjectImpl-win.cpp (modified) (6 diffs)

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

@@ -45 +45 @@
 #define VBOX_CLIPBOARD_WITH_UNICODE_SUPPORT 1
 
-VBoxClipboardWinDataObject::VBoxClipboardWinDataObject(SharedClipboardProvider *pProvider,
+VBoxClipboardWinDataObject::VBoxClipboardWinDataObject(PSHAREDCLIPBOARDURITRANSFER pTransfer,
                                                        LPFORMATETC pFormatEtc, LPSTGMEDIUM pStgMed, ULONG cFormats)
     : m_enmStatus(Uninitialized)
     , m_lRefCount(0)
     , m_cFormats(0)
-    , m_pProvider(pProvider)
+    , m_pTransfer(pTransfer)
     , m_pStream(NULL)
     , m_uObjIdx(0)
 {
-    AssertPtr(pProvider);
+    AssertPtr(m_pTransfer);
 
     HRESULT hr;
@@ -121 +121 @@
         m_enmStatus = Initialized;
 
-        m_pProvider->AddRef();
+        AssertPtr(m_pTransfer->pProvider);
+        m_pTransfer->pProvider->AddRef();
     }
 
@@ -129 +130 @@
 VBoxClipboardWinDataObject::~VBoxClipboardWinDataObject(void)
 {
-    if (m_pProvider)
-        m_pProvider->Release();
+    if (m_pTransfer->pProvider)
+        m_pTransfer->pProvider->Release();
 
     if (m_pStream)
@@ -394 +395 @@
             LogFlowFunc(("FormatIndex_FileDescriptor%s\n", fUnicode ? "W" : "A"));
 
-            int rc = m_pProvider->ReadMetaData(); /** @todo Do this asynchronously some time earlier? */
+            int rc = m_pTransfer->pProvider->ReadMetaData(); /** @todo Do this asynchronously some time earlier? */
             if (   RT_SUCCESS(rc)
-                && !m_pProvider->GetURIList().IsEmpty())
+                && !m_pTransfer->pProvider->GetURIList().IsEmpty())
             {
                 HGLOBAL hGlobal;
-                rc = createFileGroupDescriptorFromURIList(m_pProvider->GetURIList(), fUnicode, &hGlobal);
+                rc = createFileGroupDescriptorFromURIList(m_pTransfer->pProvider->GetURIList(), fUnicode, &hGlobal);
                 if (RT_SUCCESS(rc))
                 {
@@ -416 +417 @@
             LogFlowFunc(("FormatIndex_FileContents: m_uObjIdx=%u\n", m_uObjIdx));
 
-            SharedClipboardURIObject *pURIObj = m_pProvider->GetURIList().At(m_uObjIdx);
+            SharedClipboardURIObject *pURIObj = m_pTransfer->pProvider->GetURIList().At(m_uObjIdx);
             if (pURIObj)
             {
                 /* Hand-in the provider so that our IStream implementation can continue working with it. */
-                hr = VBoxClipboardWinStreamImpl::Create(m_pProvider, pURIObj, &m_pStream);
+                hr = VBoxClipboardWinStreamImpl::Create(this /* pParent */, m_pTransfer, pURIObj, &m_pStream);
                 if (SUCCEEDED(hr))
                 {
@@ -578 +579 @@
     LogFlowFuncLeaveRC(VINF_SUCCESS);
     return VINF_SUCCESS;
+}
+
+void VBoxClipboardWinDataObject::OnTransferComplete(int rc /* = VINF_SUCESS */)
+{
+    RT_NOREF(rc);
+
+    LogFlowFuncLeaveRC(rc);
+}
+
+void VBoxClipboardWinDataObject::OnTransferCanceled(void)
+{
+    LogFlowFuncLeave();
 }