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

Timestamp:

Sep 2, 2016 3:00:26 PM (8 years ago)

Author:

vboxsync

Message:

BugReport(bugref:7809): Collect all logs as well as driver versions.

Location:

trunk/src/VBox/Frontends/VBoxBugReport

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxBugReport.cpp (modified) (3 diffs)
• VBoxBugReportWin.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk

@@ -25 +25 @@
 # VBoxBugReport_DEFS      += \
         VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
- VBoxBugReport_DEFS.win   = _WIN32_WINNT=0x0501
+ VBoxBugReport_DEFS.win   = _WIN32_WINNT=0x0501 PSAPI_VERSION=1
+ VBoxBugReport_LIBS.win   = psapi.lib
  VBoxBugReport_SOURCES    = \
         VBoxBugReport.cpp

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

@@ -117 +117 @@
 
 
+class VBRDir
+{
+public:
+    VBRDir(const char *pcszPath)
+        {
+            int rc = RTDirOpenFiltered(&m_pDir, pcszPath, RTDIRFILTER_WINNT, 0);
+            if (RT_FAILURE(rc))
+                throw RTCError(com::Utf8StrFmt("Failed to open directory '%s'\n", pcszPath));
+        };
+    ~VBRDir()
+        {
+            int rc = RTDirClose(m_pDir);
+            if (RT_FAILURE(rc))
+                throw RTCError("Failed to close directory\n");
+        };
+    const char *next(void)
+        {
+            int rc = RTDirRead(m_pDir, &m_DirEntry, NULL);
+            if (RT_SUCCESS(rc))
+                return m_DirEntry.szName;
+            else if (rc == VERR_NO_MORE_FILES)
+                return NULL;
+            throw RTCError("Failed to read directory element\n");
+        };
+
+private:
+    PRTDIR m_pDir;
+    RTDIRENTRY m_DirEntry;
+};
+
 /*
  * An abstract class serving as the root of the bug report item tree.
@@ -461 +491 @@
 void createBugReport(BugReport* report, const char *pszHome, MachineInfoList& machines)
 {
-    report->addItem(new BugReportFile(PathJoin(pszHome, "VBoxSVC.log"), "VBoxSVC.log"));
-    report->addItem(new BugReportFile(PathJoin(pszHome, "VBoxSVC.log.1"), "VBoxSVC.log.1"));
+    /* Collect all log files from VBoxSVC */
+    VBRDir HomeDir(PathJoin(pszHome, "VBoxSVC.log*"));
+    const char *pcszSvcLogFile = HomeDir.next();
+    while (pcszSvcLogFile)
+    {
+        report->addItem(new BugReportFile(PathJoin(pszHome, pcszSvcLogFile), pcszSvcLogFile));
+        pcszSvcLogFile = HomeDir.next();
+    }
+
     report->addItem(new BugReportFile(PathJoin(pszHome, "VirtualBox.xml"), "VirtualBox.xml"));
     report->addItem(new BugReportCommand("HostUsbDevices", g_pszVBoxManage, "list", "usbhost", NULL));
@@ -468 +505 @@
     for (MachineInfoList::iterator it = machines.begin(); it != machines.end(); ++it)
     {
-        report->addItem(new BugReportFile(PathJoin((*it)->getLogPath(), "VBox.log"),
-                                         PathJoin((*it)->getName(),    "VBox.log")));
+        VBRDir VmDir(PathJoin((*it)->getLogPath(), "VBox.log*"));
+        const char *pcszVmLogFile = HomeDir.next();
+        while (pcszVmLogFile)
+        {
+            report->addItem(new BugReportFile(PathJoin((*it)->getLogPath(), pcszVmLogFile),
+                                              PathJoin((*it)->getName(), pcszVmLogFile)));
+            pcszVmLogFile = HomeDir.next();
+        }
         report->addItem(new BugReportFile((*it)->getSettingsFile(),
                                          PathJoin((*it)->getName(), RTPathFilename((*it)->getSettingsFile()))));

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

@@ -29 +29 @@
 #include <usbiodef.h>
 #include <usbioctl.h>
+#include <psapi.h>
 
 #define ReleaseAndReset(obj) \
@@ -561 +562 @@
 }
 
+class BugReportDriversWin : public BugReportStream
+{
+public:
+    BugReportDriversWin();
+    virtual ~BugReportDriversWin();
+    virtual PRTSTREAM getStream(void) { enumerateDrivers(); return BugReportStream::getStream(); }
+private:
+    void enumerateDrivers(void);
+
+    WCHAR  *m_pwszSystemRoot;
+    UINT    m_cSystemRoot;
+    LPVOID *m_pDrivers;
+    DWORD   m_cDrivers;
+    LPVOID  m_pVerInfo;
+    DWORD   m_cbVerInfo;
+};
+
+BugReportDriversWin::BugReportDriversWin() : BugReportStream("DriverVersions")
+{
+    m_cSystemRoot = MAX_PATH;
+    m_pwszSystemRoot = new WCHAR[MAX_PATH];
+    m_cDrivers = 1024;
+    m_pDrivers = new LPVOID[m_cDrivers];
+    m_pVerInfo = NULL;
+    m_cbVerInfo = 0;
+}
+
+BugReportDriversWin::~BugReportDriversWin()
+{
+    if (m_pVerInfo)
+        RTMemTmpFree(m_pVerInfo);
+    delete[] m_pDrivers;
+    delete[] m_pwszSystemRoot;
+}
+
+void BugReportDriversWin::enumerateDrivers()
+{
+    UINT cNeeded = GetWindowsDirectory(m_pwszSystemRoot, m_cSystemRoot);
+    if (cNeeded > m_cSystemRoot)
+    {
+        /* Re-allocate and try again */
+        m_cSystemRoot = cNeeded;
+        delete[] m_pwszSystemRoot;
+        m_pwszSystemRoot = new WCHAR[m_cSystemRoot];
+        cNeeded = GetWindowsDirectory(m_pwszSystemRoot, m_cSystemRoot);
+    }
+    if (cNeeded == 0)
+        handleWinError(GetLastError(), "GetWindowsDirectory failed");
+
+    DWORD cbNeeded = 0;
+    if (    !EnumDeviceDrivers(m_pDrivers, m_cDrivers * sizeof(m_pDrivers[0]), &cbNeeded)
+         || cbNeeded > m_cDrivers * sizeof(m_pDrivers[0]))
+    {
+        /* Re-allocate and try again */
+        m_cDrivers = cbNeeded / sizeof(m_pDrivers[0]);
+        delete[] m_pDrivers;
+        m_pDrivers = new LPVOID[m_cDrivers];
+        if (!EnumDeviceDrivers(m_pDrivers, cbNeeded, &cbNeeded))
+            handleWinError(GetLastError(), "EnumDeviceDrivers failed (%p, %u)", m_pDrivers, cbNeeded);
+    }
+
+    WCHAR wszDriver[1024];
+    for (unsigned i = 0; i < m_cDrivers; i++)
+    {
+        if (GetDeviceDriverBaseName(m_pDrivers[i], wszDriver, RT_ELEMENTS(wszDriver)))
+        {
+            if (_wcsnicmp(L"vbox", wszDriver, 4))
+                continue;
+        }
+        else
+            continue;
+        if (GetDeviceDriverFileName(m_pDrivers[i], wszDriver, RT_ELEMENTS(wszDriver)))
+        {
+            WCHAR wszTmpDrv[1024];
+            WCHAR *pwszDrv = wszDriver;
+            if (!wcsncmp(L"\\SystemRoot", wszDriver, 11))
+            {
+                wcsncpy_s(wszTmpDrv, m_pwszSystemRoot, m_cSystemRoot);
+                wcsncat_s(wszTmpDrv, wszDriver + 11, RT_ELEMENTS(wszTmpDrv) - m_cSystemRoot);
+                pwszDrv = wszTmpDrv;
+            }
+            else if (!wcsncmp(L"\\??\\", wszDriver, 4))
+                pwszDrv = wszDriver + 4;
+
+
+            /* Allocate a buffer for version info. Reuse if large enough. */
+            DWORD cbNewVerInfo = GetFileVersionInfoSize(pwszDrv, NULL);
+            if (cbNewVerInfo > m_cbVerInfo)
+            {
+                if (m_pVerInfo)
+                    RTMemTmpFree(m_pVerInfo);
+                m_cbVerInfo = cbNewVerInfo;
+                m_pVerInfo = RTMemTmpAlloc(m_cbVerInfo);
+                if (!m_pVerInfo)
+                    throw RTCError(RTCStringFmt("Failed to allocate %u bytes", m_cbVerInfo).c_str());
+            }
+
+            if (GetFileVersionInfo(pwszDrv, NULL, m_cbVerInfo, m_pVerInfo))
+            {
+                UINT   cbSize = 0;
+                LPBYTE lpBuffer = NULL;
+                if (VerQueryValue(m_pVerInfo, L"\\", (VOID FAR* FAR*)&lpBuffer, &cbSize))
+                {
+                    if (cbSize)
+                    {
+                        VS_FIXEDFILEINFO *pFileInfo = (VS_FIXEDFILEINFO *)lpBuffer;
+                        if (pFileInfo->dwSignature == 0xfeef04bd)
+                        {
+                            printf("%ls (Version: %d.%d.%d.%d)\n", pwszDrv,
+                                   (pFileInfo->dwFileVersionMS >> 16) & 0xffff,
+                                   (pFileInfo->dwFileVersionMS >> 0) & 0xffff,
+                                   (pFileInfo->dwFileVersionLS >> 16) & 0xffff,
+                                   (pFileInfo->dwFileVersionLS >> 0) & 0xffff);
+                        }
+                        else
+                            printf("%ls - invalid signature\n", pwszDrv);
+                    }
+                    else
+                        printf("%ls - version info size is 0\n", pwszDrv);
+                }
+                else
+                    printf("%ls - failed to query version info size\n", pwszDrv);
+            }
+            else
+                printf("%ls - failed to get version info with 0x%x\n", pwszDrv, GetLastError());
+        }
+        else
+            printf("%ls - GetDeviceDriverFileName failed with 0x%x\n", wszDriver, GetLastError());
+    }
+}
+
+
 
 void createBugReportOsSpecific(BugReport* report, const char *pszHome)
@@ -587 +720 @@
                                          "query", "type=", "driver", "state=", "all", NULL));
     report->addItem(new BugReportUsbTreeWin);
-}
+    report->addItem(new BugReportDriversWin);
+}