unify(debug): Merge GameEngine's Debug code (#1384)

Generals inherits the following changes:

1. The ignore button is now default selected on assert dialogs (simply press ENTER to skip)
2. Debug now works in Generals World Builder
3. The fullscreen game will now hide on release crash
4. The German serious error message is removed

Author: xezon

Generals/Code/GameEngine/Include/Common/Debug.h

@@ -50,15 +50,21 @@
 
 class AsciiString;
 
+#define NO_RELEASE_DEBUG_LOGGING
+
+#ifdef RELEASE_DEBUG_LOGGING  ///< Creates a DebugLogFile.txt (No I or D) with all the debug log goodness.  Good for startup problems.
+	#define ALLOW_DEBUG_UTILS 1
+	#define DEBUG_LOGGING 1
+	#define DISABLE_DEBUG_CRASHING 1
+	#define DISABLE_DEBUG_STACKTRACE 1
+	#define DISABLE_DEBUG_PROFILE 1
+#endif
+
 // These are stolen from the WW3D Debug file. REALLY useful. :-)
 #define STRING_IT(a) #a																				  
 #define TOKEN_IT(a) STRING_IT(,##a)
 #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
 
-// BGC, 3/26/03 - put this in so we can build internal worldbuilder for a patch that doesn't
-// have any debugging of any kind.
-//#define DISABLE_DEBUG_LOGGING
-
 // by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
 #if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
 	#define ALLOW_DEBUG_UTILS 1

Generals/Code/GameEngine/Source/Common/System/Debug.cpp

@@ -54,21 +54,22 @@
 // deterministic or the same on all peers in multiplayer games.
 //#define INCLUDE_DEBUG_LOG_IN_CRC_LOG
 
-#include "Common/CommandLine.h"
 #define DEBUG_THREADSAFE
 #ifdef DEBUG_THREADSAFE
 #include "Common/CriticalSection.h"
 #endif
+#include "Common/CommandLine.h"
 #include "Common/Debug.h"
 #include "Common/CRCDebug.h"
-#include "Common/Registry.h"
 #include "Common/SystemInfo.h"
 #include "Common/UnicodeString.h"
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameText.h"
 #include "GameClient/Keyboard.h"
 #include "GameClient/Mouse.h"
-#include "Common/StackDump.h"
+#if defined(DEBUG_STACKTRACE) || defined(IG_DEBUG_STACKTRACE)
+	#include "Common/StackDump.h"
+#endif
 
 // Horrible reference, but we really, really need to know if we are windowed.
 extern bool DX8Wrapper_IsWindowed;
@@ -271,8 +272,8 @@ static int doCrashBox(const char *buffer, Bool logResult)
 	int result;
 
 	if (!ignoringAsserts()) {
-		//result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING|MB_DEFBUTTON3);
-		result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING);
+		result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING|MB_DEFBUTTON3);
+		//result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING);
 	}	else {
 		result = IDIGNORE;
 	}
@@ -358,7 +359,7 @@ void DebugInit(int flags)
 //		::MessageBox(NULL, "Debug already inited", "", MB_OK|MB_APPLMODAL);
 
 	// just quietly allow multiple calls to this, so that static ctors can call it.
-	if (theDebugFlags == 0 && strcmp(gAppPrefix, "wb_") != 0) 
+	if (theDebugFlags == 0) 
 	{
 		theDebugFlags = flags;
 
@@ -722,6 +723,11 @@ void ReleaseCrash(const char *reason)
 {
 	/// do additional reporting on the crash, if possible
 
+	if (!DX8Wrapper_IsWindowed) {
+		if (ApplicationHWnd) {
+			ShowWindow(ApplicationHWnd, SW_HIDE);
+		}
+	}
 
 	char prevbuf[ _MAX_PATH ];
 	char curbuf[ _MAX_PATH ];
@@ -767,15 +773,13 @@ void ReleaseCrash(const char *reason)
 #else
 // crash error messaged changed 3/6/03 BGC
 //	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
+//	::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
+
+// crash error message changed again 8/22/03 M Lorenzen... made this message box modal to the system so it will appear on top of any task-modal windows, splash-screen, etc.
+  ::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", 
+   "Technical Difficulties...", 
+   MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
 
-	if (!GetRegistryLanguage().compareNoCase("german2") || !GetRegistryLanguage().compareNoCase("german") )
-	{
-		::MessageBox(NULL, "Es ist ein gravierender Fehler aufgetreten. Solche Fehler k\366nnen durch viele verschiedene Dinge wie Viren, \374berhitzte Hardware und Hardware, die den Mindestanforderungen des Spiels nicht entspricht, ausgel\366st werden. Tipps zur Vorgehensweise findest du in den Foren unter www.generals.ea.com, Informationen zum Technischen Kundendienst im Handbuch zum Spiel.", "Fehler...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	} 
-	else
-	{
-		::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	}
 
 #endif
 

GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp

@@ -524,7 +524,7 @@ void DebugCrash(const char *format, ...)
 	if (useLogging)
 	{
 #ifdef DEBUG_LOGGING
-		if (ignoringAsserts()) 
+		if (ignoringAsserts())
 		{
 			doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");
 		}
@@ -728,13 +728,6 @@ void ReleaseCrash(const char *reason)
 			ShowWindow(ApplicationHWnd, SW_HIDE);
 		}
 	}
-//#if defined(RTS_DEBUG)
-//	/* static */ char buff[8192]; // not so static so we can be threadsafe
-//	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);/
-//	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-//#else
-//	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-//#endif
 
 	char prevbuf[ _MAX_PATH ];
 	char curbuf[ _MAX_PATH ];
@@ -772,6 +765,7 @@ void ReleaseCrash(const char *reason)
 			ShowWindow(ApplicationHWnd, SW_HIDE);
 		}
 	}
+
 #if defined(RTS_DEBUG)
 	/* static */ char buff[8192]; // not so static so we can be threadsafe
 	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);