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

Add save tspack button to crash dialog

Browse source 
- Require the user manually choose a restart mode before the Restart button can be clicked.
- Rename window to Dalamud Crash Handler
This commit is contained in:
Kaz Wolfe 2024-02-16 15:03:22 -08:00
parent 24e6bf3dc8
commit 2afc692eca
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
DalamudCrashHandler/DalamudCrashHandler.cpp
View file

@ -610,6 +610,7 @@ enum {
IdRadioRestartWithoutDalamud, IdRadioRestartWithoutDalamud,
IdButtonRestart = 201, IdButtonRestart = 201,
IdButtonSaveTsPack = 202,
IdButtonHelp = IDHELP, IdButtonHelp = IDHELP,
IdButtonExit = IDCANCEL, IdButtonExit = IDCANCEL,
}; };
@ -907,20 +908,21 @@ int main() {
TASKDIALOGCONFIG config = { 0 }; TASKDIALOGCONFIG config = { 0 };
const TASKDIALOG_BUTTON radios[]{ const TASKDIALOG_BUTTON radios[]{
{IdRadioRestartNormal, L"Restart"}, {IdRadioRestartNormal, L"Restart normally"},
{IdRadioRestartWithout3pPlugins, L"Restart without 3rd party plugins"}, {IdRadioRestartWithout3pPlugins, L"Restart without custom repository plugins"},
{IdRadioRestartWithoutPlugins, L"Restart without any plugins"}, {IdRadioRestartWithoutPlugins, L"Restart without any plugins"},
{IdRadioRestartWithoutDalamud, L"Restart without Dalamud"}, {IdRadioRestartWithoutDalamud, L"Restart without Dalamud"},
}; };
const TASKDIALOG_BUTTON buttons[]{ const TASKDIALOG_BUTTON buttons[]{
{IdButtonRestart, L"Restart\nRestart the game, optionally without plugins or Dalamud."}, {IdButtonRestart, L"Restart\nRestart the game with the above-selected option."},
{IdButtonSaveTsPack, L"Save Troubleshooting Pack\nSave a .tspack file containing information about this crash for analysis."},
{IdButtonExit, L"Exit\nExit the game."}, {IdButtonExit, L"Exit\nExit the game."},
}; };
config.cbSize = sizeof(config); config.cbSize = sizeof(config);
config.hInstance = GetModuleHandleW(nullptr); config.hInstance = GetModuleHandleW(nullptr);
config.dwFlags = TDF_ENABLE_HYPERLINKS | TDF_CAN_BE_MINIMIZED | TDF_ALLOW_DIALOG_CANCELLATION | TDF_USE_COMMAND_LINKS; config.dwFlags = TDF_ENABLE_HYPERLINKS | TDF_CAN_BE_MINIMIZED | TDF_ALLOW_DIALOG_CANCELLATION | TDF_USE_COMMAND_LINKS | TDF_NO_DEFAULT_RADIO_BUTTON;
config.pszMainIcon = MAKEINTRESOURCE(IDI_ICON1); config.pszMainIcon = MAKEINTRESOURCE(IDI_ICON1);
config.pszMainInstruction = L"An error in the game occurred"; config.pszMainInstruction = L"An error in the game occurred";
config.pszContent = (L"" config.pszContent = (L""
@ -928,7 +930,7 @@ int main() {
"\n" "\n"
R"aa(Try running a game repair in XIVLauncher by right clicking the login button, and disabling plugins you don't need. Please also check your antivirus, see our <a href="help">help site</a> for more information.)aa" "\n" R"aa(Try running a game repair in XIVLauncher by right clicking the login button, and disabling plugins you don't need. Please also check your antivirus, see our <a href="help">help site</a> for more information.)aa" "\n"
"\n" "\n"
R"aa(Upload <a href="exporttspack">this file (click here)</a> if you want to ask for help in our <a href="discord">Discord server</a>.)aa" "\n" R"aa(For further assistance, please upload <a href="exporttspack">a troubleshooting pack</a> to our <a href="discord">Discord server</a>.)aa" "\n"
); );
config.pButtons = buttons; config.pButtons = buttons;
@ -937,10 +939,9 @@ int main() {
config.pszExpandedControlText = L"Hide stack trace"; config.pszExpandedControlText = L"Hide stack trace";
config.pszCollapsedControlText = L"Stack trace for plugin developers"; config.pszCollapsedControlText = L"Stack trace for plugin developers";
config.pszExpandedInformation = window_log_str.c_str(); config.pszExpandedInformation = window_log_str.c_str();
config.pszWindowTitle = L"Dalamud Error"; config.pszWindowTitle = L"Dalamud Crash Handler";
config.pRadioButtons = radios; config.pRadioButtons = radios;
config.cRadioButtons = ARRAYSIZE(radios); config.cRadioButtons = ARRAYSIZE(radios);
config.nDefaultRadioButton = IdRadioRestartNormal;
config.cxWidth = 300; config.cxWidth = 300;
#if _DEBUG #if _DEBUG
@ -962,6 +963,7 @@ int main() {
case TDN_CREATED: case TDN_CREATED:
{ {
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
SendMessage(hwnd, TDM_ENABLE_BUTTON, IdButtonRestart, 0);
return S_OK; return S_OK;
} }
case TDN_HYPERLINK_CLICKED: case TDN_HYPERLINK_CLICKED:
@ -983,6 +985,18 @@ int main() {
} }
return S_OK; return S_OK;
} }
case TDN_RADIO_BUTTON_CLICKED:
SendMessage(hwnd, TDM_ENABLE_BUTTON, IdButtonRestart, 1);
return S_OK;
case TDN_BUTTON_CLICKED:
const auto button = static_cast<int>(wParam);
if (button == IdButtonSaveTsPack)
{
export_tspack(hwnd, logDir, ws_to_u8(log.str()), troubleshootingPackData);
return S_FALSE; // keep the dialog open
}
return S_OK;
} }
return S_OK; return S_OK;