fix(debug): Fix Release debug logging in tools (#1397)

Author: xezon

Core/Tools/ImagePacker/Source/WinMain.cpp

@@ -84,8 +84,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// save application instance
@@ -114,9 +113,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	delete TheImagePacker;
 	TheImagePacker = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	// all done
 	return 0;

Core/Tools/MapCacheBuilder/Source/WinMain.cpp

@@ -212,8 +212,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	try
@@ -325,9 +324,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		DEBUG_CRASH(("Munkee munkee!"));
 	}
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	// all done
 	return 0;

Generals/Code/Tools/GUIEdit/Source/WinMain.cpp

@@ -199,8 +199,7 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	}
 	::SetCurrentDirectory(buffer);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// register a class for our window with the OS
@@ -275,9 +274,7 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	delete TheEditor;
 	TheEditor = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return msg.wParam;
 

Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

@@ -274,13 +274,13 @@ BOOL CWorldBuilderApp::InitInstance()
 	// initialization
   _set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
+	initMemoryManager();
+
 	DEBUG_LOG(("starting Worldbuilder."));
 #ifdef RTS_DEBUG
 	DEBUG_LOG(("RTS_DEBUG defined."));
 #endif
-	initMemoryManager();
 #ifdef MEMORYPOOL_CHECKPOINTING
 	gFirstCP = TheMemoryPoolFactory->debugSetCheckpoint();
 #endif
@@ -644,7 +644,6 @@ int CWorldBuilderApp::ExitInstance()
 	TheMemoryPoolFactory->debugMemoryReport(REPORT_FACTORYINFO | REPORT_CP_LEAKS | REPORT_CP_STACKTRACE, gFirstCP, lastCP);
 #endif
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return CWinApp::ExitInstance();
 }

GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp

@@ -199,8 +199,7 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	}
 	::SetCurrentDirectory(buffer);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// register a class for our window with the OS
@@ -275,9 +274,7 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	delete TheEditor;
 	TheEditor = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return msg.wParam;
 

GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

@@ -280,8 +280,8 @@ BOOL CWorldBuilderApp::InitInstance()
 	// initialization
   _set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
+	initMemoryManager();
 
 #ifdef DEBUG_LOGGING
 	// Turn on console output jba [3/20/2003]
@@ -293,7 +293,6 @@ BOOL CWorldBuilderApp::InitInstance()
 #ifdef RTS_DEBUG
 	DEBUG_LOG(("RTS_DEBUG defined."));
 #endif
-	initMemoryManager();
 #ifdef MEMORYPOOL_CHECKPOINTING
 	gFirstCP = TheMemoryPoolFactory->debugSetCheckpoint();
 #endif
@@ -667,7 +666,6 @@ int CWorldBuilderApp::ExitInstance()
 		TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0);
 	#endif
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return CWinApp::ExitInstance();
 }