github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 10:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Windows backtrace fix

Browse Source
This commit is contained in:
QxQ 2020-10-21 10:37:06 +08:00
parent a1499cfdd1
commit a6f5d5306d
2 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
6027 6028

60
src/main.cpp
View File

@ -1,14 +1,20 @@
#ifdef QV2RAY_HAS_BACKWARD #include <QtGlobal>
#include "3rdparty/backward-cpp/backward.hpp"
// Backtrace Handler
#ifndef Q_OS_WIN
#ifdef QV2RAY_HAS_BACKWARD
#include "3rdparty/backward-cpp/backward.hpp"
#endif
#endif #endif
#ifdef QV2RAY_CLI #ifdef QV2RAY_CLI
#include "ui/cli/Qv2rayCliApplication.hpp" #include "ui/cli/Qv2rayCliApplication.hpp"
#else
#include <QMessageBox>
#endif #endif
#ifdef QV2RAY_GUI_QWIDGETS #ifdef QV2RAY_GUI_QWIDGETS
#include "ui/widgets/Qv2rayWidgetApplication.hpp" #include "ui/widgets/Qv2rayWidgetApplication.hpp"
#endif #endif
#ifdef QV2RAY_GUI_QML #ifdef QV2RAY_GUI_QML
#include "ui/qml/Qv2rayQMLApplication.hpp" #include "ui/qml/Qv2rayQMLApplication.hpp"
#endif #endif
@ -19,13 +25,14 @@
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
#include <unistd.h> #include <unistd.h>
#else
#include <Windows.h>
//
#include <DbgHelp.h>
#endif #endif
#define QV_MODULE_NAME "Init" #define QV_MODULE_NAME "Init"
#define EXITCODE_ERROR 1;
#define EXITCODE_NORMAL 0
int globalArgc; int globalArgc;
char **globalArgv; char **globalArgv;
@ -50,8 +57,10 @@ const QString SayLastWords() noexcept
{ {
QStringList msg; QStringList msg;
msg << "------- BEGIN QV2RAY CRASH REPORT -------"; msg << "------- BEGIN QV2RAY CRASH REPORT -------";
#ifdef QV2RAY_HAS_BACKWARD
{ {
#ifndef Q_OS_WIN
#ifdef QV2RAY_HAS_BACKWARD
const static QString SourceFormat = " ---> %1:[%2:%3]"; const static QString SourceFormat = " ---> %1:[%2:%3]";
backward::StackTrace st; backward::StackTrace st;
backward::TraceResolver resolver; backward::TraceResolver resolver;
@ -73,8 +82,35 @@ const QString SayLastWords() noexcept
msg << newLine; msg << newLine;
} }
} }
} #endif
#else
void *stack[1024];
HANDLE process = GetCurrentProcess();
SymInitialize(process, NULL, TRUE);
SymSetOptions(SYMOPT_LOAD_ANYTHING);
WORD numberOfFrames = CaptureStackBackTrace(0, 1024, stack, NULL);
SYMBOL_INFO *symbol = (SYMBOL_INFO *) malloc(sizeof(SYMBOL_INFO) + (512 - 1) * sizeof(TCHAR));
symbol->MaxNameLen = 512;
symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
DWORD displacement;
IMAGEHLP_LINE64 *line = (IMAGEHLP_LINE64 *) malloc(sizeof(IMAGEHLP_LINE64));
line->SizeOfStruct = sizeof(IMAGEHLP_LINE64);
//
for (int i = 0; i < numberOfFrames; i++)
{
const auto address = (DWORD64) stack[i];
SymFromAddr(process, address, NULL, symbol);
if (SymGetLineFromAddr64(process, address, &displacement, line))
{
msg << QString("[%1]: %2 (%3:%4)").arg(symbol->Address).arg(symbol->Name).arg(line->FileName).arg(line->LineNumber);
}
else
{
msg << QString("[%1]: %2 SymGetLineFromAddr64[%3]").arg(symbol->Address).arg(symbol->Name).arg(GetLastError());
}
}
#endif #endif
}
if (KernelInstance) if (KernelInstance)
{ {
@ -199,13 +235,15 @@ int main(int argc, char *argv[])
// This line must be called before any other ones, since we are using these // This line must be called before any other ones, since we are using these
// values to identify instances. // values to identify instances.
QCoreApplication::setApplicationVersion(QV2RAY_VERSION_STRING); QCoreApplication::setApplicationVersion(QV2RAY_VERSION_STRING);
#ifdef QT_DEBUG #ifdef QT_DEBUG
QCoreApplication::setApplicationName("qv2ray_debug"); QCoreApplication::setApplicationName("qv2ray_debug");
#else #else
QCoreApplication::setApplicationName("qv2ray"); QCoreApplication::setApplicationName("qv2ray");
#ifdef QV2RAY_GUI #endif
#ifdef QV2RAY_GUI
QApplication::setApplicationDisplayName("Qv2ray"); QApplication::setApplicationDisplayName("Qv2ray");
#endif
#endif #endif
#ifdef QT_DEBUG #ifdef QT_DEBUG