Changeset 14344 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2008 10:50:48 AM (16 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD-new: Fix error handling in VDBackendInfo. Caused trouble on Windows. Added a tad more logging too.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -688 +688 @@
         rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT);
         if (RT_FAILURE(rc))
+        {
+            /* On Windows the above immediately signals that there are no
+             * files matching, while on other platforms enumerating the
+             * files below fails. Either way: no plugins. */
             break;
+        }
 
         PRTDIRENTRYEX pPluginDirEntry = NULL;
@@ -774 +779 @@
                             }
                         }
-                        if (RT_FAILURE(rc))
-                            break;
                         paExts[iExt] = NULL;
                         pEntries[cEntries].papszFileExtensions = paExts;
@@ -792 +795 @@
                         }
                     }
+                    else
+                        LogFunc(("ignored plugin '%s': pBackend->cbSize=%d rc=%Vrc\n", pszPluginPath, pBackend->cbSize, rc));
                 }
                 else
-                    pBackend = NULL;
+                    LogFunc(("ignored plugin '%s': rc=%Vrc\n", pszPluginPath, rc));
 
                 RTLdrClose(hPlugin);
@@ -808 +813 @@
             RTDirClose(pPluginDir);
     } while (0);
+    /* Ignore any files which can't be found. Happens e.g. on Windows when
+     * absolutely no plugins are installed (see above). Totally harmless. */
+    if (rc == VERR_FILE_NOT_FOUND)
+        rc = VINF_SUCCESS;
 
     LogFlowFunc(("returns %Rrc *pcEntriesUsed=%u\n", rc, cEntries));