BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Memorydump stage 1 fix

Browse Source
This commit is contained in:
verysecrethero
2016-03-03 16:07:35 +01:00
parent 05bbecc452
commit cc34f53b16
1 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/main.cpp
+13 -37
View File
@@ -1,41 +1,22 @@
#include "Game.h" #include "Game.h"
#include "MiniDump.h" #include "MiniDump.h"
LONG WINAPI CrashHandler(EXCEPTION_POINTERS* pException); LONG WINAPI CrashHandler(LPEXCEPTION_POINTERS pException);
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
//::SetUnhandledExceptionFilter(CrashHandler); SetUnhandledExceptionFilter(CrashHandler);
//EXCEPTION_POINTERS* pException = new EXCEPTION_POINTERS(); //run the .exe file to get a possible crashdump
//pException->ContextRecord = new _CONTEXT();
//pException->ExceptionRecord = new EXCEPTION_RECORD();
//CrashHandler(pException);
//return 0;
__try {
int* ii = nullptr;
*ii = 17;
//int x = asd[4];
//std::cout << "crash before we get here, don't optimize x. " << x;
//throw std::exception();
} __except (CrashHandler(GetExceptionInformation())) {
system("pause");
return 0;
}
system("pause");
/*
Game game(argc, argv); Game game(argc, argv);
while (game.Running()) { while (game.Running()) {
game.Tick(); game.Tick();
} }
*/
return 0; return 0;
} }
LONG WINAPI CrashHandler(EXCEPTION_POINTERS* pException) LONG WINAPI CrashHandler(LPEXCEPTION_POINTERS pException)
{ {
// Get absolute path of current process: C:/ ... /name.exe // Get absolute path of current process: C:/ ... /name.exe
CHAR Dump_Path[MAX_PATH]; CHAR Dump_Path[MAX_PATH];
@@ -46,22 +27,17 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS* pException)
path = path.substr(0, path.length() - 4); path = path.substr(0, path.length() - 4);
path += "Dump.exe"; path += "Dump.exe";
DWORD procId = GetCurrentProcessId(); wchar_t commandLine[32768];
DWORD threadId = GetCurrentThreadId(); swprintf_s(commandLine, sizeof(commandLine) / sizeof(commandLine[0]), L"\"%ls\" %lu %lu %p", path.c_str(), GetCurrentProcessId(), GetCurrentThreadId(), pException);
std::uintptr_t intExcPtr = reinterpret_cast<std::uintptr_t>(pException);
std::ostringstream ss;
ss << procId << " " << threadId << " " << intExcPtr;
char cmds[128];
strcpy(cmds, ss.str().c_str());
STARTUPINFO sInfo; STARTUPINFOW sInfo;
PROCESS_INFORMATION pInfo; PROCESS_INFORMATION pInfo;
ZeroMemory(&sInfo, sizeof(sInfo)); ZeroMemory(&sInfo, sizeof(sInfo));
ZeroMemory(&pInfo, sizeof(pInfo)); ZeroMemory(&pInfo, sizeof(pInfo));
sInfo.cb = sizeof(sInfo); sInfo.cb = sizeof(sInfo);
if (CreateProcess(path.c_str(), if (CreateProcessW(L"TacticalZDump.exe",
cmds, commandLine,
nullptr, nullptr,
nullptr, nullptr,
FALSE, FALSE,
@@ -69,8 +45,7 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS* pException)
nullptr, nullptr,
nullptr, nullptr,
&sInfo, &sInfo,
&pInfo) &pInfo)) {
) {
WaitForSingleObject(pInfo.hProcess, INFINITE); WaitForSingleObject(pInfo.hProcess, INFINITE);
CloseHandle(pInfo.hProcess); CloseHandle(pInfo.hProcess);
CloseHandle(pInfo.hThread); CloseHandle(pInfo.hThread);
@@ -83,4 +58,5 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS* pException)
} }
return EXCEPTION_EXECUTE_HANDLER;// EXCEPTION_CONTINUE_SEARCH return EXCEPTION_EXECUTE_HANDLER;// EXCEPTION_CONTINUE_SEARCH
} }