Stop initializing the memory manager twice on startup.

Fix the crash when launching a second instance.
Timestamp injected gamepad events so key repeat works.
Ignore gamepad input while the window is unfocused.
Let the window actually resize to the chosen resolution.

Author: mirelle7

Core/GameEngineDevice/Source/SDL3Device/GameClient/SDL3Input.cpp

@@ -931,6 +931,7 @@ void SDL3InputManager::virtualPulseKey(SDL_Scancode scancode, bool down)
 	SDL_Event keyEvent;
 	memset(&keyEvent, 0, sizeof(keyEvent));
 	keyEvent.type = down ? SDL_EVENT_KEY_DOWN : SDL_EVENT_KEY_UP;
+	keyEvent.common.timestamp = SDL_GetTicksNS();
 	keyEvent.key.scancode = scancode;
 	keyEvent.key.down = down;
 
@@ -952,6 +953,7 @@ void SDL3InputManager::virtualPulseMouse(Uint8 button, bool down)
 	SDL_Event clickEvent;
 	memset(&clickEvent, 0, sizeof(clickEvent));
 	clickEvent.type = down ? SDL_EVENT_MOUSE_BUTTON_DOWN : SDL_EVENT_MOUSE_BUTTON_UP;
+	clickEvent.common.timestamp = SDL_GetTicksNS();
 	clickEvent.button.button = button;
 
 	int buttonIdx = (button == SDL_BUTTON_LEFT) ? 0 : ((button == SDL_BUTTON_RIGHT) ? 1 : 2);
@@ -997,6 +999,19 @@ void SDL3InputManager::processGamepadInput()
 	if (!m_gamepad)
 		return;
 
+	if (m_window && !(SDL_GetWindowFlags(m_window) & SDL_WINDOW_INPUT_FOCUS))
+	{
+		m_state = GamepadState();
+		m_lastUpdateTime = 0;
+		m_cursorSpeed = 0.0f;
+		m_edgeAccelTimer = 0.0f;
+		m_cursorRemainderX = 0.0f;
+		m_cursorRemainderY = 0.0f;
+		if (TheLookAtTranslator)
+			TheLookAtTranslator->setControllerInputActive(false);
+		return;
+	}
+
 	const float DEADZONE = DEFAULT_DEADZONE;
 	float rx = SDL_GetGamepadAxis(m_gamepad, SDL_GAMEPAD_AXIS_RIGHTX) / AXIS_MAX;
 	float ry = SDL_GetGamepadAxis(m_gamepad, SDL_GAMEPAD_AXIS_RIGHTY) / AXIS_MAX;
@@ -1110,6 +1125,7 @@ void SDL3InputManager::processGamepadInput()
 			SDL_Event motionEvent;
 			memset(&motionEvent, 0, sizeof(motionEvent));
 			motionEvent.type = SDL_EVENT_MOUSE_MOTION;
+			motionEvent.common.timestamp = SDL_GetTicksNS();
 			motionEvent.motion.xrel = (float)cursorDeltaX;
 			motionEvent.motion.yrel = (float)cursorDeltaY;
 

Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -894,7 +894,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 		// Resize the window to fit this resolution
 		if (!IsWindowed)
 		{
-			::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, 0);
+			::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, SWP_NOSENDCHANGING);
 
 			DEBUG_LOG(("Window resized to w:%d h:%d", width, height));
 		}
@@ -917,7 +917,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 			rectClient.bottom = rectClient.top + ResolutionHeight;
 			MoveRectIntoOtherRect(rectClient, mi.rcMonitor, &left, &top);
 
-			::SetWindowPos (_Hwnd, nullptr, left, top, width, height, SWP_NOZORDER);
+			::SetWindowPos (_Hwnd, nullptr, left, top, width, height, SWP_NOZORDER | SWP_NOSENDCHANGING);
 
 			DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d", left, top, width, height));
 		}

Core/Main/AppMain.cpp

@@ -113,7 +113,6 @@ Bool initAfterWindow()
 		DEBUG_LOG(("Generals is already running...Bail!"));
 		delete TheVersion;
 		TheVersion = nullptr;
-		shutdownMemoryManager();
 		return false;
 	}
 	DEBUG_LOG(("Create Generals Mutex okay."));

Core/Main/SDL3Main.cpp

@@ -131,6 +131,7 @@ int main(int argc, char* argv[])
 			TheSDL3Window = nullptr;
 		}
 		SDL_Quit();
+		AppMain::shutdown();
 		return exitcode;
 	}
 

Generals/Code/Main/WinMain.cpp

@@ -767,9 +767,6 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 
 }
 
-// Necessary to allow memory managers and such to have useful critical sections
-static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
-
 // UnHandledExceptionFilter ===================================================
 /** Handler for unhandled win32 exceptions. */
 //=============================================================================
@@ -799,42 +796,6 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	try {
 
 		SetUnhandledExceptionFilter( UnHandledExceptionFilter );
-		//
-		// there is something about checkin in and out the .dsp and .dsw files
-		// that blows the working directory information away on each of the
-		// developers machines so we're going to hack it for a while and set our
-		// working directory to the directory with the .exe since that's not the
-		// default in a DevStudio project
-		//
-
-		TheAsciiStringCriticalSection = &critSec1;
-		TheUnicodeStringCriticalSection = &critSec2;
-		TheDmaCriticalSection = &critSec3;
-		TheMemoryPoolCriticalSection = &critSec4;
-		TheDebugLogCriticalSection = &critSec5;
-
-		// initialize the memory manager early
-		initMemoryManager();
-
-		/// @todo remove this force set of working directory later
-		Char buffer[ _MAX_PATH ];
-		GetModuleFileName( nullptr, buffer, sizeof( buffer ) );
-		if (Char *pEnd = strrchr(buffer, '\\'))
-		{
-			*pEnd = 0;
-		}
-		::SetCurrentDirectory(buffer);
-
-
-		#ifdef RTS_DEBUG
-			// Turn on Memory heap tracking
-			int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
-			tmpFlag |= (_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
-			tmpFlag &= ~_CRTDBG_CHECK_CRT_DF;
-			_CrtSetDbgFlag( tmpFlag );
-		#endif
-
-
 
 		// install debug callbacks
 	//	WWDebug_Install_Message_Handler(WWDebug_Message_Callback);

GeneralsMD/Code/Main/WinMain.cpp

@@ -773,9 +773,6 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 
 }
 
-// Necessary to allow memory managers and such to have useful critical sections
-static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
-
 // UnHandledExceptionFilter ===================================================
 /** Handler for unhandled win32 exceptions. */
 //=============================================================================
@@ -810,42 +807,6 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	try {
 
 		SetUnhandledExceptionFilter( UnHandledExceptionFilter );
-		//
-		// there is something about checkin in and out the .dsp and .dsw files
-		// that blows the working directory information away on each of the
-		// developers machines so we're going to hack it for a while and set our
-		// working directory to the directory with the .exe since that's not the
-		// default in a DevStudio project
-		//
-
-		TheAsciiStringCriticalSection = &critSec1;
-		TheUnicodeStringCriticalSection = &critSec2;
-		TheDmaCriticalSection = &critSec3;
-		TheMemoryPoolCriticalSection = &critSec4;
-		TheDebugLogCriticalSection = &critSec5;
-
-		// initialize the memory manager early
-		initMemoryManager();
-
-		/// @todo remove this force set of working directory later
-		Char buffer[ _MAX_PATH ];
-		GetModuleFileName( nullptr, buffer, sizeof( buffer ) );
-		if (Char *pEnd = strrchr(buffer, '\\'))
-		{
-			*pEnd = 0;
-		}
-		::SetCurrentDirectory(buffer);
-
-
-		#ifdef RTS_DEBUG
-			// Turn on Memory heap tracking
-			int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
-			tmpFlag |= (_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
-			tmpFlag &= ~_CRTDBG_CHECK_CRT_DF;
-			_CrtSetDbgFlag( tmpFlag );
-		#endif
-
-
 
 		// install debug callbacks
 	//	WWDebug_Install_Message_Handler(WWDebug_Message_Callback);