fix: improve stability, memory safety, and macOS compatibility across audio, rendering, and logic systems

Author: Okladnoj

.gitignore

@@ -65,6 +65,7 @@ build.ninja
 
 ## Python
 __pycache__/
+*.py
 
 CRCLogs/
 

Core/GameEngine/Include/Common/Debug.h

@@ -281,13 +281,13 @@ class SimpleProfiler
 	#define DEBUG_CRASH_MAC(m) ((void)0)
 #endif
 
-// #define DEBUG_BUILDMAPCACHE_FLAG
-// #define DEBUG_INFO_MAC_FLAG
-// #define DEBUG_FILESYSTEM_MAC_FLAG
-// #define DEBUG_RENDER_CORE_MAC_FLAG
-// #define DEBUG_NETWORK_MAC_FLAG
-// #define DEBUG_AUTH_MAC_FLAG
-// #define DEBUG_EAC_MAC_FLAG
+#define DEBUG_BUILDMAPCACHE_FLAG
+#define DEBUG_INFO_MAC_FLAG
+#define DEBUG_FILESYSTEM_MAC_FLAG
+#define DEBUG_RENDER_CORE_MAC_FLAG
+#define DEBUG_NETWORK_MAC_FLAG
+#define DEBUG_AUTH_MAC_FLAG
+#define DEBUG_EAC_MAC_FLAG
 
 #ifdef DEBUG_BUILDMAPCACHE_FLAG
 	#define DEBUG_BUILDMAPCACHE(m) MAC_LOG_TAG("DEBUG_BUILDMAPCACHE", m)

Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp

@@ -257,6 +257,23 @@ Bool FFmpegFile::decodePacket()
 		}
 
 		// Validate the frame before passing to callback
+#ifdef __APPLE__
+		if (stream.frame == nullptr || stream.frame->data[0] == nullptr) {
+			continue;
+		}
+
+		if (stream.stream_type == AVMEDIA_TYPE_VIDEO && (stream.frame->width <= 0 || stream.frame->height <= 0)) {
+			continue;
+		}
+
+		if (stream.stream_type == AVMEDIA_TYPE_AUDIO && stream.frame->nb_samples <= 0) {
+			continue;
+		}
+
+		if (m_frameCallback != nullptr) {
+			m_frameCallback(stream.frame, stream_idx, stream.stream_type, m_userData);
+		}
+#else
 		if (stream.frame != nullptr && stream.frame->data[0] != nullptr && 
 			stream.frame->width > 0 && stream.frame->height > 0) {
 			if (m_frameCallback != nullptr) {
@@ -265,6 +282,7 @@ Bool FFmpegFile::decodePacket()
 		} else {
 			DEBUG_LOG(("Decoded frame has invalid data or dimensions"));
 		}
+#endif
 	}
 
 	return true;

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

@@ -149,9 +149,9 @@ WWINLINE void DX8_ErrorCode(unsigned res)
 }
 
 #ifdef __APPLE__
-#define DX8CALL_HRES(x,res) res = DX8Wrapper::_Get_D3D_Device8()->x; number_of_DX8_calls++;
-#define DX8CALL(x) DX8Wrapper::_Get_D3D_Device8()->x; number_of_DX8_calls++;
-#define DX8CALL_D3D(x) number_of_DX8_calls++;
+#define DX8CALL_HRES(x,res) res = DX8Wrapper::_Get_D3D_Device8()->x; DX8Wrapper::Increment_DX8_CallCount();
+#define DX8CALL(x) DX8Wrapper::_Get_D3D_Device8()->x; DX8Wrapper::Increment_DX8_CallCount();
+#define DX8CALL_D3D(x) DX8Wrapper::_Get_D3D8()->x; DX8Wrapper::Increment_DX8_CallCount();
 #define DX8_THREAD_ASSERT() ;
 #else // !__APPLE__
 #ifdef WWDEBUG

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

@@ -1258,7 +1258,7 @@ FontCharsClass::Get_Char_Data (WCHAR ch)
 	const FontCharsClassCharDataStruct *retval = nullptr;
 
 #ifdef __APPLE__
-	if ( ch >= 0xFFFD || (ch >= 256 && AlternateUnicodeFont == nullptr && this == AlternateUnicodeFont) )
+	if ( ch >= 0xFFFD )
 	{
 		ch = L'?';
 	}
@@ -1397,6 +1397,19 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 		xOrigin = 1;
 	}
 
+	if (GDIBitmapBits == nullptr || MemDC == nullptr) {
+		FontCharsClassCharDataStruct *char_data = W3DNEW FontCharsClassCharDataStruct;
+		char_data->Value = ch;
+		char_data->Width = 0;
+		char_data->Buffer = nullptr;
+		if ( ch < 256 ) {
+			ASCIICharArray[ch] = char_data;
+		} else {
+			UnicodeCharArray[ch - FirstUnicodeChar] = char_data;
+		}
+		return char_data;
+	}
+
     CGContextRef context = (CGContextRef)MemDC;
     CTFontRef ctFont = (CTFontRef)GDIFont;
 
@@ -1447,7 +1460,10 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 		int index = (row * stride);
 
 		for (int col = 0; col < char_size.cx; col ++) {
-			uint8 pixel_value = GDIBitmapBits[index];
+			uint8 pixel_value = 0;
+			if (GDIBitmapBits != nullptr && row < height && col < width && index < stride * height) {
+				pixel_value = GDIBitmapBits[index];
+			}
 			index += 1;
 
 			uint32 pixel_color = (pixel_value != 0) ? 0x00FFFFFF : 0;
@@ -1566,7 +1582,7 @@ FontCharsClass::Update_Current_Buffer (int char_width)
 		//	Would we extend past this buffer?
 		//
 #ifdef __APPLE__
-		int pixels_needed = char_width * CharHeight * 2;
+		int pixels_needed = (char_width + PixelOverlap) * CharHeight * 2;
 #else
 		int pixels_needed = char_width * CharHeight;
 #endif
@@ -1637,13 +1653,27 @@ FontCharsClass::Create_GDI_Font (const char *font_name)
 	CGContextRef context = CGBitmapContextCreate(NULL, width, height, 8, width, colorSpace, kCGImageAlphaNone);
 	CGColorSpaceRelease(colorSpace);
 
+	if (!context) {
+		CFRelease(ctFont);
+		GDIFont = nullptr;
+		return false;
+	}
+	
 	CGContextSetShouldSmoothFonts(context, false);
 	CGContextSetAllowsFontSmoothing(context, false);
 
 	MemDC = (HDC)context;
 	GDIBitmapBits = (uint8*)CGBitmapContextGetData(context);
 	GDIBitmapStride = CGBitmapContextGetBytesPerRow(context);
 
+	if (!GDIBitmapBits) {
+		CGContextRelease(context);
+		MemDC = nullptr;
+		CFRelease(ctFont);
+		GDIFont = nullptr;
+		return false;
+	}
+
     // Generals font uses compressed width on Windows
     CGAffineTransform matrix = CGAffineTransformIdentity;
     if (doingGenerals) {

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp

@@ -259,7 +259,11 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y)
 {
 	DEBUG_ASSERTCRASH( m_pSrcTexture != nullptr, ("Reading empty shroud"));
 
+#ifdef __APPLE__
+	if (x >= 0 && x < m_numCellsX && y >= 0 && y < m_numCellsY)
+#else
 	if (x < m_numCellsX && y < m_numCellsY)
+#endif
 	{
 		UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch);
 
@@ -283,7 +287,11 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 	if (!m_pSrcTexture)
 		return;
 
+#ifdef __APPLE__
+	if (x >= 0 && x < m_numCellsX && y >= 0 && y < m_numCellsY)
+#else
 	if (x < m_numCellsX && y < m_numCellsY)
+#endif
 	{
 		if (level < TheGlobalData->m_shroudAlpha)
 			level = TheGlobalData->m_shroudAlpha;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp

@@ -1650,9 +1650,6 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name )
 const WeaponTemplate *WeaponStore::findWeaponTemplate( const char* name ) const
 {
 	if (stricmp(name, "None") == 0)
-{
-	if (stricmp(name, "None") == 0)
->>>>>>> god-team/main
 		return nullptr;
 	const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
 	DEBUG_ASSERTCRASH(wt != nullptr, ("Weapon %s not found!",name));

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp

@@ -121,7 +121,7 @@ void NGMPGame::SyncWithLobby(LobbyEntry& lobby)
 	}
 	else // fallback
 	{
-		setMap(lobby.map_path.c_str());
+		setMap(asciiMapCustom);
 		DEBUG_INFO_MAC(("[SYNC_LOBBY] Map FALLBACK (NOT FOUND): raw='%s' official='%s' custom='%s'", rawMapPath.c_str(), asciiMapOfficial.str(), asciiMapCustom.str()));
 	}
 

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp

@@ -264,7 +264,11 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y)
 {
 	DEBUG_ASSERTCRASH( m_pSrcTexture != nullptr, ("Reading empty shroud"));
 
+#ifdef __APPLE__
+	if (x >= 0 && x < m_numCellsX && y >= 0 && y < m_numCellsY)
+#else
 	if (x < m_numCellsX && y < m_numCellsY)
+#endif
 	{
 		UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch);
 
@@ -288,7 +292,11 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 	if (!m_pSrcTexture)
 		return;
 
+#ifdef __APPLE__
+	if (x >= 0 && x < m_numCellsX && y >= 0 && y < m_numCellsY)
+#else
 	if (x < m_numCellsX && y < m_numCellsY)
+#endif
 	{
 		if (level < TheGlobalData->m_shroudAlpha)
 			level = TheGlobalData->m_shroudAlpha;

Platform/MacOS/Source/Audio/MacOSAudioManager.cpp

@@ -582,7 +582,6 @@ Bool MacOSAudioManager::isMusicPlaying() const {
     }
     return FALSE;
 }
-Bool MacOSAudioManager::isMusicAlreadyLoaded() const { return TRUE; }
 Bool MacOSAudioManager::hasMusicTrackCompleted(const AsciiString &trackName, Int numberOfTimes) const { return FALSE; }
 AsciiString MacOSAudioManager::getMusicTrackName() const {
     for (auto &pa : m_sources) {