Changeset 81438 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

Timestamp:

Oct 22, 2019 8:04:12 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Don't count directory entries as entries to process by IDataObject, as directories are not separately being processed by IStreamImpl.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (3 diffs)

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

@@ -278 +278 @@
                             if (RTFS_IS_DIRECTORY(pFsObjInfo->Attr.fMode))
                             {
-                                FSOBJENTRY objEntry = { strPath.c_str(), *pFsObjInfo };
-
-                                m_lstEntries.push_back(objEntry); /** @todo Can this throw? */
+                                /* Note: Directories are *not* required to be part of m_lstEntries, as we only
+                                 *       count files to transfer there. */
 
                                 rc = readDir(pTransfer, strPath.c_str());
@@ -360 +359 @@
                 if (RTFS_IS_DIRECTORY(pFsObjInfo->Attr.fMode))
                 {
-                    FSOBJENTRY objEntry = { pRootEntry->pszName, *pFsObjInfo };
-
-                    pThis->m_lstEntries.push_back(objEntry); /** @todo Can this throw? */
+                    /* Note: Directories are *not* required to be part of m_lstEntries, as we only
+                     *       count files to transfer there. */
 
                     rc = pThis->readDir(pTransfer, pRootEntry->pszName);
@@ -871 +869 @@
             m_enmStatus = Completed;
         }
-        else
-            AssertFailed();
     }
     else
         m_enmStatus = Error;
 
-    if (m_EventTransferComplete != NIL_RTSEMEVENT)
-    {
-        int rc2 = RTSemEventSignal(m_EventTransferComplete);
-        AssertRC(rc2);
+    if (m_enmStatus != Initialized)
+    {
+        if (m_EventTransferComplete != NIL_RTSEMEVENT)
+        {
+            int rc2 = RTSemEventSignal(m_EventTransferComplete);
+            AssertRC(rc2);
+        }
     }