mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-enable crash dumping

This commit is contained in:
Ted John 2016-08-28 17:17:20 +01:00
parent 7b1c018f53
commit 12ef20ef31
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openrct2.proj
View File

@ -31,6 +31,7 @@
<OPENRCT2_DEFINES Condition="'$(GIT_BRANCH)'!=''">OPENRCT2_BRANCH="$(GIT_BRANCH)";$(OPENRCT2_DEFINES)</OPENRCT2_DEFINES>
<OPENRCT2_DEFINES Condition="'$(GIT_COMMIT_SHA1)'!=''">OPENRCT2_COMMIT_SHA1="$(GIT_COMMIT_SHA1)";$(OPENRCT2_DEFINES)</OPENRCT2_DEFINES>
<OPENRCT2_DEFINES Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">OPENRCT2_COMMIT_SHA1_SHORT="$(GIT_COMMIT_SHA1_SHORT)";$(OPENRCT2_DEFINES)</OPENRCT2_DEFINES>
<OPENRCT2_DEFINES Condition="'$(Configuration)'=='Release'">USE_BREAKPAD;$(OPENRCT2_DEFINES)</OPENRCT2_DEFINES>
<RootDir>$(MsBuildThisFileDirectory)</RootDir>
<DistDir>$(RootDir)distribution\</DistDir>

12
src/platform/crash.cpp
View File

@ -41,6 +41,12 @@ extern "C" {
#define WSZ(x) L"" x
#ifdef OPENRCT2_COMMIT_SHA1_SHORT
const wchar_t *_wszCommitSha1Short = WSZ(OPENRCT2_COMMIT_SHA1_SHORT);
#else
const wchar_t *_wszCommitSha1Short = WSZ("");
#endif
static bool OnCrash(const wchar_t * dumpPath,
const wchar_t * miniDumpId,
void * context,
@ -67,7 +73,7 @@ static bool OnCrash(const wchar_t * dumpPath,
// Try to rename the files
wchar_t dumpFilePathNew[MAX_PATH];
wsprintfW(dumpFilePathNew, L"%s%s(%s).dmp", dumpPath, miniDumpId, WSZ(OPENRCT2_COMMIT_SHA1_SHORT));
wsprintfW(dumpFilePathNew, L"%s%s(%s).dmp", dumpPath, miniDumpId, _wszCommitSha1Short);
if (_wrename(dumpFilePath, dumpFilePathNew) == 0)
{
std::wcscpy(dumpFilePath, dumpFilePathNew);
@ -78,7 +84,7 @@ static bool OnCrash(const wchar_t * dumpPath,
wprintf(L"Dump File Path: %s\n", dumpFilePath);
wprintf(L"Dump Id: %s\n", miniDumpId);
wprintf(L"Version: %s\n", WSZ(OPENRCT2_VERSION));
wprintf(L"Commit: %s\n", WSZ(OPENRCT2_COMMIT_SHA1_SHORT));
wprintf(L"Commit: %s\n", _wszCommitSha1Short);
utf8 * saveFilePathUTF8 = widechar_to_utf8(saveFilePath);
SDL_RWops * rw = SDL_RWFromFile(saveFilePathUTF8, "wb+");
@ -101,7 +107,7 @@ static bool OnCrash(const wchar_t * dumpPath,
MessageFormat,
dumpFilePath,
WSZ(OPENRCT2_VERSION),
WSZ(OPENRCT2_COMMIT_SHA1_SHORT));
_wszCommitSha1Short);
// Cannot use platform_show_messagebox here, it tries to set parent window already dead.
MessageBoxW(NULL, message, WSZ(OPENRCT2_NAME), MB_OK | MB_ICONERROR);