Changeset 99391 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2023 4:41:39 PM (23 months ago)

Author:

vboxsync

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

156829

Message:

Guest Control/FE/Qt: Fall back to IGuestDirectory::read() if IGuestDirectory::list() is not supported due to older installed Guest Additions. bugref:9783

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/COMDefs.h (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -820 +820 @@
     bool isReallyOk() const { return !isNull() && B::mRC == S_OK; }
 
+    /**
+     * Returns the last result code of this interface.
+     */
+    HRESULT rc() const { return B::mRC; }
+
     // utility operators
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -528 +528 @@
     if (directory.isOk())
     {
-        int const cMaxEntries = _4K; /* Maximum number of entries to read at once per List() call. */
+        int const cMaxEntries = _4K;   /* Maximum number of entries to read at once per List() call. */
+        bool      fUseRead    = false; /* Whether to use the Read() API or the newer (faster) List() call. */
 
         QVector<CFsObjInfo> vecFsInfo = directory.List(cMaxEntries);
+        /* IGuestDirectory::List() will return VBOX_E_NOT_SUPPORTED if older Guest Additions are installed. */
+        if (directory.rc() == VBOX_E_NOT_SUPPORTED)
+        {
+            CFsObjInfo fsInfo = directory.Read();
+            if (directory.isOk())
+            {
+                vecFsInfo.push_back(fsInfo);
+                fUseRead = true;
+            }
+        }
+
         QMap<QString, UICustomFileSystemItem*> fileObjects;
 
@@ -564 +576 @@
             }
 
-            vecFsInfo = directory.List(cMaxEntries);
+            if (fUseRead)
+            {
+                CFsObjInfo fsInfo = directory.Read();
+                if (directory.isOk())
+                {
+                    vecFsInfo.clear();
+                    vecFsInfo.push_back(fsInfo);
+                }
+            }
+            else
+                vecFsInfo = directory.List(cMaxEntries);
         }