From 6b664a3ba0e922e89afce0164474a0d287e07643 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 18 Mar 2006 15:51:04 +0000 Subject: [PATCH] (svn r3965) - [win32] Remove mapfile generation and generate a pdb file instead. This and the corresponding executable is enough to trace the source of a crash given by crash.txt by using WinDbg for example. Mapfiles are a bit deprecated in the newer VS environments. - [win32] Show the revision in crash.txt and enable the button to show the crash text in the crash-window - Backport of r3871, r3872 from trunk --- openttd.vcproj | 7 ++----- ottdres.rc | 2 +- win32.c | 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/openttd.vcproj b/openttd.vcproj index 588ba890a7..4420579429 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -23,7 +23,7 @@ Name="VCCLCompilerTool" Optimization="3" GlobalOptimizations="TRUE" - InlineFunctionExpansion="1" + InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="2" OmitFramePointers="TRUE" @@ -58,11 +58,8 @@ OutputFile=".\Release/openttd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Release/openttd.pdb" - GenerateMapFile="TRUE" - MapFileName=".\Release/openttd.map" - MapExports="TRUE" - MapLines="TRUE" SubSystem="2" OptimizeReferences="2" OptimizeForWindows98="1" diff --git a/ottdres.rc b/ottdres.rc index d9f1f12835..eec4a5943a 100644 --- a/ottdres.rc +++ b/ottdres.rc @@ -46,7 +46,7 @@ BEGIN PUSHBUTTON "&Close",12,7,49,50,14 PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED PUSHBUTTON "&Emergency save",13,155,49,68,14 - PUSHBUTTON "",15,243,49,55,14,WS_DISABLED + PUSHBUTTON "",15,243,49,55,14 EDITTEXT 11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP LTEXT "",10,36,7,262,34 diff --git a/win32.c b/win32.c index 05218884f3..2ef0f5fa08 100644 --- a/win32.c +++ b/win32.c @@ -427,6 +427,7 @@ extern bool CloseConsoleLogIfActive(void); static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep) { + extern const char _openttd_revision[]; char *output; static bool had_exception; @@ -451,7 +452,7 @@ static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep) time.wHour, time.wMinute, time.wSecond, - "???" + _openttd_revision ); }