Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Added Relaunch option on crash dialog

Browse source
This commit is contained in:
Brian Fiete 2020-09-17 14:15:38 -07:00
parent 980132c3cc
commit a215bac755
7 changed files with 79 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/corlib/src/Platform.bf
View file

@ -53,6 +53,8 @@ namespace System
[CallingConvention(.Stdcall), CLink]
public static extern uint32 BfpSystem_TickCount();
[CallingConvention(.Stdcall), CLink]
public static extern uint32 BfpSystem_SetCrashRelaunchCmd(char8* cmd);
[CallingConvention(.Stdcall), CLink]
public static extern BfpTimeStamp BfpSystem_GetTimeStamp();
[CallingConvention(.Stdcall), CLink]
public static extern uint8 BfpSystem_InterlockedExchange8(uint8* ptr, uint8 val); /// Returns the initial value in 'ptr'

1
BeefySysLib/platform/PlatformInterface.h
View file

@ -103,6 +103,7 @@ BFP_EXPORT void BFP_CALLTYPE BfpSystem_SetCommandLine(int argc, char** argv);
BFP_EXPORT void BFP_CALLTYPE BfpSystem_SetCrashReportKind(BfpCrashReportKind crashReportKind);
BFP_EXPORT void BFP_CALLTYPE BfpSystem_AddCrashInfoFunc(BfpCrashInfoFunc crashInfoFunc);
BFP_EXPORT void BFP_CALLTYPE BfpSystem_AddCrashInfo(const char* str); // Can do at any time, or during CrashInfoFunc callbacks
BFP_EXPORT void BFP_CALLTYPE BfpSystem_SetCrashRelaunchCmd(const char* str);
BFP_EXPORT void BFP_CALLTYPE BfpSystem_Shutdown();
BFP_EXPORT uint32 BFP_CALLTYPE BfpSystem_TickCount();
BFP_EXPORT BfpTimeStamp BFP_CALLTYPE BfpSystem_GetTimeStamp();

4
BeefySysLib/platform/posix/PosixCommon.cpp
View file

@ -593,6 +593,10 @@ BFP_EXPORT void BFP_CALLTYPE BfpSystem_AddCrashInfo(const char* str) // Can do a
BfpGetGlobalData()->mCrashInfo.Append(str);
}
BFP_EXPORT void BFP_CALLTYPE BfpSystem_SetCrashRelaunchCmd(const char* str)
{
}
void BfpSystem_Shutdown()
{

63
BeefySysLib/platform/win/CrashCatcher.cpp
View file

@ -2,6 +2,7 @@
#include "../util/Dictionary.h"
#include <commdlg.h>
#include <time.h>
#include <shellapi.h>
USING_NS_BF;
@ -192,6 +193,45 @@ static LRESULT CALLBACK SEHWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
}
else if (hwndCtl == gNoButtonWindow)
{
if (!CrashCatcher::Get()->mRelaunchCmd.IsEmpty())
{
SHELLEXECUTEINFOW shellExecuteInfo = { 0 };
shellExecuteInfo.cbSize = sizeof(SHELLEXECUTEINFOW);
shellExecuteInfo.nShow = SW_SHOWNORMAL;
String cmd = CrashCatcher::Get()->mRelaunchCmd;
String file;
bool nameQuoted = cmd[0] == '\"';
int i;
for (i = (nameQuoted ? 1 : 0); cmd[i] != 0; i++)
{
wchar_t c = cmd[i];
if (((nameQuoted) && (c == '"')) ||
((!nameQuoted) && (c == ' ')))
{
i++;
break;
}
file += cmd[i];
}
const char* useParamsPtr = cmd.c_str();
useParamsPtr += i;
while (*useParamsPtr == L' ')
useParamsPtr++;
auto fileW = UTF8Decode(file);
shellExecuteInfo.lpFile = fileW.c_str();
auto paramsW = UTF8Decode(useParamsPtr);
shellExecuteInfo.lpParameters = paramsW.c_str();
BOOL success = ::ShellExecuteExW(&shellExecuteInfo);
}
CrashCatcher::Get()->mCloseRequested = true;
gExiting = true;
}
else if (hwndCtl == gDebugButtonWindow)
@ -202,6 +242,7 @@ static LRESULT CALLBACK SEHWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
}
break;
case WM_CLOSE:
CrashCatcher::Get()->mCloseRequested = true;
gExiting = true;
return 0;
}
@ -209,7 +250,7 @@ static LRESULT CALLBACK SEHWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
return DefWindowProc(hWnd, uMsg, wParam, lParam);
}
static void ShowErrorDialog(const StringImpl& errorTitle, const StringImpl& errorText)
static void ShowErrorDialog(const StringImpl& errorTitle, const StringImpl& errorText, const StringImpl& relaunchCmd)
{
bool gUseDefaultFonts;
@ -362,8 +403,8 @@ static void ShowErrorDialog(const StringImpl& errorTitle, const StringImpl& erro
aCurX += aButtonWidth + 8;
}
gNoButtonWindow = CreateWindowA("BUTTON", "Close Now",
gNoButtonWindow = CreateWindowA("BUTTON", relaunchCmd.IsEmpty() ? "Close Now" : "Relaunch",
WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON | BS_PUSHBUTTON,
aCurX, aRect.bottom - 24 - 8,
aButtonWidth,
@ -803,9 +844,10 @@ static String GetVersion(const StringImpl& fileName)
static void DoHandleDebugEvent(LPEXCEPTION_POINTERS lpEP)
{
if (CrashCatcher::Get()->mCrashed)
auto crashCatcher = CrashCatcher::Get();
if (crashCatcher->mCrashed)
return;
CrashCatcher::Get()->mCrashed = true;
crashCatcher->mCrashed = true;
HMODULE hMod = GetModuleHandleA(NULL);
@ -983,7 +1025,7 @@ static void DoHandleDebugEvent(LPEXCEPTION_POINTERS lpEP)
::WriteFile(::GetStdHandle(STD_ERROR_HANDLE), aDebugDump.c_str(), (DWORD)aDebugDump.length(), &bytesWritten, NULL);
}
else
ShowErrorDialog(anErrorTitle, aDebugDump);
ShowErrorDialog(anErrorTitle, aDebugDump, crashCatcher->mRelaunchCmd);
}
CrashCatcher::CrashCatcher()
@ -994,6 +1036,7 @@ CrashCatcher::CrashCatcher()
mPreviousFilter = NULL;
mDebugError = false;
mCrashReportKind = BfpCrashReportKind_Default;
mCloseRequested = false;
}
static long __stdcall SEHFilter(LPEXCEPTION_POINTERS lpExceptPtr)
@ -1025,7 +1068,8 @@ static long __stdcall SEHFilter(LPEXCEPTION_POINTERS lpExceptPtr)
::TerminateProcess(GetCurrentProcess(), lpExceptPtr->ExceptionRecord->ExceptionCode);
}
return EXCEPTION_CONTINUE_SEARCH;
//return EXCEPTION_CONTINUE_SEARCH;
return (CrashCatcher::Get()->mCloseRequested) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
}
//PVECTORED_EXCEPTION_HANDLER(
@ -1121,6 +1165,11 @@ void CrashCatcher::SetCrashReportKind(BfpCrashReportKind crashReportKind)
mCrashReportKind = crashReportKind;
}
void CrashCatcher::SetRelaunchCmd(const StringImpl& relaunchCmd)
{
mRelaunchCmd = relaunchCmd;
}
struct CrashCatchMemory
{
public:

3
BeefySysLib/platform/win/CrashCatcher.h
View file

@ -18,7 +18,9 @@ public:
EXCEPTION_POINTERS* mExceptionPointers;
LPTOP_LEVEL_EXCEPTION_FILTER mPreviousFilter;
bool mDebugError;
bool mCloseRequested;
BfpCrashReportKind mCrashReportKind;
String mRelaunchCmd;
public:
CrashCatcher();
@ -30,6 +32,7 @@ public:
virtual void Test();
virtual void Crash(const StringImpl& str);
virtual void SetCrashReportKind(BfpCrashReportKind crashReportKind);
virtual void SetRelaunchCmd(const StringImpl& relaunchCmd);
static CrashCatcher* Get();
};

5
BeefySysLib/platform/win/Platform.cpp
View file

@ -970,6 +970,11 @@ BFP_EXPORT void BFP_CALLTYPE BfpSystem_AddCrashInfo(const char* str)
CrashCatcher::Get()->AddInfo(str);
}
BFP_EXPORT void BFP_CALLTYPE BfpSystem_SetCrashRelaunchCmd(const char* str)
{
CrashCatcher::Get()->SetRelaunchCmd(str);
}
BFP_EXPORT void BFP_CALLTYPE BfpSystem_Shutdown()
{
while (gManagerTail != NULL)

8
IDE/src/IDEApp.bf
View file

@ -2596,6 +2596,14 @@ namespace IDE
mBfResolveCompiler.QueueSetWorkspaceOptions(null, 0);
#endif
String relaunchCmd = scope .();
relaunchCmd.Append("\"");
Environment.GetExecutableFilePath(relaunchCmd);
relaunchCmd.Append("\" -workspace=\"");
relaunchCmd.Append(mWorkspace.mDir);
relaunchCmd.Append("\"");
Platform.BfpSystem_SetCrashRelaunchCmd(relaunchCmd);
MarkDirty();
}