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

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

@@ -249 +249 @@
     if (RT_SUCCESS(rc))
     {
-        VBOXCLIPBOARDLISTHDR Hdr;
-        rc = SharedClipboardURIListHdrInit(&Hdr);
+        VBOXCLIPBOARDLISTOPENPARMS openParmsList;
+        rc = SharedClipboardURIListOpenParmsInit(&openParmsList);
         if (RT_SUCCESS(rc))
         {
-            VBOXCLIPBOARDLISTHANDLE hList;
-            rc = SharedClipboardURITransferListOpen(pTransfer, &Hdr, &hList);
+            SHAREDCLIPBOARDLISTHANDLE hList;
+            rc = SharedClipboardURITransferListOpen(pTransfer, &openParmsList, &hList);
             if (RT_SUCCESS(rc))
             {
-                LogFlowFunc(("hList=%RU64, cTotalObjects=%RU64, cbTotalSize=%RU64\n\n",
-                             hList, Hdr.cTotalObjects, Hdr.cbTotalSize));
-
-                for (uint64_t i = 0; i < Hdr.cTotalObjects; i++)
+                LogFlowFunc(("hList=%RU64\n", hList));
+
+                VBOXCLIPBOARDLISTHDR hdrList;
+                rc = SharedClipboardURITransferListGetHeader(pTransfer, hList, &hdrList);
+                if (RT_SUCCESS(rc))
                 {
-                    VBOXCLIPBOARDLISTENTRY Entry;
-                    rc = SharedClipboardURITransferListRead(pTransfer, hList, &Entry);
+                    LogFlowFunc(("cTotalObjects=%RU64, cbTotalSize=%RU64\n\n",
+                                 hdrList.cTotalObjects, hdrList.cbTotalSize));
+
+                    for (uint64_t i = 0; i < hdrList.cTotalObjects; i++)
+                    {
+                        VBOXCLIPBOARDLISTENTRY entryList;
+                        rc = SharedClipboardURITransferListRead(pTransfer, hList, &entryList);
+                        if (RT_SUCCESS(rc))
+                        {
+                        }
+                        else
+                            break;
+
+                        if (pTransfer->Thread.fStop)
+                            break;
+                    }
+
                     if (RT_SUCCESS(rc))
                     {
-
+                        /*
+                         * Signal the "list complete" event so that this data object can return (valid) data via ::GetData().
+                         * This in turn then will create IStream instances (by the OS) for each file system object to handle.
+                         */
+                        int rc2 = RTSemEventSignal(pThis->m_EventListComplete);
+                        AssertRC(rc2);
+
+                        LogFlowFunc(("Waiting for transfer to complete ...\n"));
+
+                        /* Transferring stuff can take a while, so don't use any timeout here. */
+                        rc2 = RTSemEventWait(pThis->m_EventTransferComplete, RT_INDEFINITE_WAIT);
+                        AssertRC(rc2);
                     }
-                    else
-                        break;
-
-                    if (pTransfer->Thread.fStop)
-                        break;
-                }
-
-                if (RT_SUCCESS(rc))
-                {
-                    /*
-                     * Signal the "list complete" event so that this data object can return (valid) data via ::GetData().
-                     * This in turn then will create IStream instances (by the OS) for each file system object to handle.
-                     */
-                    int rc2 = RTSemEventSignal(pThis->m_EventListComplete);
-                    AssertRC(rc2);
-
-                    LogFlowFunc(("Waiting for transfer to complete ...\n"));
-
-                    /* Transferring stuff can take a while, so don't use any timeout here. */
-                    rc2 = RTSemEventWait(pThis->m_EventTransferComplete, RT_INDEFINITE_WAIT);
-                    AssertRC(rc2);
                 }
 
@@ -294 +300 @@
             }
 
-            SharedClipboardURIListHdrDestroy(&Hdr);
+            SharedClipboardURIListOpenParmsDestroy(&openParmsList);
         }
 
@@ -497 +503 @@
                     if (RT_SUCCESS(rc))
                     {
+                        /* Don't block for too long here, as this also will screw other apps running on the OS. */
                         LogFunc(("Waiting for listing to arrive ...\n"));
-                        rc = RTSemEventWait(m_EventListComplete, 5 * 60 * 1000 /* 5 min timeout */);
+                        rc = RTSemEventWait(m_EventListComplete, 10 * 1000 /* 10s timeout */);
                         if (RT_SUCCESS(rc))
                         {
@@ -530 +537 @@
             LogFlowFunc(("FormatIndex_FileContents: m_uObjIdx=%u\n", m_uObjIdx));
 
+            SHAREDCLIPBOARDOBJHANDLE hObj = 0; /** @todo */
+
             /* Hand-in the provider so that our IStream implementation can continue working with it. */
-            hr = VBoxClipboardWinStreamImpl::Create(this /* pParent */, m_pTransfer, m_uObjIdx, &m_pStream);
+            hr = VBoxClipboardWinStreamImpl::Create(this /* pParent */, m_pTransfer, hObj, &m_pStream);
             if (SUCCEEDED(hr))
             {