ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add progress dialog to crash handler

Browse source
This commit is contained in:
marzent 2024-02-15 23:39:08 +01:00
parent 63f32322f5
commit 1020f8a85b
1 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

49
DalamudCrashHandler/DalamudCrashHandler.cpp
View file

@ -25,6 +25,7 @@
#include <shellapi.h> #include <shellapi.h>
#include <ShlGuid.h> #include <ShlGuid.h>
#include <ShObjIdl.h> #include <ShObjIdl.h>
#include <shlobj_core.h>
#include <winhttp.h> #include <winhttp.h>
#pragma comment(lib, "comctl32.lib") #pragma comment(lib, "comctl32.lib")
@ -670,6 +671,7 @@ int main() {
std::filesystem::path assetDir, logDir; std::filesystem::path assetDir, logDir;
std::optional<std::vector<std::wstring>> launcherArgs; std::optional<std::vector<std::wstring>> launcherArgs;
auto fullDump = false; auto fullDump = false;
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
std::vector<std::wstring> args; std::vector<std::wstring> args;
if (int argc = 0; const auto argv = CommandLineToArgvW(GetCommandLineW(), &argc)) { if (int argc = 0; const auto argv = CommandLineToArgvW(GetCommandLineW(), &argc)) {
@ -753,6 +755,35 @@ int main() {
std::cout << "Crash triggered" << std::endl; std::cout << "Crash triggered" << std::endl;
std::cout << "Creating progress window" << std::endl;
IProgressDialog* pProgressDialog = NULL;
if (SUCCEEDED(CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_ALL, IID_IProgressDialog, (void**)&pProgressDialog)) && pProgressDialog) {
pProgressDialog->SetTitle(L"Dalamud");
pProgressDialog->SetLine(1, L"The game has crashed", FALSE, NULL);
pProgressDialog->SetLine(2, L"Dalamud is collecting further information", FALSE, NULL);
pProgressDialog->SetLine(3, L"Refreshing Game Module List", FALSE, NULL);
pProgressDialog->StartProgressDialog(NULL, NULL, PROGDLG_MARQUEEPROGRESS | PROGDLG_NOCANCEL | PROGDLG_NOMINIMIZE, NULL);
IOleWindow* pOleWindow;
HRESULT hr = pProgressDialog->QueryInterface(IID_IOleWindow, (LPVOID*)&pOleWindow);
if (SUCCEEDED(hr))
{
HWND hwndProgressDialog = NULL;
hr = pOleWindow->GetWindow(&hwndProgressDialog);
if (SUCCEEDED(hr))
{
SetWindowPos(hwndProgressDialog, HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
}
pOleWindow->Release();
}
}
else {
std::cerr << "Failed to create progress window" << std::endl;
pProgressDialog = NULL;
}
auto shutup_mutex = CreateMutex(NULL, false, L"DALAMUD_CRASHES_NO_MORE"); auto shutup_mutex = CreateMutex(NULL, false, L"DALAMUD_CRASHES_NO_MORE");
bool shutup = false; bool shutup = false;
if (shutup_mutex == NULL && GetLastError() == ERROR_ALREADY_EXISTS) if (shutup_mutex == NULL && GetLastError() == ERROR_ALREADY_EXISTS)
@ -791,6 +822,9 @@ int main() {
std::wcerr << std::format(L"SymInitialize error: 0x{:x}", GetLastError()) << std::endl; std::wcerr << std::format(L"SymInitialize error: 0x{:x}", GetLastError()) << std::endl;
} }
if (pProgressDialog)
pProgressDialog->SetLine(3, L"Reading troubleshooting data", FALSE, NULL);
std::wstring stackTrace(exinfo.dwStackTraceLength, L'\0'); std::wstring stackTrace(exinfo.dwStackTraceLength, L'\0');
if (exinfo.dwStackTraceLength) { if (exinfo.dwStackTraceLength) {
if (DWORD read; !ReadFile(hPipeRead, &stackTrace[0], 2 * exinfo.dwStackTraceLength, &read, nullptr)) { if (DWORD read; !ReadFile(hPipeRead, &stackTrace[0], 2 * exinfo.dwStackTraceLength, &read, nullptr)) {
@ -805,6 +839,9 @@ int main() {
} }
} }
if (pProgressDialog)
pProgressDialog->SetLine(3, fullDump ? L"Creating full dump" : L"Creating minidump", FALSE, NULL);
SYSTEMTIME st; SYSTEMTIME st;
GetLocalTime(&st); GetLocalTime(&st);
const auto dalamudLogPath = logDir.empty() ? std::filesystem::path() : logDir / L"Dalamud.log"; const auto dalamudLogPath = logDir.empty() ? std::filesystem::path() : logDir / L"Dalamud.log";
@ -857,6 +894,9 @@ int main() {
log << L"System Time: " << std::chrono::system_clock::now() << std::endl; log << L"System Time: " << std::chrono::system_clock::now() << std::endl;
log << L"\n" << stackTrace << std::endl; log << L"\n" << stackTrace << std::endl;
if (pProgressDialog)
pProgressDialog->SetLine(3, L"Refreshing Module List", FALSE, NULL);
SymRefreshModuleList(GetCurrentProcess()); SymRefreshModuleList(GetCurrentProcess());
print_exception_info(exinfo.hThreadHandle, exinfo.ExceptionPointers, exinfo.ContextRecord, log); print_exception_info(exinfo.hThreadHandle, exinfo.ExceptionPointers, exinfo.ContextRecord, log);
const auto window_log_str = log.str(); const auto window_log_str = log.str();
@ -993,11 +1033,20 @@ int main() {
}; };
config.lpCallbackData = reinterpret_cast<LONG_PTR>(&callback); config.lpCallbackData = reinterpret_cast<LONG_PTR>(&callback);
if (pProgressDialog)
pProgressDialog->SetLine(3, L"Submitting Metrics", FALSE, NULL);
if (submitThread.joinable()) { if (submitThread.joinable()) {
submitThread.join(); submitThread.join();
submitThread = {}; submitThread = {};
} }
if (pProgressDialog) {
pProgressDialog->StopProgressDialog();
pProgressDialog->Release();
pProgressDialog = NULL;
}
if (shutup) { if (shutup) {
TerminateProcess(g_hProcess, exinfo.ExceptionRecord.ExceptionCode); TerminateProcess(g_hProcess, exinfo.ExceptionRecord.ExceptionCode);
return 0; return 0;