Changeset 59569 in vbox for trunk

Timestamp:

Feb 3, 2016 11:45:40 AM (9 years ago)

Author:

vboxsync

Message:

BugReportTool(bugref:8169): Added Setup API logs, dropped factory, open files as binary

Location:

trunk/src/VBox/Frontends/VBoxBugReport

Files:

• VBoxBugReport.cpp (modified) (4 diffs)
• VBoxBugReport.h (modified) (3 diffs)
• VBoxBugReportWin.cpp (modified) (2 diffs)

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

@@ -120 +120 @@
 typedef std::list<MachineInfo*> MachineInfoList;
 
-/*
- * An auxiliary class to facilitate in-place path joins.
- */
-class PathJoin
-{
-public:
-    PathJoin(const char *folder, const char *file) { m_path = RTPathJoinA(folder, file); }
-    ~PathJoin() { RTStrFree(m_path); };
-    operator char*() const { return m_path; };
-private:
-    char *m_path;
-};
-
 
 /*
@@ -224 +211 @@
 PRTSTREAM BugReportFile::getStream(void)
 {
-    handleRtError(RTStrmOpen(m_pszPath, "r", &m_Strm),
+    handleRtError(RTStrmOpen(m_pszPath, "rb", &m_Strm),
                   "Failed to open '%s'", m_pszPath);
     return m_Strm;
@@ -458 +445 @@
 void createBugReport(BugReport* report, const char *pszHome, MachineInfoList& machines)
 {
-    BugReportItemFactory *factory = createBugReportItemFactory();
-
     report->addItem(new BugReportFile(PathJoin(pszHome, "VBoxSVC.log"), "VBoxSVC.log"));
     report->addItem(new BugReportFile(PathJoin(pszHome, "VBoxSVC.log.1"), "VBoxSVC.log.1"));
@@ -473 +458 @@
                                             (*it)->getName(), NULL));
     }
-    report->addItem(factory->createNetworkAdapterReport());
-
-    delete factory;
+
+    createBugReportOsSpecific(report, pszHome);
 }
 

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

@@ -71 +71 @@
 
 /*
+ * An auxiliary class to facilitate in-place path joins.
+ */
+class PathJoin
+{
+public:
+    PathJoin(const char *folder, const char *file) { m_path = RTPathJoinA(folder, file); }
+    ~PathJoin() { RTStrFree(m_path); };
+    operator char*() const { return m_path; };
+private:
+    char *m_path;
+};
+
+
+/*
  * An abstract class serving as the root of the bug report item tree.
  */
@@ -115 +129 @@
     char m_szFileName[RTPATH_MAX];
 };
-
-
-/*
- * This class provides a platform-agnostic way to create platform-specific item
- * objects.
- *
- * @todo At the moment it is capable of creating a single object, the one
- * intended to collect network adapter data. There will be more later.
- *
- * @todo Make an abstract class if enough platform-specific factories implemented.
- */
-class BugReportItemFactory
-{
-public:
-    virtual BugReportItem *createNetworkAdapterReport(void) { return NULL; };
-};
-
 
 
@@ -221 +218 @@
 /* Platform-specific */
 
-BugReportItemFactory *createBugReportItemFactory(void);
+#ifdef RT_OS_WINDOWS
+void createBugReportOsSpecific(BugReport* report, const char *pszHome);
+#else /* !RT_OS_WINDOWS */
+/* @todo Replace with platform-specific implementations. */
+void createBugReportOsSpecific(BugReport* report, const char *pszHome) {}
+#endif /* !RT_OS_WINDOWS */
 
 #endif /* !___H_VBOXBUGREPORT */

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

@@ -51 +51 @@
 };
 
-class BugReportItemFactoryWin : public BugReportItemFactory
-{
-public:
-    virtual BugReportItem *createNetworkAdapterReport(void) { return new BugReportNetworkAdaptersWin; };
-};
-
-BugReportItemFactory *createBugReportItemFactory(void)
-{
-    return new BugReportItemFactoryWin;
-}
+
 
 void BugReportNetworkAdaptersWin::printCharteristics(DWORD dwChars)
@@ -225 +216 @@
             
 }
+
+void createBugReportOsSpecific(BugReport* report, const char *pszHome)
+{
+    TCHAR szWinDir[MAX_PATH];
+
+    int cbNeeded = GetWindowsDirectory(szWinDir, RT_ELEMENTS(szWinDir));
+    if (cbNeeded == 0)
+        throw RTCError(RTCStringFmt("Failed to get Windows directory (err=%d)\n", GetLastError()));
+    if (cbNeeded > MAX_PATH)
+        throw RTCError(RTCStringFmt("Failed to get Windows directory (needed %d-byte buffer)\n", cbNeeded));
+    RTCStringFmt WinInfDir("%ls/inf", szWinDir);
+    report->addItem(new BugReportFile(PathJoin(WinInfDir.c_str(), "setupapi.app.log"), "setupapi.app.log"));
+    report->addItem(new BugReportFile(PathJoin(WinInfDir.c_str(), "setupapi.dev.log"), "setupapi.dev.log"));
+    report->addItem(new BugReportNetworkAdaptersWin);
+}