From 7b2fab411c5d914d3b7621595ad9f02febb7af4f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 27 Feb 2016 05:42:48 +0800 Subject: [PATCH 1/4] Comment out "List of linked Modules" section in windows crash report. It is bloating the crash report with unhelpful messages. --- src/app/stacktrace_win.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/stacktrace_win.h b/src/app/stacktrace_win.h index bfd748e8f..55e9494c1 100644 --- a/src/app/stacktrace_win.h +++ b/src/app/stacktrace_win.h @@ -259,9 +259,9 @@ const QString straceWin::getBacktrace() } } - logStream << "\n\nList of linked Modules:\n"; - EnumModulesContext modulesContext(hProcess, logStream); - SymEnumerateModules64(hProcess, EnumModulesCB, (PVOID)&modulesContext); + //logStream << "\n\nList of linked Modules:\n"; + //EnumModulesContext modulesContext(hProcess, logStream); + //SymEnumerateModules64(hProcess, EnumModulesCB, (PVOID)&modulesContext); logStream << "```"; return log; } From 498f5e387757917d9ce8c3a4ec2811924d9ed7b2 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 27 Feb 2016 05:48:53 +0800 Subject: [PATCH 2/4] Create helper function to get OS name --- src/app/stacktrace_win_dlg.h | 7 +++++-- src/base/utils/misc.cpp | 16 ++++++++++++++++ src/base/utils/misc.h | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/app/stacktrace_win_dlg.h b/src/app/stacktrace_win_dlg.h index eb4604477..72cf4715a 100644 --- a/src/app/stacktrace_win_dlg.h +++ b/src/app/stacktrace_win_dlg.h @@ -34,6 +34,7 @@ #include #include "boost/version.hpp" #include "libtorrent/version.hpp" +#include "base/utils/misc.h" #include "ui_stacktrace_win_dlg.h" class StraceDlg : public QDialog, private Ui::errorDialog @@ -67,13 +68,15 @@ public: "qBittorrent version: " VERSION "
" "Libtorrent version: " LIBTORRENT_VERSION "
" "Qt version: " QT_VERSION_STR "
" - "Boost version: %1.%2.%3" + "Boost version: %1.%2.%3
" + "OS version: %4" "


" - "
%4
" + "
%5
" "


") .arg(boostVerMajor) .arg(boostVerMinor) .arg(boostVerSubMin) + .arg(Utils::Misc::osName()) .arg(trace); errorText->setHtml(htmlStr); diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 580fa7ad1..2ee30c752 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef DISABLE_GUI #include @@ -634,3 +635,18 @@ QSize Utils::Misc::smallIconSize() return QSize(s, s); } #endif + +QString Utils::Misc::osName() +{ + // static initialization for usage in signal handler + static const QString name = +#ifdef QBT_USES_QT5 + QString("%1 %2 %3") + .arg(QSysInfo::prettyProductName()) + .arg(QSysInfo::kernelVersion()) + .arg(QSysInfo::currentCpuArchitecture()); +#else + ""; +#endif + return name; +} diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index bfc4d00e4..3a2250e4b 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -56,6 +56,8 @@ namespace Utils QPoint screenCenter(QWidget *win); QSize smallIconSize(); #endif + QString osName(); + int pythonVersion(); QString pythonExecutable(); QString pythonVersionComplete(); From 12627bbc10d77c9a2ff1db34c56e96a4ef7522f7 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 27 Feb 2016 08:27:56 +0800 Subject: [PATCH 3/4] Create helper function to get boost version --- src/app/stacktrace_win_dlg.h | 14 ++++---------- src/base/utils/misc.cpp | 11 +++++++++++ src/base/utils/misc.h | 1 + src/gui/about_imp.h | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/app/stacktrace_win_dlg.h b/src/app/stacktrace_win_dlg.h index 72cf4715a..178213ad3 100644 --- a/src/app/stacktrace_win_dlg.h +++ b/src/app/stacktrace_win_dlg.h @@ -32,7 +32,6 @@ #include #include -#include "boost/version.hpp" #include "libtorrent/version.hpp" #include "base/utils/misc.h" #include "ui_stacktrace_win_dlg.h" @@ -51,9 +50,6 @@ public: void setStacktraceString(const QString& trace) { // try to call Qt function as less as possible - const int boostVerMajor = BOOST_VERSION / 100000; - const int boostVerMinor = ((BOOST_VERSION / 100) % 1000); - const int boostVerSubMin = BOOST_VERSION % 100; QString htmlStr = QString( "

" "qBittorrent has crashed" @@ -68,14 +64,12 @@ public: "qBittorrent version: " VERSION "
" "Libtorrent version: " LIBTORRENT_VERSION "
" "Qt version: " QT_VERSION_STR "
" - "Boost version: %1.%2.%3
" - "OS version: %4" + "Boost version: %1
" + "OS version: %2" "


" - "
%5
" + "
%3
" "


") - .arg(boostVerMajor) - .arg(boostVerMinor) - .arg(boostVerSubMin) + .arg(Utils::Misc::boostVersionString()) .arg(Utils::Misc::osName()) .arg(trace); diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 2ee30c752..36149d09d 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef DISABLE_GUI #include @@ -650,3 +651,13 @@ QString Utils::Misc::osName() #endif return name; } + +QString Utils::Misc::boostVersionString() +{ + // static initialization for usage in signal handler + static const QString ver = QString("%1.%2.%3") + .arg(BOOST_VERSION / 100000) + .arg((BOOST_VERSION / 100) % 1000) + .arg(BOOST_VERSION % 100); + return ver; +} diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 3a2250e4b..3c61c5cca 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -57,6 +57,7 @@ namespace Utils QSize smallIconSize(); #endif QString osName(); + QString boostVersionString(); int pythonVersion(); QString pythonExecutable(); diff --git a/src/gui/about_imp.h b/src/gui/about_imp.h index c5a8fce65..e483911e7 100644 --- a/src/gui/about_imp.h +++ b/src/gui/about_imp.h @@ -34,7 +34,7 @@ #include "ui_about.h" #include #include -#include +#include "base/utils/misc.h" #include "base/unicodestrings.h" class about: public QDialog, private Ui::AboutDlg @@ -92,7 +92,7 @@ public: // Libraries label_11->setText(QT_VERSION_STR); label_12->setText(LIBTORRENT_VERSION); - label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100)); + label_13->setText(Utils::Misc::boostVersionString()); show(); } From d0e31adaf7b60d4629d2d2823fbe1e350f79865c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 27 Feb 2016 08:38:52 +0800 Subject: [PATCH 4/4] Create helper function to get libtorrent version --- src/app/stacktrace_win_dlg.h | 10 +++++----- src/base/utils/misc.cpp | 8 ++++++++ src/base/utils/misc.h | 1 + src/gui/about_imp.h | 3 +-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/app/stacktrace_win_dlg.h b/src/app/stacktrace_win_dlg.h index 178213ad3..6c50b4776 100644 --- a/src/app/stacktrace_win_dlg.h +++ b/src/app/stacktrace_win_dlg.h @@ -32,7 +32,6 @@ #include #include -#include "libtorrent/version.hpp" #include "base/utils/misc.h" #include "ui_stacktrace_win_dlg.h" @@ -62,13 +61,14 @@ public: "

" "

" "qBittorrent version: " VERSION "
" - "Libtorrent version: " LIBTORRENT_VERSION "
" + "Libtorrent version: %1
" "Qt version: " QT_VERSION_STR "
" - "Boost version: %1
" - "OS version: %2" + "Boost version: %2
" + "OS version: %3" "


" - "
%3
" + "
%4
" "


") + .arg(Utils::Misc::libtorrentVersionString()) .arg(Utils::Misc::boostVersionString()) .arg(Utils::Misc::osName()) .arg(trace); diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 36149d09d..3ecdbbe69 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef DISABLE_GUI #include @@ -661,3 +662,10 @@ QString Utils::Misc::boostVersionString() .arg(BOOST_VERSION % 100); return ver; } + +QString Utils::Misc::libtorrentVersionString() +{ + // static initialization for usage in signal handler + static const QString ver = LIBTORRENT_VERSION; + return ver; +} diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 3c61c5cca..b496b68ea 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -58,6 +58,7 @@ namespace Utils #endif QString osName(); QString boostVersionString(); + QString libtorrentVersionString(); int pythonVersion(); QString pythonExecutable(); diff --git a/src/gui/about_imp.h b/src/gui/about_imp.h index e483911e7..32a176187 100644 --- a/src/gui/about_imp.h +++ b/src/gui/about_imp.h @@ -33,7 +33,6 @@ #include "ui_about.h" #include -#include #include "base/utils/misc.h" #include "base/unicodestrings.h" @@ -91,7 +90,7 @@ public: // Libraries label_11->setText(QT_VERSION_STR); - label_12->setText(LIBTORRENT_VERSION); + label_12->setText(Utils::Misc::libtorrentVersionString()); label_13->setText(Utils::Misc::boostVersionString()); show();