From 9e668178bd8e4ab24eb47532bfc27a2cd92da5c5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 11 Oct 2023 19:39:16 +0300 Subject: =?UTF-8?q?fixes=20#3328=20(CrashDumper:=20=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BE=D0=B1=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B8=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BE?= =?UTF-8?q?=D1=87=D0=BD=D1=8B=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/CrashDumper/src/dumper.cpp | 38 ++++++++++++++++++++++++++++++++++++++ plugins/CrashDumper/src/version.h | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) (limited to 'plugins/CrashDumper/src') diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index f328ddabb5..d6066a8b95 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -479,6 +479,42 @@ void PrintVersionInfo(CMStringW& buffer, unsigned flags) } } +///////////////////////////////////////////////////////////////////////////////////////// + +enum +{ + UPDATE_MODE_CUSTOM, + UPDATE_MODE_STABLE, + UPDATE_MODE_TRUNK, + UPDATE_MODE_TRUNK_SYMBOLS, + UPDATE_MODE_STABLE_SYMBOLS, + UPDATE_MODE_MAX_VALUE // leave this variable last in the list +}; + +void PrintSymbolsInfo(CMStringW &out) +{ + int iMode = db_get_dw(0, "PluginUpdater", "UpdateMode", -1); + switch (iMode) { + case UPDATE_MODE_CUSTOM: + out.Append(L"Symbols mode: custom"); + break; + case UPDATE_MODE_STABLE: + out.Append(L"Symbols mode: stable version without symbols"); + break; + case UPDATE_MODE_TRUNK: + out.Append(L"Symbols mode: trunk version without symbols"); + break; + case UPDATE_MODE_TRUNK_SYMBOLS: + out.Append(L"Symbols mode: trunk version with symbols"); + break; + case UPDATE_MODE_STABLE_SYMBOLS: + out.Append(L"Symbols mode: stable version with symbols"); + break; + } +} + +///////////////////////////////////////////////////////////////////////////////////////// + void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const wchar_t* msg) { if (exc_ptr->ContextRecord == nullptr || (exc_ptr->ContextRecord->ContextFlags & CONTEXT_CONTROL) == 0) @@ -513,6 +549,8 @@ void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const wcha GetISO8061Time(nullptr, curtime, 30); CMStringW buffer; + PrintSymbolsInfo(buffer); + buffer.AppendFormat(L"Miranda Crash Report from %s. Crash Dumper v.%d.%d.%d.%d\r\n", curtime, __MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM); diff --git a/plugins/CrashDumper/src/version.h b/plugins/CrashDumper/src/version.h index f493899a6b..766cd28191 100644 --- a/plugins/CrashDumper/src/version.h +++ b/plugins/CrashDumper/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 #define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __BUILD_NUM 2 #include -- cgit v1.2.3