Changeset 96402 in vbox for trunk/src/VBox/Frontends/VBoxBugReport

Timestamp:

Aug 22, 2022 3:27:17 PM (3 years ago)

Author:

vboxsync

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

153219

Message:

/Config.kmk and many other places: Change VBOX_VENDOR to the official copyright holder text, needs follow-up changes and equivalent adjustments elsewhere.

File:

• trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp

@@ -123 +123 @@
     {
         int rc = RTDirOpenFiltered(&m_hDir, pcszPath, RTDIRFILTER_WINNT, 0);
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(rc) && rc != VERR_FILE_NOT_FOUND && rc != VERR_PATH_NOT_FOUND)
             throw RTCError(com::Utf8StrFmt("Failed to open directory '%s'\n", pcszPath));
     };
     ~VBRDir()
     {
-        int rc = RTDirClose(m_hDir);
-        AssertRC(rc);
+        if (RT_VALID_PTR(m_hDir))
+        {
+            int rc = RTDirClose(m_hDir);
+            AssertRC(rc);
+        }
     };
     const char *next(void)
     {
+        if (!RT_VALID_PTR(m_hDir))
+            return NULL;
+
         int rc = RTDirRead(m_hDir, &m_DirEntry, NULL);
         if (RT_SUCCESS(rc))
@@ -652 +658 @@
 void addMachine(MachineInfoList& list, ComPtr<IMachine> machine)
 {
+    BOOL fAccessible = FALSE;
+    HRESULT hrc = machine->COMGETTER(Accessible)(&fAccessible);
+    if (SUCCEEDED(hrc) && !fAccessible)
+        return
+    handleComError(hrc, "Failed to get accessible status of VM");
+
     com::Bstr name, logFolder, settingsFile;
     handleComError(machine->COMGETTER(Name)(name.asOutParam()),
@@ -668 +680 @@
 {
     RTStrmPrintf(g_pStdErr, VBOX_PRODUCT " Bug Report Tool " VBOX_VERSION_STRING "\n"
-                 "(C) " VBOX_C_YEAR " " VBOX_VENDOR "\n"
-                 "All rights reserved.\n\n");
+                 "Copyright (C) " VBOX_C_YEAR " " VBOX_VENDOR "\n\n");
 }