Rework initialization to fix loading bitmaps from static map crash

Author: MaximDude

Editor/GUIEditorApp.cpp

@@ -11,29 +11,23 @@
 
 #include "RTEError.h"
 
+#include "TimerMan.h"
+
+using namespace std;
+
 namespace RTE {
 
 volatile bool g_Quit;
 AllegroScreen *g_Screen;
 AllegroInput *g_Input;
-GUIEditorApp g_GUIEditor;
 
 #define ROOTORIGINX 300
 #define ROOTORIGINY 120
 
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	/// <summary>
-	/// Quit Handler for Allegro.
-	/// </summary>
-	void QuitHandler(void) { g_GUIEditor.OnQuitButton(); }
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-bool GUIEditorApp::Initialize(void) {
-	allegro_init();
-    install_keyboard();
+bool GUIEditorApp::Initialize() {
+	install_keyboard();
 
     int ResW = 1024;
     int ResH = 768;
@@ -45,17 +39,10 @@ bool GUIEditorApp::Initialize(void) {
 
     set_color_depth(BPP);
     set_gfx_mode(GFX_AUTODETECT_WINDOWED, ResW, ResH, 0, 0);
-    set_close_button_callback(QuitHandler);
     set_window_title("Cortex Command: GUI Editor");
 
     set_color_conversion(COLORCONV_MOST);
 
-    // Just going to discard the bitmap, we're only interested in the palette
-    BITMAP *tempBitmap;
-    PALETTE newPalette;
-    //if (!(tempBitmap = load_bitmap("Palette.bmp", NULL)))// newPalette)))
-      //  RTEAbort("Failed to load palette from bitmap with following path:\n\nBase.rte/palette.bmp");
-
     PALETTE ccpal;
     get_palette(ccpal);
     create_trans_table(&m_LessTransTable, ccpal, 192, 192, 192, 0);
@@ -69,8 +56,10 @@ bool GUIEditorApp::Initialize(void) {
     g_Screen = new AllegroScreen(m_pBackBuffer32);
     g_Input = new AllegroInput(-1);
 
+	PALETTE newPalette;
+
     // Set the current palette
-    set_palette(newPalette);
+    //set_palette(newPalette);
 
     // Update what black is now with the loaded palette
     m_BlackColor = bestfit_color(newPalette, 0, 0, 0);
@@ -329,7 +318,6 @@ bool GUIEditorApp::Update(void)
 
     m_pEditorManager->DrawMouse();
 
-
     blit(m_pBackBuffer32, screen, 0, 0, 0, 0, m_pBackBuffer32->w, m_pBackBuffer32->h);
 
     return !g_Quit;

Editor/GUIEditorApp.h

@@ -8,12 +8,16 @@
 #include "GUIPropertyPage.h"
 #include "GUIListBox.h"
 
+#include "Singleton.h"
+
+#define g_GUIEditor GUIEditorApp::Instance()
+
 namespace RTE {
 
 	/// <summary>
 	/// GUI Editor Application class that handles the main editor app.
 	/// </summary>
-	class GUIEditorApp {
+	class GUIEditorApp : public Singleton<GUIEditorApp> {
 
 	public:
 
@@ -40,7 +44,7 @@ namespace RTE {
 		/// <summary>
 		/// Destructor method used to clean up a GUIEditorApp object.
 		/// </summary>
-		~GUIEditorApp() {}
+		~GUIEditorApp() = default;
 
 		/// <summary>
 		/// Initializes the editor app.
@@ -178,7 +182,10 @@ namespace RTE {
 		bool m_bDirty;
 		bool m_bSnapGrid;
 		int	m_nGridSize;
+
+		// Disallow the use of some implicit methods.
+		GUIEditorApp(const GUIEditorApp &reference) = delete;
+		GUIEditorApp &operator=(const GUIEditorApp &rhs) = delete;
 	};
-	extern GUIEditorApp g_GUIEditor;
 }
 #endif

GUIEditor.vcxproj

@@ -75,19 +75,20 @@
       </DisableSpecificWarnings>
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <OmitFramePointers>false</OmitFramePointers>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;legacy_stdio_definitions.lib;allegro_static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)_Bin;$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;ws2_32.lib;legacy_stdio_definitions.lib;allegro_static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <AdditionalOptions>/ignore:4099 /ignore:4217 /ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Manifest>
       <OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
@@ -100,7 +101,8 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
       <ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
@@ -112,18 +114,23 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;allegro_static_release.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;ws2_32.lib;legacy_stdio_definitions.lib;allegro_static_release.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)_Bin;$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <AdditionalOptions>/ignore:4099 /ignore:4217 /ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+      <LargeAddressAware>true</LargeAddressAware>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <FixedBaseAddress>false</FixedBaseAddress>
     </Link>
     <Manifest>
       <OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
@@ -161,6 +168,7 @@
     <ClCompile Include="GUI\GUITextBox.cpp" />
     <ClCompile Include="GUI\GUITextPanel.cpp" />
     <ClCompile Include="GUI\GUIUtil.cpp" />
+    <ClCompile Include="GUI\WinUtil.cpp" />
     <ClCompile Include="GUI\Wrappers\AllegroBitmap.cpp" />
     <ClCompile Include="GUI\Wrappers\AllegroInput.cpp" />
     <ClCompile Include="GUI\Wrappers\AllegroScreen.cpp" />
@@ -213,6 +221,7 @@
     <ClInclude Include="GUI\GUITextBox.h" />
     <ClInclude Include="GUI\GUITextPanel.h" />
     <ClInclude Include="GUI\GUIUtil.h" />
+    <ClInclude Include="GUI\WinUtil.h" />
     <ClInclude Include="GUI\Wrappers\AllegroBitmap.h" />
     <ClInclude Include="GUI\Wrappers\AllegroInput.h" />
     <ClInclude Include="GUI\Wrappers\AllegroScreen.h" />
@@ -223,6 +232,7 @@
     <ClInclude Include="System\Reader.h" />
     <ClInclude Include="System\RTEError.h" />
     <ClInclude Include="System\Serializable.h" />
+    <ClInclude Include="System\Singleton.h" />
     <ClInclude Include="System\StandardIncludes.h" />
     <ClInclude Include="System\Timer.h" />
     <ClInclude Include="System\TimerMan.h" />

GUIEditor.vcxproj.filters

@@ -147,6 +147,9 @@
     <ClCompile Include="GUI\GUI.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
+    <ClCompile Include="GUI\WinUtil.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Resources\resource.h">
@@ -287,6 +290,12 @@
     <ClInclude Include="System\Constants.h">
       <Filter>System</Filter>
     </ClInclude>
+    <ClInclude Include="GUI\WinUtil.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="System\Singleton.h">
+      <Filter>System</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resources\Resource.rc">

Main.cpp

@@ -1,27 +1,50 @@
 #include "GUIEditorApp.h"
 #include "GUIEditorLib.h"
+#include "ContentFile.h"
+#include "TimerMan.h"
 
 using namespace RTE;
 
 extern "C" { FILE __iob_func[3] = { *stdin, *stdout, *stderr }; }
-//extern HINSTANCE g_hInstance = 0;
-//extern HWND g_hWnd = 0;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/// <summary>
+/// Quit Handler for Allegro.
+/// </summary>
+void QuitHandler(void) { g_GUIEditor.OnQuitButton(); }
+END_OF_FUNCTION(QuitHandler)
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// <summary>
-/// Entry point for the GUI Library editor.
+/// Entry point for the GUI editor app.
 /// </summary>
 int main(int argc, char *argv[]) {
-	//if (!g_GUIEditor.Initialize()) { return -1; }
+	allegro_init();
 
-	// Get windows settings
-	//g_hWnd = win_get_window();
-	//g_hInstance = (HINSTANCE)GetWindowLong(g_hWnd, GWL_HINSTANCE);
+	// Enable the exit button on the window
+	LOCK_FUNCTION(QuitHandler);
+	set_close_button_callback(QuitHandler);
+
+	new TimerMan();
+	g_TimerMan.Create();
+
+	new GUIEditorApp();
+	if (!g_GUIEditor.Initialize()) {
+		std::exit(EXIT_FAILURE);
+	}
 
-	// Run editor loop
 	while (true) {
-		bool bContinue = g_GUIEditor.Update();
-		if (!bContinue) { break; }
+		if (!g_GUIEditor.Update()) {
+			break;
+		}
 	}
+
+	g_TimerMan.Destroy();
+	ContentFile::FreeAllLoaded();
+
+	std::exit(EXIT_SUCCESS);
 	return 0;
 }
 

System/ContentFile.cpp

@@ -36,17 +36,13 @@ namespace RTE {
 		}
 		BITMAP *returnBitmap = nullptr;
 
-		/* Iterator crashes for god knows what reason
 		std::unordered_map<std::string, BITMAP *>::iterator foundBitmap = m_LoadedBitmaps.find(m_DataPath);
 		if (foundBitmap != m_LoadedBitmaps.end()) {
 			returnBitmap = (*foundBitmap).second;
 		} else {
 			returnBitmap = LoadAndReleaseBitmap(conversionMode);
 			m_LoadedBitmaps.insert({ m_DataPath, returnBitmap });
 		}
-		*/
-
-		returnBitmap = LoadAndReleaseBitmap(conversionMode);
 
 		return returnBitmap;
 	}

System/Reader.cpp

@@ -1,7 +1,5 @@
 #include "Reader.h"
-#include "RTETools.h"
-#include "PresetMan.h"
-#include "SettingsMan.h"
+#include "RTEError.h"
 
 namespace RTE {
 
@@ -45,7 +43,7 @@ namespace RTE {
 		if (firstSlashPos == std::string::npos) { firstSlashPos = m_FilePath.find_first_of('\\'); }
 
 		m_DataModuleName = m_FilePath.substr(0, firstSlashPos);
-		m_DataModuleID = g_PresetMan.GetModuleID(m_DataModuleName);
+		//m_DataModuleID = g_PresetMan.GetModuleID(m_DataModuleName);
 
 		m_Stream = new std::ifstream(fileName);
 		if (!failOK) { RTEAssert(m_Stream->good(), "Failed to open data file \'" + std::string(fileName) + "\'!"); }
@@ -77,7 +75,7 @@ namespace RTE {
 
 	int Reader::GetReadModuleID() const {
 		// If we have an invalid ID, try to get a valid one based on the name we do have
-		return (m_DataModuleID < 0) ? g_PresetMan.GetModuleID(m_DataModuleName) : m_DataModuleID;
+		return 0;//(m_DataModuleID < 0) ? g_PresetMan.GetModuleID(m_DataModuleName) : m_DataModuleID;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -258,7 +256,7 @@ namespace RTE {
 				if (peek == '\n') {
 					m_CurrentLine++;
 					// Only report every few lines
-					if (m_ReportProgress && (m_CurrentLine % g_SettingsMan.LoadingScreenReportPrecision() == 0)) {
+					if (m_ReportProgress && (m_CurrentLine % 100 == 0)) {
 						std::snprintf(report, sizeof(report), "%s%s reading line %i", m_ReportTabs.c_str(), m_FileName.c_str(), m_CurrentLine);
 						m_ReportProgress(std::string(report), false);
 					}