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

Timestamp:

Nov 19, 2017 3:23:57 PM (7 years ago)

Author:

vboxsync

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

119158

Message:

VBoxManageGuestCtrl.cpp,DnDURIList.cpp: Fix RTDIRENTRYTYPE_UNKNOWN problem by using RTDirReadExA. Untested.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (6 diffs)

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

@@ -128 +128 @@
         {
             rc = addEntry(pcszSrcPath, &pcszDstPath[cchDstBase], fFlags);
-
             if (RT_SUCCESS(rc))
             {
@@ -135 +134 @@
                 if (RT_SUCCESS(rc))
                 {
+                    size_t        cbDirEntry = 0;
+                    PRTDIRENTRYEX pDirEntry  = NULL;
                     do
                     {
-                        RTDIRENTRY DirEntry;
-                        rc = RTDirRead(hDir, &DirEntry, NULL);
+                        /* Retrieve the next directory entry. */
+                        rc = RTDirReadExA(hDir, &pDirEntry, &cbDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
                         if (RT_FAILURE(rc))
                         {
@@ -145 +146 @@
                             break;
                         }
-                        /** @todo r=bird: you really need to read the documentation! I already
-                         *        pointed out that this isn't goint to work in the guest control
-                         *        code. sigh. */
-
-                        switch (DirEntry.enmType)
+
+                        switch (pDirEntry->Info.Attr.fMode & RTFS_TYPE_MASK)
                         {
-                            case RTDIRENTRYTYPE_DIRECTORY:
+                            case RTFS_TYPE_DIRECTORY:
                             {
                                 /* Skip "." and ".." entries. */
-                                if (RTDirEntryIsStdDotLink(&DirEntry))
+                                if (RTDirEntryExIsStdDotLink(pDirEntry))
                                     break;
 
-                                char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
+                                char *pszSrc = RTPathJoinA(pcszSrcPath, pDirEntry->szName);
                                 if (pszSrc)
                                 {
-                                    char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
+                                    char *pszDst = RTPathJoinA(pcszDstPath, pDirEntry->szName);
                                     if (pszDst)
                                     {
@@ -176 +174 @@
                             }
 
-                            case RTDIRENTRYTYPE_FILE:
+                            case RTFS_TYPE_FILE:
                             {
-                                char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
+                                char *pszSrc = RTPathJoinA(pcszSrcPath, pDirEntry->szName);
                                 if (pszSrc)
                                 {
-                                    char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
+                                    char *pszDst = RTPathJoinA(pcszDstPath, pDirEntry->szName);
                                     if (pszDst)
                                     {
@@ -195 +193 @@
                                 break;
                             }
-                            case RTDIRENTRYTYPE_SYMLINK:
+                            case RTFS_TYPE_SYMLINK:
                             {
                                 if (fFlags & DNDURILIST_FLAGS_RESOLVE_SYMLINKS)
@@ -233 +231 @@
                     } while (RT_SUCCESS(rc));
 
+                    RTDirReadExAFree(&pDirEntry, &cbDirEntry);
                     RTDirClose(hDir);
                 }