Changeset 65456 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 26, 2017 3:14:27 PM (8 years ago)

Author:

vboxsync

Message:

BugReportTool: windows driver store and network registry (bugref:8169)

Location:

trunk/src/VBox/Frontends/VBoxBugReport

Files:

• VBoxBugReport.cpp (modified) (1 diff)
• VBoxBugReport.h (modified) (1 diff)
• VBoxBugReportWin.cpp (modified) (1 diff)

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

@@ -327 +327 @@
     handleRtError(RTStrmOpen(m_szFileName, "r", &m_Strm),
                   "Failed to open '%s'", m_szFileName);
+    return m_Strm;
+}
+
+
+BugReportCommandTemp::BugReportCommandTemp(const char *pszTitle, const char *pszExec, ...)
+    : BugReportItem(pszTitle), m_Strm(NULL)
+{
+    handleRtError(RTPathTemp(m_szFileName, RTPATH_MAX),
+                  "Failed to obtain path to temporary folder");
+    handleRtError(RTPathAppend(m_szFileName, RTPATH_MAX, "BugRepXXXXX.tmp"),
+                  "Failed to append path");
+    handleRtError(RTFileCreateTemp(m_szFileName, 0600),
+                  "Failed to create temporary file '%s'", m_szFileName);
+
+    unsigned cArgs = 0;
+    m_papszArgs[cArgs++] = RTStrDup(pszExec);
+
+    const char *pszArg;
+    va_list va;
+    va_start(va, pszExec);
+    do
+    {
+        if (cArgs >= RT_ELEMENTS(m_papszArgs) - 1)
+        {
+            va_end(va);
+            throw RTCError(com::Utf8StrFmt("Too many arguments (%u > %u)\n", cArgs+1, RT_ELEMENTS(m_papszArgs)));
+        }
+        pszArg = va_arg(va, const char *);
+        m_papszArgs[cArgs++] = RTStrDup(pszArg ? pszArg : m_szFileName);
+    } while (pszArg);
+    va_end(va);
+
+    m_papszArgs[cArgs++] = NULL;
+}
+
+BugReportCommandTemp::~BugReportCommandTemp()
+{
+    if (m_Strm)
+        RTStrmClose(m_Strm);
+    RTFileDelete(m_szErrFileName);
+    RTFileDelete(m_szFileName);
+    for (size_t i = 0; i < RT_ELEMENTS(m_papszArgs) && m_papszArgs[i]; ++i)
+        RTStrFree(m_papszArgs[i]);
+}
+
+PRTSTREAM BugReportCommandTemp::getStream(void)
+{
+    handleRtError(RTPathTemp(m_szErrFileName, RTPATH_MAX),
+                  "Failed to obtain path to temporary folder");
+    handleRtError(RTPathAppend(m_szErrFileName, RTPATH_MAX, "BugRepErrXXXXX.tmp"),
+                  "Failed to append path");
+    handleRtError(RTFileCreateTemp(m_szErrFileName, 0600),
+                  "Failed to create temporary file '%s'", m_szErrFileName);
+
+    RTHANDLE hStdOutErr;
+    hStdOutErr.enmType = RTHANDLETYPE_FILE;
+    handleRtError(RTFileOpen(&hStdOutErr.u.hFile, m_szErrFileName,
+                             RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE),
+                  "Failed to open temporary file '%s'", m_szErrFileName);
+
+    /* Remove the output file to prevent errors or confirmation prompts */
+    handleRtError(RTFileDelete(m_szFileName),
+                  "Failed to delete temporary file '%s'", m_szFileName);
+
+    RTPROCESS hProcess;
+    handleRtError(RTProcCreateEx(m_papszArgs[0], m_papszArgs, RTENV_DEFAULT, 0,
+                                 NULL, &hStdOutErr, &hStdOutErr,
+                                 NULL, NULL, &hProcess),
+                  "Failed to create process '%s'", m_papszArgs[0]);
+    RTPROCSTATUS status;
+    handleRtError(RTProcWait(hProcess, RTPROCWAIT_FLAGS_BLOCK, &status),
+                  "Process wait failed");
+    RTFileClose(hStdOutErr.u.hFile);
+
+    if (status.enmReason == RTPROCEXITREASON_NORMAL && status.iStatus == 0)
+        handleRtError(RTStrmOpen(m_szFileName, "r", &m_Strm), "Failed to open '%s'", m_szFileName);
+    else
+        handleRtError(RTStrmOpen(m_szErrFileName, "r", &m_Strm), "Failed to open '%s'", m_szErrFileName);
     return m_Strm;
 }

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.h

@@ -224 +224 @@
 };
 
+/*
+ * A base class for item classes that provide temp output file to a command.
+ */
+class BugReportCommandTemp : public BugReportItem
+{
+public:
+    BugReportCommandTemp(const char *pszTitle, const char *pszExec, ...);
+    virtual ~BugReportCommandTemp();
+    virtual PRTSTREAM getStream(void);
+private:
+    PRTSTREAM m_Strm;
+    char m_szFileName[RTPATH_MAX];
+    char m_szErrFileName[RTPATH_MAX];
+    char *m_papszArgs[32];
+};
 
 /* Platform-specific */

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

@@ -719 +719 @@
     report->addItem(new BugReportCommand("DriverServices", PathJoin(WinSysDir.c_str(), "sc.exe"),
                                          "query", "type=", "driver", "state=", "all", NULL));
+    report->addItem(new BugReportCommand("DriverStore", PathJoin(WinSysDir.c_str(), "pnputil.exe"), "-e", NULL));
+    report->addItem(new BugReportCommandTemp("RegDevKeys", PathJoin(WinSysDir.c_str(), "reg.exe"), "export",
+        "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Enum\\Root\\NET", NULL));
+    report->addItem(new BugReportCommandTemp("RegDrvKeys", PathJoin(WinSysDir.c_str(), "reg.exe"), "export",
+        "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", NULL));
+    report->addItem(new BugReportCommandTemp("RegNetwork", PathJoin(WinSysDir.c_str(), "reg.exe"), "export",
+        "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", NULL));
     report->addItem(new BugReportUsbTreeWin);
     report->addItem(new BugReportDriversWin);