gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17410) -Codechange: use the same define for determining whether windows does crash reports instead of using several that aren't necessarily equal

Browse Source
This commit is contained in:
rubidium 2009-09-03 22:32:08 +00:00
parent b92143b53e
commit c9a1f33418
3 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/os/windows/crashlog_win.cpp
View File

@ -9,11 +9,21 @@
/** @file crashlog_win.cpp Implementation of a crashlogger for Windows */
#include "../../stdafx.h"
#include <windows.h>
#include "win32.h"
#if defined(WIN32_EXCEPTION_TRACKER)
#include "../../stdafx.h"
#include "win32.h"
#include "../../core/alloc_func.hpp"
#include "../../string_func.h"
#include "../../gamelog.h"
#include "../../saveload/saveload.h"
#include "../../fileio_func.h"
#include "../../rev.h"
#include "../../strings_func.h"
#include <windows.h>
#include <dbghelp.h>
#ifdef _MSC_VER
static const char *_exception_string = NULL;
void SetExceptionString(const char *s, ...)
{
@ -26,18 +36,6 @@ void SetExceptionString(const char *s, ...)
_exception_string = strdup(buf);
}
#endif
#if defined(_MSC_VER) && !defined(WINCE)
#include "../../core/alloc_func.hpp"
#include "../../string_func.h"
#include "../../gamelog.h"
#include "../../saveload/saveload.h"
#include "../../fileio_func.h"
#include "../../rev.h"
#include <dbghelp.h>
#include "../../strings_func.h"
static void *_safe_esp;
static char *_crash_msg;
@ -497,4 +495,4 @@ void Win32InitializeExceptions()
SetUnhandledExceptionFilter(ExceptionHandler);
}
#endif /* _MSC_VER */
#endif /* WIN32_EXCEPTION_TRACKER */

17
src/os/windows/win32.cpp
View File

@ -73,8 +73,8 @@ void ShowOSErrorBox(const char *buf, bool system)
MyShowCursor(true);
MessageBox(GetActiveWindow(), MB_TO_WIDE(buf), _T("Error!"), MB_ICONSTOP);
/* if exception tracker is enabled, we crash here to let the exception handler handle it. */
#if defined(WIN32_EXCEPTION_TRACKER) && !defined(_DEBUG)
/* If exception tracker is enabled, we crash here to let the exception handler handle it. */
#if defined(WIN32_EXCEPTION_TRACKER) && defined(NDEBUG)
if (system) {
SetExceptionString("%s", buf);
*(byte*)0 = 0;
@ -383,20 +383,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
argc = ParseCommandLine(cmdline, argv, lengthof(argv));
#if defined(WIN32_EXCEPTION_TRACKER)
extern void Win32InitializeExceptions();
void Win32InitializeExceptions();
Win32InitializeExceptions();
#endif
#if defined(WIN32_EXCEPTION_TRACKER_DEBUG)
_try {
LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep);
#endif
ttd_main(argc, argv);
#if defined(WIN32_EXCEPTION_TRACKER_DEBUG)
} _except (ExceptionHandler(_exception_info())) {}
#endif
ttd_main(argc, argv);
return 0;
}

10
src/stdafx.h
View File

@ -229,11 +229,13 @@
#define strncasecmp strnicmp
#endif
void SetExceptionString(const char *s, ...) WARN_FORMAT(1, 2);
#if defined(NDEBUG) && defined(WITH_ASSERT)
#undef assert
#define assert(expression) if (!(expression)) { SetExceptionString("Assertion failed at %s:%d: %s", __FILE__, __LINE__, #expression); *(byte*)0 = 0; }
#if defined(WIN32_EXCEPTION_TRACKER)
void SetExceptionString(const char *s, ...) WARN_FORMAT(1, 2);
#if defined(NDEBUG) && defined(WITH_ASSERT)
#undef assert
#define assert(expression) if (!(expression)) { SetExceptionString("Assertion failed at %s:%d: %s", __FILE__, __LINE__, #expression); *(byte*)0 = 0; }
#endif
#endif
/* MSVC doesn't have these :( */