Changeset 55556 in vbox for trunk/src/VBox/GuestHost/DragAndDrop

Timestamp:

Apr 30, 2015 2:27:39 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99923

Message:

DnD: Rollback handling, bugfixes, cleanup.

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDURIList.cpp (modified) (3 diffs)
• DnDURIObject.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -82 +82 @@
     m_cbTotal += cbSize;
 #ifdef DEBUG_andy
-    LogFlowFunc(("strSrcPath=%s, strDstPath=%s, fMode=0x%x, cbSize=%RU64, cbTotal=%zu\n",
-                 pcszPath, &pcszPath[cbBaseLen], objInfo.Attr.fMode, cbSize, m_cbTotal));
-#endif
-
-    PRTDIR hDir;
+    LogFlowFunc(("strSrcPath=%s, strDstPath=%s, fMode=0x%x, cbSize=%RU64, cTotal=%RU32, cbTotal=%zu\n",
+                 pcszPath, &pcszPath[cbBaseLen], objInfo.Attr.fMode, cbSize, m_cTotal, m_cbTotal));
+#endif
+
     /* We have to try to open even symlinks, cause they could
      * be symlinks to directories. */
+    PRTDIR hDir;
     rc = RTDirOpen(&hDir, pcszPath);
+
     /* The following error happens when this was a symlink
-     * to an file or a regular file. */
+     * to a file or a regular file. */
     if (   rc == VERR_PATH_NOT_FOUND
         || rc == VERR_NOT_A_DIRECTORY)
@@ -150 +151 @@
                                                       pszNewFile, &pszNewFile[cbBaseLen],
                                                       objInfo1.Attr.fMode, cbSize));
+                        m_cTotal++;
                         m_cbTotal += cbSize;
+#ifdef DEBUG_andy
+                        LogFlowFunc(("strSrcPath=%s, strDstPath=%s, fMode=0x%x, cbSize=%RU64, cTotal=%RU32, cbTotal=%zu\n",
+                                     pszNewFile, &pszNewFile[cbBaseLen], objInfo1.Attr.fMode, cbSize, m_cTotal, m_cbTotal));
+#endif
                     }
                     else /* Handle symlink directories. */
                         rc = appendPathRecursive(pszNewFile, cbBaseLen, fFlags);
-#ifdef DEBUG_andy
-                    LogFlowFunc(("strSrcPath=%s, strDstPath=%s, fMode=0x%x, cbSize=%RU64, cbTotal=%zu\n",
-                                 pszNewFile, &pszNewFile[cbBaseLen], objInfo1.Attr.fMode, cbSize, m_cbTotal));
-#endif
+
                     RTStrFree(pszNewFile);
                 }
@@ -166 +169 @@
 
             default:
+                /* Just ignore the rest. */
                 break;
         }

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

@@ -37 +37 @@
 DnDURIObject::DnDURIObject(void)
     : m_Type(Unknown)
-    , m_fMode(0)
+    , m_fCreationMode(0)
     , m_cbSize(0)
     , m_cbProcessed(0)
@@ -51 +51 @@
     , m_strSrcPath(strSrcPath)
     , m_strTgtPath(strDstPath)
-    , m_fMode(fMode)
+    , m_fCreationMode(fMode)
     , m_cbSize(cbSize)
     , m_cbProcessed(0)
@@ -199 +199 @@
                         rc = RTFileGetSize(u.m_hFile, &m_cbSize);
                     if (RT_SUCCESS(rc))
+                    {
+                        LogFlowFunc(("cbSize=%RU64, fMode=%RU32\n", m_cbSize, m_fCreationMode));
                         m_cbProcessed = 0;
+                    }
                 }
                 else
@@ -345 +348 @@
     Close();
 
-    m_Type        = Unknown;
-    m_strSrcPath  = "";
-    m_strTgtPath  = "";
-    m_fMode       = 0;
-    m_cbSize      = 0;
-    m_cbProcessed = 0;
+    m_Type          = Unknown;
+    m_strSrcPath    = "";
+    m_strTgtPath    = "";
+    m_fCreationMode = 0;
+    m_cbSize        = 0;
+    m_cbProcessed   = 0;
 }