Index: /trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk (revision 59796) +++ /trunk/src/VBox/Frontends/VBoxBugReport/Makefile.kmk (revision 59797) @@ -25,5 +25,5 @@ # VBoxBugReport_DEFS += \ VBOX_WATCHDOG_GLOBAL_PERFCOL VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" - VBoxBugReport_DEFS.win = _WIN32_WINNT=0x0500 + VBoxBugReport_DEFS.win = _WIN32_WINNT=0x0501 VBoxBugReport_SOURCES = \ VBoxBugReport.cpp Index: /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp (revision 59796) +++ /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp (revision 59797) @@ -142,5 +142,31 @@ BugReport::~BugReport() { + for (int i = 0; i < m_Items.size(); ++i) + { + delete m_Items[i]; + } RTStrFree(m_pszFileName); +} + +int BugReport::getItemCount(void) +{ + return (int)m_Items.size(); +} + +void BugReport::addItem(BugReportItem* item) +{ + if (item) + m_Items.append(item); +} + +void BugReport::process(void) +{ + for (int i = 0; i < m_Items.size(); ++i) + { + BugReportItem *pItem = m_Items[i]; + RTPrintf("%3u%% - collecting %s...\n", i * 100 / m_Items.size(), pItem->getTitle()); + processItem(pItem); + } + RTPrintf("100%% - compressing...\n\n"); } @@ -284,9 +310,6 @@ } -int BugReportText::addItem(BugReportItem* item) -{ - if (!item) - return VERR_INVALID_PARAMETER; - +void BugReportText::processItem(BugReportItem* item) +{ int cb = RTStrmPrintf(m_StrmTxt, "[ %s ] -------------------------------------------\n", item->getTitle()); if (!cb) @@ -321,8 +344,4 @@ handleRtError(RTStrmPutCh(m_StrmTxt, '\n'), "Write failure"); - - delete item; - - return rc; } @@ -359,9 +378,6 @@ } -int BugReportTarGzip::addItem(BugReportItem* item) -{ - if (!item) - return VERR_INVALID_PARAMETER; - +void BugReportTarGzip::processItem(BugReportItem* item) +{ handleRtError(RTTarFileOpen(m_hTar, &m_hTarFile, item->getTitle(), RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE), @@ -400,8 +416,4 @@ m_hTarFile = NIL_RTTARFILE; } - - delete item; - - return rc; } @@ -443,4 +455,6 @@ report->addItem(new BugReportFile(PathJoin(pszHome, "VBoxSVC.log.1"), "VBoxSVC.log.1")); report->addItem(new BugReportFile(PathJoin(pszHome, "VirtualBox.xml"), "VirtualBox.xml")); + report->addItem(new BugReportCommand("HostUsbDevices", g_pszVBoxManage, "list", "usbhost", NULL)); + report->addItem(new BugReportCommand("HostUsbFilters", g_pszVBoxManage, "list", "usbfilters", NULL)); for (MachineInfoList::iterator it = machines.begin(); it != machines.end(); ++it) { @@ -626,4 +640,5 @@ pReport = new BugReportTarGzip(pszOutputFile); createBugReport(pReport, homeDir, list); + pReport->process(); pReport->complete(); RTPrintf("Report was written to '%s'\n", pszOutputFile); Index: /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.h (revision 59796) +++ /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.h (revision 59797) @@ -35,4 +35,5 @@ #include #include +#include #ifdef RT_OS_WINDOWS @@ -106,8 +107,15 @@ BugReport(const char *pszFileName); virtual ~BugReport(); - virtual int addItem(BugReportItem* item) = 0; + + void addItem(BugReportItem* item); + int getItemCount(void); + void process(); + + virtual void processItem(BugReportItem* item) = 0; virtual void complete(void) = 0; + protected: char *m_pszFileName; + RTCList m_Items; }; @@ -141,5 +149,5 @@ BugReportText(const char *pszFileName); virtual ~BugReportText(); - virtual int addItem(BugReportItem* item); + virtual void processItem(BugReportItem* item); virtual void complete(void) {}; private: @@ -155,5 +163,5 @@ BugReportTarGzip(const char *pszFileName); virtual ~BugReportTarGzip(); - virtual int addItem(BugReportItem* item); + virtual void processItem(BugReportItem* item); virtual void complete(void); private: @@ -185,4 +193,5 @@ }; + /* * BugReportFile adds a file as an item to a report. Index: /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReportWin.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReportWin.cpp (revision 59796) +++ /trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReportWin.cpp (revision 59797) @@ -25,6 +25,9 @@ #include +#include +#include #include - +#include +#include #define ReleaseAndReset(obj) \ @@ -217,4 +220,343 @@ } + +class ErrorHandler +{ +public: + ErrorHandler(const char *pszFunction, int iLine) + : m_function(pszFunction), m_line(iLine) {}; + void handleWinError(DWORD uError, const char *pszMsgFmt, ...) + { + if (uError != ERROR_SUCCESS) + { + va_list va; + va_start(va, pszMsgFmt); + RTCString msgArgs(pszMsgFmt, va); + va_end(va); + LPSTR pBuf = NULL; + DWORD cb = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, uError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&pBuf, 0, NULL); + RTCStringFmt msg("%s at %s(%d): err=%u %s", msgArgs.c_str(), m_function, m_line, uError, pBuf); + LocalFree(pBuf); + throw RTCError(msg.c_str()); + } + }; +private: + const char *m_function; + int m_line; +}; +#define handleWinError ErrorHandler(__FUNCTION__, __LINE__).handleWinError + + +class BugReportUsbTreeWin : public BugReportStream +{ +public: + BugReportUsbTreeWin(); + virtual ~BugReportUsbTreeWin(); + virtual PRTSTREAM getStream(void) { enumerate(); return BugReportStream::getStream(); }; +private: + class AutoHandle { + public: + AutoHandle(HANDLE h) { m_h = h; }; + ~AutoHandle() { close(); }; + bool isValid() { return m_h != INVALID_HANDLE_VALUE; }; + operator HANDLE() { return m_h; }; + void close(void) { if (isValid()) { CloseHandle(m_h); m_h = INVALID_HANDLE_VALUE; } }; + private: + HANDLE m_h; + }; + void enumerate(); + + void enumerateController(PSP_DEVINFO_DATA pInfoData, PSP_DEVICE_INTERFACE_DATA pInterfaceData); + void enumerateHub(RTCString strFullName, RTCString strPrefix); + void enumeratePorts(HANDLE hHub, unsigned cPorts, RTCString strPrefix); + PBYTE getDeviceRegistryProperty(HDEVINFO hDev, PSP_DEVINFO_DATA pInfoData, DWORD uProperty, + DWORD uExpectedType, PDWORD puSize); + RTCString getDeviceRegistryPropertyString(HDEVINFO hDev, PSP_DEVINFO_DATA pInfoData, DWORD uProperty); + + RTCString getDeviceDescByDriverName(RTCString strDrvName); + RTCString getDriverKeyName(HANDLE hHub, int iPort); + RTCString getExternalHubName(HANDLE hHub, int iPort); + + HDEVINFO m_hDevInfo; + PSP_DEVICE_INTERFACE_DETAIL_DATA m_pDetailData; + HANDLE m_hHostCtrlDev; +}; + +BugReportUsbTreeWin::BugReportUsbTreeWin() : BugReportStream("HostUsbTree") +{ + m_hDevInfo = INVALID_HANDLE_VALUE; + m_pDetailData = NULL; + m_hHostCtrlDev = INVALID_HANDLE_VALUE; +} + +BugReportUsbTreeWin::~BugReportUsbTreeWin() +{ + if (m_hHostCtrlDev != INVALID_HANDLE_VALUE) + CloseHandle(m_hHostCtrlDev); + if (m_pDetailData) + RTMemFree(m_pDetailData); + if (m_hDevInfo != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(m_hDevInfo); +} + + +PBYTE BugReportUsbTreeWin::getDeviceRegistryProperty(HDEVINFO hDev, + PSP_DEVINFO_DATA pInfoData, + DWORD uProperty, + DWORD uExpectedType, + PDWORD puSize) +{ + DWORD uActualType, cbNeeded = 0; + if (!SetupDiGetDeviceRegistryProperty(hDev, pInfoData, uProperty, &uActualType, + NULL, 0, &cbNeeded) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + if (GetLastError() == ERROR_INVALID_DATA) + return NULL; + handleWinError(GetLastError(), "SetupDiGetDeviceRegistryProperty(0x%x) failed", uProperty); + } + if (uExpectedType != REG_NONE && uActualType != uExpectedType) + throw RTCError(RTCStringFmt("SetupDiGetDeviceRegistryProperty(0x%x) returned type %d instead of %d", + uActualType, uExpectedType).c_str()); + PBYTE pBuffer = (PBYTE)RTMemAlloc(cbNeeded); + if (!pBuffer) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbNeeded).c_str()); + if (!SetupDiGetDeviceRegistryProperty(hDev, pInfoData, uProperty, NULL, + pBuffer, cbNeeded, &cbNeeded)) + { + DWORD dwErr = GetLastError(); + RTMemFree(pBuffer); + pBuffer = NULL; + handleWinError(dwErr, "SetupDiGetDeviceRegistryProperty(0x%x) failed", uProperty); + } + if (puSize) + *puSize = cbNeeded; + + return pBuffer; +} + +RTCString BugReportUsbTreeWin::getDeviceRegistryPropertyString(HDEVINFO hDev, PSP_DEVINFO_DATA pInfoData, DWORD uProperty) +{ + DWORD cbString = 0; + PWSTR pUnicodeString = (PWSTR)getDeviceRegistryProperty(hDev, pInfoData, uProperty, REG_SZ, NULL); + + if (!pUnicodeString) + return RTCString(); + + RTCStringFmt utf8string("%ls", pUnicodeString); + RTMemFree(pUnicodeString); + return utf8string; +} + + +RTCString BugReportUsbTreeWin::getDeviceDescByDriverName(RTCString strDrvName) +{ + DWORD dwErr; + SP_DEVINFO_DATA devInfoData; + HDEVINFO hDevInfo = SetupDiGetClassDevs(NULL, NULL, NULL, DIGCF_ALLCLASSES | DIGCF_PRESENT); + + if (hDevInfo == INVALID_HANDLE_VALUE) + handleWinError(GetLastError(), "SetupDiGetClassDevs failed"); + + bool fFound = false; + devInfoData.cbSize = sizeof(devInfoData); + for (int i = 0; SetupDiEnumDeviceInfo(hDevInfo, i, &devInfoData); ++i) + { + if (getDeviceRegistryPropertyString(hDevInfo, &devInfoData, SPDRP_DRIVER).equals(strDrvName)) + { + fFound = true; + break; + } + } + if (!fFound) + { + dwErr = GetLastError(); + SetupDiDestroyDeviceInfoList(hDevInfo); + handleWinError(dwErr, "SetupDiEnumDeviceInfo failed"); + } + + RTCString strDesc = getDeviceRegistryPropertyString(hDevInfo, &devInfoData, SPDRP_DEVICEDESC); + SetupDiDestroyDeviceInfoList(hDevInfo); + return strDesc; +} + + +RTCString BugReportUsbTreeWin::getDriverKeyName(HANDLE hHub, int iPort) +{ + USB_NODE_CONNECTION_DRIVERKEY_NAME name; + ULONG cbNeeded = 0; + + name.ConnectionIndex = iPort; + if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, + &name, sizeof(name), &name, sizeof(name), &cbNeeded, NULL)) + handleWinError(GetLastError(), "DeviceIoControl(IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) failed"); + cbNeeded = name.ActualLength; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME pName = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)RTMemAlloc(cbNeeded); + if (!pName) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbNeeded).c_str()); + pName->ConnectionIndex = iPort; + if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, + pName, cbNeeded, pName, cbNeeded, &cbNeeded, NULL)) + { + DWORD dwErr = GetLastError(); + RTMemFree(pName); + handleWinError(dwErr, "DeviceIoControl(IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) failed"); + } + RTCStringFmt strName("%ls", pName->DriverKeyName); + RTMemFree(pName); + return strName; +} + + +RTCString BugReportUsbTreeWin::getExternalHubName(HANDLE hHub, int iPort) +{ + USB_NODE_CONNECTION_NAME name; + ULONG cbNeeded = 0; + + name.ConnectionIndex = iPort; + if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_NAME, + &name, sizeof(name), &name, sizeof(name), &cbNeeded, NULL)) + handleWinError(GetLastError(), "DeviceIoControl(IOCTL_USB_GET_NODE_CONNECTION_NAME) failed"); + cbNeeded = name.ActualLength; + PUSB_NODE_CONNECTION_NAME pName = (PUSB_NODE_CONNECTION_NAME)RTMemAlloc(cbNeeded); + if (!pName) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbNeeded).c_str()); + pName->ConnectionIndex = iPort; + if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_NAME, + pName, cbNeeded, pName, cbNeeded, &cbNeeded, NULL)) + { + DWORD dwErr = GetLastError(); + RTMemFree(pName); + handleWinError(dwErr, "DeviceIoControl(IOCTL_USB_GET_NODE_CONNECTION_NAME) failed"); + } + RTCStringFmt strName("%ls", pName->NodeName); + RTMemFree(pName); + return strName; +} + + +void BugReportUsbTreeWin::enumeratePorts(HANDLE hHub, unsigned cPorts, RTCString strPrefix) +{ + DWORD cbInfo = sizeof(USB_NODE_CONNECTION_INFORMATION_EX) + 30 * sizeof(USB_PIPE_INFO); + PUSB_NODE_CONNECTION_INFORMATION_EX pInfo = (PUSB_NODE_CONNECTION_INFORMATION_EX)RTMemAlloc(cbInfo); + if (!pInfo) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbInfo).c_str()); + for (unsigned i = 1; i <= cPorts; ++i) + { + pInfo->ConnectionIndex = i; + if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, + pInfo, cbInfo, pInfo, cbInfo, &cbInfo, NULL)) + { + DWORD dwErr = GetLastError(); + RTMemFree(pInfo); + handleWinError(dwErr, "DeviceIoControl(IOCTL_USB_GET_NODE_CONNECTION_INFORMATION) failed"); + } + if (pInfo->ConnectionStatus == NoDeviceConnected) + printf("%s[Port %d]\n", strPrefix.c_str(), i); + else + { + RTCString strName = getDeviceDescByDriverName(getDriverKeyName(hHub, i)); + printf("%s[Port %d] %s\n", strPrefix.c_str(), i, strName.c_str()); + if (pInfo->DeviceIsHub) + enumerateHub(getExternalHubName(hHub, i), strPrefix + " "); + } + } + RTMemFree(pInfo); +} + +void BugReportUsbTreeWin::enumerateHub(RTCString strFullName, RTCString strPrefix) +{ + AutoHandle hHubDev(CreateFileA(RTCString("\\\\.\\").append(strFullName).c_str(), + GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL)); + if (!hHubDev.isValid()) + handleWinError(GetLastError(), "CreateFile(%s) failed", strFullName.c_str()); + ULONG cb; + USB_NODE_INFORMATION hubInfo; + if (!DeviceIoControl(hHubDev, + IOCTL_USB_GET_NODE_INFORMATION, + &hubInfo, + sizeof(USB_NODE_INFORMATION), + &hubInfo, + sizeof(USB_NODE_INFORMATION), + &cb, + NULL)) + handleWinError(GetLastError(), "DeviceIoControl(IOCTL_USB_GET_NODE_INFORMATION) failed"); + enumeratePorts(hHubDev, hubInfo.u.HubInformation.HubDescriptor.bNumberOfPorts, strPrefix); +} + +void BugReportUsbTreeWin::enumerateController(PSP_DEVINFO_DATA pInfoData, PSP_DEVICE_INTERFACE_DATA pInterfaceData) +{ + RTCString strCtrlDesc = getDeviceRegistryPropertyString(m_hDevInfo, pInfoData, SPDRP_DEVICEDESC); + printf("%s\n", strCtrlDesc.c_str()); + + ULONG cbNeeded; + USB_ROOT_HUB_NAME rootHub; + /* Find out the name length first */ + if (!DeviceIoControl(m_hHostCtrlDev, IOCTL_USB_GET_ROOT_HUB_NAME, NULL, 0, + &rootHub, sizeof(rootHub), + &cbNeeded, NULL)) + handleWinError(GetLastError(), "DeviceIoControl(IOCTL_USB_GET_ROOT_HUB_NAME) failed"); + cbNeeded = rootHub.ActualLength; + PUSB_ROOT_HUB_NAME pUnicodeName = (PUSB_ROOT_HUB_NAME)RTMemAlloc(cbNeeded); + if (!pUnicodeName) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbNeeded).c_str()); + + if (!DeviceIoControl(m_hHostCtrlDev, IOCTL_USB_GET_ROOT_HUB_NAME, NULL, 0, + pUnicodeName, cbNeeded, + &cbNeeded, NULL)) + { + DWORD dwErr = GetLastError(); + RTMemFree(pUnicodeName); + handleWinError(dwErr, "DeviceIoControl(IOCTL_USB_GET_ROOT_HUB_NAME) failed"); + } + + RTCStringFmt strRootHubName("%ls", pUnicodeName->RootHubName); + RTMemFree(pUnicodeName); + printf(" Root Hub\n"); + enumerateHub(strRootHubName, " "); +} + +void BugReportUsbTreeWin::enumerate() +{ + m_hDevInfo = SetupDiGetClassDevs((LPGUID)&GUID_DEVINTERFACE_USB_HOST_CONTROLLER, NULL, NULL, + DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + if (m_hDevInfo == INVALID_HANDLE_VALUE) + handleWinError(GetLastError(), "SetupDiGetClassDevs(GUID_DEVINTERFACE_USB_HOST_CONTROLLER) failed"); + + SP_DEVINFO_DATA deviceInfoData; + deviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + for (int i = 0; SetupDiEnumDeviceInfo(m_hDevInfo, i, &deviceInfoData); ++i) + { + SP_DEVICE_INTERFACE_DATA deviceInterfaceData; + deviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(m_hDevInfo, 0, (LPGUID)&GUID_DEVINTERFACE_USB_HOST_CONTROLLER, + i, &deviceInterfaceData)) + handleWinError(GetLastError(), "SetupDiEnumDeviceInterfaces(GUID_DEVINTERFACE_USB_HOST_CONTROLLER) failed"); + + ULONG cbNeeded = 0; + if (!SetupDiGetDeviceInterfaceDetail(m_hDevInfo, &deviceInterfaceData, NULL, 0, &cbNeeded, NULL) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + handleWinError(GetLastError(), "SetupDiGetDeviceInterfaceDetail failed"); + + m_pDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)RTMemAlloc(cbNeeded); + if (!m_pDetailData) + throw RTCError(RTCStringFmt("Failed to allocate %u bytes", cbNeeded).c_str()); + + m_pDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + if (!SetupDiGetDeviceInterfaceDetail(m_hDevInfo, &deviceInterfaceData, m_pDetailData, cbNeeded, &cbNeeded, NULL)) + handleWinError(GetLastError(), "SetupDiGetDeviceInterfaceDetail failed"); + + m_hHostCtrlDev = CreateFile(m_pDetailData->DevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (m_hHostCtrlDev == INVALID_HANDLE_VALUE) + handleWinError(GetLastError(), "CreateFile(%ls) failed", m_pDetailData); + + enumerateController(&deviceInfoData, &deviceInterfaceData); + } +} + + void createBugReportOsSpecific(BugReport* report, const char *pszHome) { @@ -232,9 +574,10 @@ RTCStringFmt WinSysDir("%ls/System32", szWinDir); report->addItem(new BugReportCommand("SystemEvents", PathJoin(WinSysDir.c_str(), "wevtutil.exe"), - "qe", "System", "/f:text", - "/q:*[System[Provider[@Name='VBoxUSBMon']]]", NULL)); + "qe", "System", + "/q:*[System[Provider[@Name='VBoxUSBMon' or @Name='VBoxNetLwf']]]", NULL)); report->addItem(new BugReportCommand("UpdateHistory", PathJoin(WinSysDir.c_str(), "wbem/wmic.exe"), "qfe", "list", "brief", NULL)); report->addItem(new BugReportCommand("DriverServices", PathJoin(WinSysDir.c_str(), "sc.exe"), "query", "type=", "driver", "state=", "all", NULL)); -} + report->addItem(new BugReportUsbTreeWin); +} Index: /trunk/src/VBox/Runtime/VBox/log-vbox.cpp =================================================================== --- /trunk/src/VBox/Runtime/VBox/log-vbox.cpp (revision 59796) +++ /trunk/src/VBox/Runtime/VBox/log-vbox.cpp (revision 59797) @@ -478,5 +478,6 @@ # endif # if defined(DEBUG_aleksey) /* Guest ring-0 as well */ - RTLogGroupSettings(pLogger, "net_flt_drv.e.l.f.l3.l4.l5 +net_adp_drv.e.l.f.l3.l4.l5"); + //RTLogGroupSettings(pLogger, "net_flt_drv.e.l.f.l3.l4.l5 +net_adp_drv.e.l.f.l3.l4.l5"); + RTLogGroupSettings(pLogger, "net_flt_drv.e.f.l5"); RTLogFlags(pLogger, "enabled unbuffered"); pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;